添加了GraalVM的原生镜像版本-fix1

添加了GraalVM的原生镜像版本
2023-11-11 11:45:55 +08:00 · 2023-11-09 23:43:24 +08:00 · 2023-11-09 23:25:46 +08:00 · 2023-11-09 23:24:47 +08:00 · 2023-11-09 22:56:44 +08:00 · 2023-06-13 19:54:41 +08:00
10 changed files with 208 additions and 186 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+*
+!target/dailylove*
+!Dockerfile
--- a/6
+++ b/6
@@ -0,0 +1,6 @@
+FROM ubuntu:latest
+MAINTAINER bamanker
+ARG NATIVE_FILE
+COPY target/${NATIVE_FILE} /home/dailylove/app
+EXPOSE 13145
+ENTRYPOINT ["/home/dailylove/app"]
--- a/12
+++ b/12
@@ -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.
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # dailyLove

 #### 介绍
+公众号每日问候推送

 #### 软件架构
 软件架构说明
--- a/pom.xml
+++ b/pom.xml
@@ -5,22 +5,24 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
+        <version>3.1.5</version>
        <relativePath/> <!-- lookup parent from repository -->
    </parent>
    <groupId>com.bamanker</groupId>
-    <artifactId>dailyLove</artifactId>
-    <version>0.1.3</version>
+    <artifactId>dailylove</artifactId>
+    <version>v2.1</version>
    <name>dailyLove</name>
-    <description>dailyLove</description>
+    <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>
-        <fastjson.version>2.0.21</fastjson.version>
-        <openfeign.version>3.1.5</openfeign.version>
-        <nacos.version>2021.1</nacos.version>
-        <hutool.version>5.8.10</hutool.version>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <fastjson.version>2.0.25</fastjson.version>
+        <openfeign.version>4.0.4</openfeign.version>
+        <hutool.version>5.8.18</hutool.version>
+        <docker.private.repository>172.17.0.1:10888/my_work</docker.private.repository>
    </properties>
    <dependencies>
        <dependency>
@@ -28,25 +30,6 @@
            <artifactId>hutool-core</artifactId>
            <version>${hutool.version}</version>
        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <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>
-        </dependency>
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
@@ -63,26 +46,57 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
+            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-test</artifactId>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
    </dependencies>
    <build>
        <plugins>
+            <plugin>
+                <groupId>org.graalvm.buildtools</groupId>
+                <artifactId>native-maven-plugin</artifactId>
+                <version>0.9.27</version>
+            </plugin>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
+            <plugin>
+                <groupId>com.xenoamess.docker</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.5.0</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                            <goal>push</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <username>bamanker</username>
+                    <password>Fz8803101</password>
+                    <repository>${docker.private.repository}/${project.artifactId}</repository>
+                    <tag>${project.version}</tag>
+                    <buildArgs>
+                        <NATIVE_FILE>${project.artifactId}</NATIVE_FILE>
+                    </buildArgs>
+                </configuration>
+            </plugin>
        </plugins>
    </build>

--- a/src/main/java/com/bamanker/dailylove/DailyLoveApplication.java
+++ b/src/main/java/com/bamanker/dailylove/DailyLoveApplication.java
@@ -1,14 +1,20 @@
 package com.bamanker.dailylove;

 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;

+/**
+ * @author bamanker
+ */
@SpringBootApplication
@EnableFeignClients
 //开启定时任务
