123

Dockerfile

@@ -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"]

pom.xml

@@ -5,18 +5,18 @@
     <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>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <fastjson.version>2.0.21</fastjson.version>
         <openfeign.version>3.1.5</openfeign.version>
         <nacos.version>2021.1</nacos.version>
@@ -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>

src/main/java/com/bamanker/dailylove/controller/PushDailyController.java

@@ -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大宝贝的生日啦";

src/main/java/com/bamanker/dailylove/controller/TestController.java

@@ -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!!!!!!";
+    }
+}

src/main/resources/bootstrap.yml

@@ -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

src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java

@@ -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);
     }
 

start.sh

@@ -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