15 Commits
master ... v1.1

Author SHA1 Message Date
bamanker
9e491112ff 增加了测试接口 ip/test 2023-05-15 16:07:50 +08:00
bamanker
4e7bdc6edd 增加了测试接口 ip/test 2023-05-15 12:54:23 +08:00
bamanker
a458f3c90a 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:47:43 +08:00
bamanker
5133ad69af 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:42:45 +08:00
bamanker
8deffb8629 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:37:26 +08:00
bamanker
d61951cbb4 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:35:21 +08:00
bamanker
ef76ad7bf8 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:32:47 +08:00
bamanker
2a2c27264a 修改了dockerfile文件并且增加了sh脚本 2023-05-15 12:19:50 +08:00
bamanker
ee17a6be4a 修改了dockerfile文件 2023-05-15 11:55:35 +08:00
bamanker
c32a7d5b55 修改了dockerfile文件 2023-05-15 11:44:27 +08:00
bamanker
c6f5b14615 修改了dockerfile文件 2023-05-15 11:18:32 +08:00
bamanker
d8acf918e6 修改了dockerfile文件 2023-05-15 11:04:16 +08:00
bamanker
9fd3611a20 增加了dockerfile文件 2023-05-14 15:16:02 +08:00
bamanker
acc021d2f1 修复了恋爱纪念日计算错误 2023-05-13 23:29:38 +08:00
bamanker
ebad21bf78 删除了nacos注册中心 2023-05-12 13:06:57 +08:00
9 changed files with 31 additions and 42 deletions

7
Dockerfile Normal file
View File

@@ -0,0 +1,7 @@
FROM openjdk:8
MAINTAINER bamanker
ADD target/dailyLove-0.1.6.jar /home/dailyLove/
ADD start.sh /home/dailyLove/
RUN chmod +x /home/dailyLove/start.sh
EXPOSE 13145
CMD ["sh","/home/dailyLove/start.sh"]

12
LICENSE
View File

@@ -1,12 +0,0 @@
Copyright (c) 2023 bamanker
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

View File

@@ -1,6 +1,7 @@
# dailyLove
#### 介绍
公众号每日问候推送
#### 软件架构
软件架构说明

14
pom.xml
View File

@@ -5,12 +5,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version>
<version>2.6.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.bamanker</groupId>
<artifactId>dailyLove</artifactId>
<version>0.1.3</version>
<version>0.1.6</version>
<name>dailyLove</name>
<description>dailyLove</description>
<properties>
@@ -33,16 +33,6 @@
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.1.5</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<version>${nacos.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${nacos.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>

View File

@@ -98,7 +98,7 @@ public class PushDailyController {
if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 1) {
words = "明天是恋爱周年纪念日!永远爱你~mua";
} else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 1) {
} else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 99) {
words = "明天是恋爱百日纪念日!提前庆祝哦~";
} else if (girlBirthdays == 1) {
words = "明天是lili大宝贝的生日啦";

View File

@@ -0,0 +1,15 @@
package com.bamanker.dailylove.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
public class TestController {
@GetMapping("/test")
public String test(){
return "test ok!!!!!!";
}
}

View File

@@ -2,24 +2,8 @@ server:
port: 13145
spring:
profiles:
active: prob
application:
name: dailyLove
cloud:
nacos:
config:
server-addr: ${url.nacos} # nacos地址配置中心
file-extension: yaml
group: Group1
discovery:
#持久化实例 ture为临时实例 false为持久化实例 临时实例发生异常直接剔除, 而持久化实例等待恢复
ephemeral: true
#注册中心地址
server-addr: ${url.nacos}
url:
nacos: 127.0.0.1:8848
DL:
tianxin-key: 72fbbb9e75e338ea6a240e83972f287c

View File

@@ -19,6 +19,8 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import static com.bamanker.dailylove.utils.DataUtils.getBirthdays;
@SpringBootTest
@Slf4j
class DailyLoveApplicationTests {
@@ -126,7 +128,7 @@ class DailyLoveApplicationTests {
@Test
void test1() {
int loveDays = getLoveDays("2021-07-16");
int loveDays = getBirthdays("2023-05-14");
log.info("-------------------------------{}", loveDays);
}

2
start.sh Normal file
View File

@@ -0,0 +1,2 @@
nohup java -Xms32M -Xmx32M -jar /home/dailyLove/dailyLove-0.1.6.jar >> /home/dailyLove/log/runout.log 2>&1 &
tail -f /home/dailyLove/log/runout.log