@EnableScheduling
+//@ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class DailyLoveApplication {

    public static void main(String[] args) {
--- a/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java
+++ b/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java
@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;

@@ -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大宝贝的生日啦";
--- a/src/main/java/com/bamanker/dailylove/controller/TestController.java
+++ b/src/main/java/com/bamanker/dailylove/controller/TestController.java
@@ -0,0 +1,18 @@
+package com.bamanker.dailylove.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author bamanker
+ */
+@Slf4j
+@RestController
+public class TestController {
+
+    @GetMapping("/test")
+    public String test(){
+        return "test ok!!!!!!!!";
+    }
+}
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.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
--- a/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java
+++ b/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java
@@ -13,138 +13,140 @@ import org.bouncycastle.util.Strings;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;

-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;

+import static com.bamanker.dailylove.utils.DataUtils.getBirthdays;
+
@SpringBootTest
@Slf4j
 class DailyLoveApplicationTests {

-    @Resource
-    DataRemoteClient dataRemoteClient;
-
-    String remark = "❤";
-
-    @Test
-    void test4(){
-        log.info("mark: {}",205%100);
-
-    }
-    @Test
-    void test3() {
-
-
-        //获取输入的生日
-        String boyBirthday = DailyLoveConfigure.Boy_Birthday;
-        //获取农历生日
-        ChineseDate chineseBir = new ChineseDate(DateUtil.parseDate(DailyLoveConfigure.Boy_Birthday));
-        log.info("生日的农历日期是：{}", chineseBir);
-        //截取日、月
-        String[] strings = Strings.split(boyBirthday, '-');
-        int chineseMonth = chineseBir.getMonth();
-        int chineseDay = chineseBir.getDay();
-        //获取当前日期的年
-        Calendar dateToday = Calendar.getInstance();
-        int todayYear = dateToday.get(Calendar.YEAR);
-        //把生日的年改为今年，方便计算
-        ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay,false);
-        //农历日期对应的阳历日期
-        int gregorianDay = chineseDate.getGregorianDay();
-        //计算时间差
-        long days = haveThisDay(chineseMonth, chineseDay, dateToday, todayYear, chineseDate, gregorianDay);
-        log.info("days:{}", days);
-
-    }
-
-    /**
-     * 需要递归计算日期差
-     *
-     * @param chineseMonth 农历月
-     * @param chineseDay   农历日
-     * @param dateToday    今天的日期类
-     * @param todayYear    当前的年
-     * @param chineseDate  组装的待计算的新日期
-     * @param gregorianDay 判断是否存在农历日期的参数，-1代表今年不存在这个农历日期
-     * @return 计算好的天数
-     */
-    private static long haveThisDay(int chineseMonth, int chineseDay, Calendar dateToday, int todayYear, ChineseDate chineseDate, int gregorianDay) {
-        //判断当前年份是否存在农历日对应的阳历日
-        while (gregorianDay == -1) {
-            //不存在，计算明年
-            todayYear += 1;
-            chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay, false);
-            gregorianDay = chineseDate.getGregorianDay();
-        }
-        //存在
-        //将农历日期改为阳历日期
-        Calendar gregorianbir = chineseDate.getGregorianCalendar();
-        //判断这个日期是否和今年是同一年
-        if (todayYear == dateToday.get(Calendar.YEAR)) {
-            //是同一年，判断这一天过了没
-            if (gregorianbir.get(Calendar.DAY_OF_YEAR) < dateToday.get(Calendar.DAY_OF_YEAR)) {
-                //这一天过了，计算明年
-                todayYear += 1;
-                chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay, false);
-                gregorianDay = chineseDate.getGregorianDay();
-                //递归计算下一年是否存在对应的阳历日
-                return haveThisDay(chineseMonth, chineseDay, dateToday, todayYear, chineseDate, gregorianDay);
-            }
-            //没有过，直接计算
-        }
-        //不是同一年，直接计算
-        Date time = dateToday.getTime();
-        log.info("当前的日期是：{}", time);
-        Date time1 = gregorianbir.getTime();
-        log.info("下一个生日的日期：{}", time1);
-        return DateUtil.between(dateToday.getTime(), gregorianbir.getTime(), DateUnit.DAY);
-    }
-
-    @Test
-    void test2() {
-
-        TianXinReqParam param1 = new TianXinReqParam();
-        param1.setKey(DailyLoveConfigure.TianXin_Key);
-        param1.setCity(DailyLoveConfigure.City_ID);
-        param1.setType("7");
-        String weatherJson = dataRemoteClient.getWeather(param1);
-        log.info("weather:{}", weatherJson);
-        JSONObject resWeather = JSONObject.parseObject(weatherJson);
-        JSONObject result = resWeather.getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2);
-        log.info("----result----:{}", result);
-        Weather weather = result.toJavaObject(Weather.class);
-        log.info("weather:{}", weather);
-        ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate()));
-        System.out.println("--------------55555----------"+weather.getDate());
-        System.out.println("------------------------"+chineseDate);
-
-
-    }
-
-
-    @Test
-    void test1() {
-        int loveDays = getLoveDays("2021-07-16");
-        log.info("-------------------------------{}", loveDays);
-    }
-
-    public static int getLoveDays(String loveday) {
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        int days = 0;
-        try {
-            long time = System.currentTimeMillis() - dateFormat.parse(loveday).getTime();
-            days = (int) (time / (24 * 60 * 60 * 1000));
-
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return days;
-    }
-
-    @Test
-    void contextLoads() {
+//    @Resource
+//    DataRemoteClient dataRemoteClient;
+//
+//    String remark = "❤";
+//
+//    @Test
+//    void test4(){
+//        log.info("mark: {}",205%100);
+//
+//    }
+//    @Test
+//    void test3() {
+//
+//
+//        //获取输入的生日
+//        String boyBirthday = DailyLoveConfigure.Boy_Birthday;
+//        //获取农历生日
+//        ChineseDate chineseBir = new ChineseDate(DateUtil.parseDate(DailyLoveConfigure.Boy_Birthday));
+//        log.info("生日的农历日期是：{}", chineseBir);
+//        //截取日、月
+//        String[] strings = Strings.split(boyBirthday, '-');
+//        int chineseMonth = chineseBir.getMonth();
+//        int chineseDay = chineseBir.getDay();
+//        //获取当前日期的年
+//        Calendar dateToday = Calendar.getInstance();
+//        int todayYear = dateToday.get(Calendar.YEAR);
+//        //把生日的年改为今年，方便计算
+//        ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay,false);
+//        //农历日期对应的阳历日期
+//        int gregorianDay = chineseDate.getGregorianDay();
+//        //计算时间差
+//        long days = haveThisDay(chineseMonth, chineseDay, dateToday, todayYear, chineseDate, gregorianDay);
+//        log.info("days:{}", days);
+//
+//    }
+//
+//    /**
+//     * 需要递归计算日期差
+//     *
+//     * @param chineseMonth 农历月
+//     * @param chineseDay   农历日
+//     * @param dateToday    今天的日期类
+//     * @param todayYear    当前的年
+//     * @param chineseDate  组装的待计算的新日期
+//     * @param gregorianDay 判断是否存在农历日期的参数，-1代表今年不存在这个农历日期
+//     * @return 计算好的天数
+//     */
+//    private static long haveThisDay(int chineseMonth, int chineseDay, Calendar dateToday, int todayYear, ChineseDate chineseDate, int gregorianDay) {
+//        //判断当前年份是否存在农历日对应的阳历日
+//        while (gregorianDay == -1) {
+//            //不存在，计算明年
+//            todayYear += 1;
+//            chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay, false);
+//            gregorianDay = chineseDate.getGregorianDay();
+//        }
+//        //存在
+//        //将农历日期改为阳历日期
+//        Calendar gregorianbir = chineseDate.getGregorianCalendar();
+//        //判断这个日期是否和今年是同一年
+//        if (todayYear == dateToday.get(Calendar.YEAR)) {
+//            //是同一年，判断这一天过了没
+//            if (gregorianbir.get(Calendar.DAY_OF_YEAR) < dateToday.get(Calendar.DAY_OF_YEAR)) {
+//                //这一天过了，计算明年
+//                todayYear += 1;
+//                chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay, false);
+//                gregorianDay = chineseDate.getGregorianDay();
+//                //递归计算下一年是否存在对应的阳历日
+//                return haveThisDay(chineseMonth, chineseDay, dateToday, todayYear, chineseDate, gregorianDay);
+//            }
+//            //没有过，直接计算
+//        }
+//        //不是同一年，直接计算
+//        Date time = dateToday.getTime();
+//        log.info("当前的日期是：{}", time);
+//        Date time1 = gregorianbir.getTime();
+//        log.info("下一个生日的日期：{}", time1);
+//        return DateUtil.between(dateToday.getTime(), gregorianbir.getTime(), DateUnit.DAY);
+//    }
+//
+//    @Test
+//    void test2() {
+//
+//        TianXinReqParam param1 = new TianXinReqParam();
+//        param1.setKey(DailyLoveConfigure.TianXin_Key);
+//        param1.setCity(DailyLoveConfigure.City_ID);
+//        param1.setType("7");
+//        String weatherJson = dataRemoteClient.getWeather(param1);
+//        log.info("weather:{}", weatherJson);
+//        JSONObject resWeather = JSONObject.parseObject(weatherJson);
+//        JSONObject result = resWeather.getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2);
+//        log.info("----result----:{}", result);
+//        Weather weather = result.toJavaObject(Weather.class);
+//        log.info("weather:{}", weather);
+//        ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate()));
+//        System.out.println("--------------55555----------"+weather.getDate());
+//        System.out.println("------------------------"+chineseDate);
+//
+//
+//    }
+//
+//
+//    @Test
+//    void test1() {
+//        int loveDays = getBirthdays("2023-05-14");
+//        log.info("-------------------------------{}", loveDays);
+//    }
+//
+//    public static int getLoveDays(String loveday) {
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+//        int days = 0;
+//        try {
+//            long time = System.currentTimeMillis() - dateFormat.parse(loveday).getTime();
+//            days = (int) (time / (24 * 60 * 60 * 1000));
+//
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+//        return days;
+//    }
+//
+//    @Test
+//    void contextLoads() {
 //        TianXinReqParam param1 = new TianXinReqParam();
 //        param1.setKey(DailyLoveConfigure.TianXin_Key);
 //        param1.setCity(DailyLoveConfigure.City_ID);
@@ -201,6 +203,6 @@ class DailyLoveApplicationTests {
 //        log.info("resultVo:{}", resultVo);


-    }
+//    }

 }
Author	SHA1	Message	Date
bamanker	5784db0746	添加了GraalVM的原生镜像版本-fix1	2023-11-11 11:45:55 +08:00
bamanker	e11418a3fa	添加了GraalVM的原生镜像版本	2023-11-09 23:43:24 +08:00
bamanker	62babb92ac	添加了GraalVM的原生镜像版本	2023-11-09 23:25:46 +08:00
bamanker	27096c2cd2	添加了GraalVM的原生镜像版本	2023-11-09 23:24:47 +08:00
bamanker	fc3ed87fe7	添加了GraalVM的原生镜像版本	2023-11-09 22:56:44 +08:00
bamanker	a58a15c674	优化了构建参数3	2023-06-13 19:54:41 +08:00
bamanker	57785ac9da	优化了构建参数2	2023-06-13 19:45:17 +08:00
bamanker	029d17a66c	优化了构建参数	2023-06-12 13:48:38 +08:00
bamanker	0e6c149597	123	2023-06-10 16:59:54 +08:00
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