修改了公众号推送模板

.gitignore

@@ -0,0 +1,33 @@
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

.idea/.gitignore

@@ -0,0 +1,11 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 已忽略包含查询文件的默认文件夹
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+/.idea/

deployment-temp.yml

@@ -5,7 +5,7 @@ metadata:
     app: $APP_NAME
     version: $APP_TAG
   name: $APP_NAME
-  namespace: dl-proj   #一定要写名称空间
+  namespace: default   #一定要写名称空间
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
@@ -33,7 +33,7 @@ spec:
           livenessProbe: # 存活探针：失败意味着应用彻底挂了，需要重启来恢复
             httpGet:
               path: /test
-              port: 9090
+              port: 13145
             initialDelaySeconds: 10 # 延迟xx秒开始执行
             periodSeconds: 15  # 每隔15秒执行一次
             timeoutSeconds: 10  # 10秒未返回结果则超时
@@ -57,7 +57,7 @@ metadata:
   labels:
     app: $APP_NAME
   name: $APP_NAME
-  namespace: dl-proj
+  namespace: default
 spec:
   type: NodePort
   externalTrafficPolicy: Local
@@ -65,6 +65,6 @@ spec:
     - name: http
       protocol: TCP
       port: 13145
-      nodePort: 13145
+      nodePort: 30045
   selector:
     app: $APP_NAME

pom.xml

@@ -32,7 +32,7 @@
         <java.version>25</java.version>
         <maven.compiler.source>25</maven.compiler.source>
         <maven.compiler.target>25</maven.compiler.target>
-        <fastjson.version>2.0.60</fastjson.version>
+<!--        <fastjson.version>2.0.60</fastjson.version>-->
         <openfeign.version>5.0.0</openfeign.version>
         <hutool.version>5.8.25</hutool.version>
         <docker.private.repository>registry.cn-chengdu.aliyuncs.com/bamanker</docker.private.repository>
@@ -60,11 +60,16 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <version>${openfeign.version}</version>
         </dependency>
+        <!-- 如果需要显式指定 Jackson 3 -->
         <dependency>
-            <groupId>com.alibaba.fastjson2</groupId>
+            <groupId>tools.jackson.core</groupId>
-            <artifactId>fastjson2</artifactId>
+            <artifactId>jackson-core</artifactId>
-            <version>${fastjson.version}</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.fastjson2</groupId>-->
+<!--            <artifactId>fastjson2</artifactId>-->
+<!--            <version>${fastjson.version}</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -2,18 +2,18 @@ package com.bamanker.dailylove.controller;
 
 import cn.hutool.core.date.ChineseDate;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.bamanker.dailylove.config.DailyLoveConfigure;
 import com.bamanker.dailylove.domain.*;
 import com.bamanker.dailylove.service.DataRemoteClient;
 import com.bamanker.dailylove.service.WechatRequestClient;
 import com.bamanker.dailylove.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import jakarta.annotation.Resource;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -21,15 +21,20 @@ import java.util.Date;
 @RestController
 public class PushDailyController {
 
+    final
+    ObjectMapper mapper;
+
+
     final
     DataRemoteClient dataRemoteClient;
 
     final
     WechatRequestClient wechatRequestClient;
 
-    public PushDailyController(DataRemoteClient dataRemoteClient, WechatRequestClient wechatRequestClient) {
+    public PushDailyController(DataRemoteClient dataRemoteClient, WechatRequestClient wechatRequestClient, ObjectMapper mapper) {
         this.dataRemoteClient = dataRemoteClient;
         this.wechatRequestClient = wechatRequestClient;
+        this.mapper = mapper;
     }
 
     /**
@@ -49,9 +54,11 @@ public class PushDailyController {
         param1.setCity(DailyLoveConfigure.City_ID);
         param1.setType("7");
         String weatherResp = dataRemoteClient.getWeather(param1);
-        JSONObject weatherJson = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(1);
+        JsonNode weatherJson = mapper.readTree(weatherResp).get("result").get("list").get(1);
-        String city = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getString("area");
+        String city = mapper.readTree(weatherResp).get("result").get("area").asString();
-        Weather weather = weatherJson.toJavaObject(Weather.class);
+//        JSONObject weatherJson1 = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(1);
+//        String city1 = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getString("area");
+        Weather weather = mapper.treeToValue(weatherJson, Weather.class);
 
         resultVo.setAttribute("tomorrow", new DataItem(weather.getDate() + " " + weather.getWeek(), DailyLoveConfigure.Color_tomorrow));
         resultVo.setAttribute("city", new DataItem(city, DailyLoveConfigure.Color_city));
@@ -65,15 +72,18 @@ public class PushDailyController {
         param2.setKey(DailyLoveConfigure.TianXin_Key);
 
         String tipsResp = dataRemoteClient.getTips(param2);
-        String tips = JSONObject.parseObject(tipsResp).getJSONArray("result").getJSONObject(0).getString("content");
+        String tips = mapper.readTree(tipsResp).get("result").get("content").asString();
+//        String tips1 = JSONObject.parseObject(tipsResp).getJSONArray("result").getJSONObject(0).getString("content");
         resultVo.setAttribute("tips", new DataItem(tips, DailyLoveConfigure.Color_tips));
 
         String nightResp = dataRemoteClient.getNight(param2);
-        String night = JSONObject.parseObject(nightResp).getJSONArray("result").getJSONObject(0).getString("content");
+        String night = mapper.readTree(nightResp).get("result").get("content").asString();
+//        String night1 = JSONObject.parseObject(nightResp).getJSONArray("result").getJSONObject(0).getString("content");
         resultVo.setAttribute("night", new DataItem(night, DailyLoveConfigure.Color_night));
 
         String rainbowResp = dataRemoteClient.getRainbow(param2);
-        String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
+        String rainbow = mapper.readTree(rainbowResp).get("result").get("content").asString();
+//        String rainbow1 = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
         resultVo.setAttribute("rainbow", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn));
 
 //        String englishResp = dataRemoteClient.getDailyEnglish(param2);
@@ -127,9 +137,9 @@ public class PushDailyController {
 
         String accessTokenResp = wechatRequestClient.getAccessToken(wechatTokenParam);
         log.debug("accessTokenJson:{}", accessTokenResp);
-        String token = JSONObject.parseObject(accessTokenResp).getString("access_token");
+        String token = mapper.readTree(accessTokenResp).get("access_token").asString();
-        String responseStr = wechatRequestClient.sendMsg(resultVo, token);
+//        String token1 = JSONObject.parseObject(accessTokenResp).getString("access_token");
-        return responseStr;
+        return wechatRequestClient.sendMsg(resultVo, token);
 
     }
 
@@ -144,9 +154,10 @@ public class PushDailyController {
         param1.setCity(DailyLoveConfigure.City_ID);
         param1.setType("1");
         String weatherResp = dataRemoteClient.getWeather(param1);
+        JsonNode weatherJson = mapper.readTree(weatherResp).get("result");
+        Weather weather = mapper.treeToValue(weatherJson, Weather.class);
 
-        Weather weather = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).toJavaObject(Weather.class);
+//        Weather weather1 = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).toJavaObject(Weather.class);
-
 
         ResultVo resultVo = ResultVo.initializeResultVo(DailyLoveConfigure.Open_ID,
                 DailyLoveConfigure.Template_ID_Morning,
@@ -168,11 +179,13 @@ public class PushDailyController {
 //        resultVo.setAttribute("tips", new DataItem(tips, DailyLoveConfigure.Color_tips));
 
         String morningResp = dataRemoteClient.getMorning(param2);
-        String morning = JSONObject.parseObject(morningResp).getJSONArray("result").getJSONObject(0).getString("content");
+        String morning = mapper.readTree(morningResp).get("result").get("content").asString();
+//        String morning1 = JSONObject.parseObject(morningResp).getJSONArray("result").getJSONObject(0).getString("content");
         resultVo.setAttribute("morning", new DataItem(morning, DailyLoveConfigure.Color_morning));
 
         String rainbowResp = dataRemoteClient.getRainbow(param2);
-        String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
+        String rainbow = mapper.readTree(rainbowResp).get("result").get("content").asString();
+//        String rainbow1 = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
         resultVo.setAttribute("rainbow", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn));
 
 //        String englishResp = dataRemoteClient.getDailyEnglish(param2);
@@ -228,9 +241,9 @@ public class PushDailyController {
 
         String accessTokenResp = wechatRequestClient.getAccessToken(wechatTokenParam);
         log.debug("accessTokenJson:{}", accessTokenResp);
-        String token = JSONObject.parseObject(accessTokenResp).getString("access_token");
+        String token = mapper.readTree(accessTokenResp).get("access_token").asString();
-        String responseStr = wechatRequestClient.sendMsg(resultVo, token);
+//        String token1 = JSONObject.parseObject(accessTokenResp).getString("access_token");
-        return responseStr;
+        return wechatRequestClient.sendMsg(resultVo, token);
 
     }
 
@@ -240,9 +253,12 @@ public class PushDailyController {
      * @param responseStr
      */
     private void printPushLog(String responseStr) {
-        JSONObject jsonObject = JSONObject.parseObject(responseStr);
+        JsonNode jsonNode = mapper.readTree(responseStr);
-        String msgCode = jsonObject.getString("errcode");
+        String msgCode = jsonNode.get("errcode").asString();
-        String msgContent = jsonObject.getString("errmsg");
+        String msgContent = jsonNode.get("errmsg").asString();
+//        JSONObject jsonObject = JSONObject.parseObject(responseStr);
+//        String msgCode1 = jsonObject.getString("errcode");
+//        String msgContent1 = jsonObject.getString("errmsg");
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         System.out.println("[ " + dateFormat.format(new Date()) + " ] : messageCode=" + msgCode + ",messageContent=" + msgContent);
     }

src/main/resources/application.yml

@@ -19,11 +19,11 @@ DL:
 wechat:
   app-id: wxba68702957f8b93e
   app-secret: 834078bb149409bfca4fe693ea7c4c1c
-  #ME:  oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
+#  ME:  oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
   #LILI:  oo5bL6QafHJa9zQNYKS0fIhFC0zM
   open-id: oo5bL6QafHJa9zQNYKS0fIhFC0zM
-  template-id-morning: 1yx1fahCs923nOmMh0_KLWN0nXGKd8_pHQrfpdMblrQ
+  template-id-morning: E7eBkU0uzBFDwC9MiqPtHNlSlByDafw4BIqZvfOtTOs
-  template-id-night: QG-5NBX-jip46ulGVsaE3Uhl30GUxvNmtKOxwMHFkx0
+  template-id-night: 5ExwX0ID1ccueXNb7v-dqTcDH-lYtHatg0Mqt4FDIaY
 
   color:
     now: '#99CCCC'

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

@@ -1,25 +1,18 @@
 package com.bamanker.dailylove;
 
-import cn.hutool.core.date.ChineseDate;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.bamanker.dailylove.config.DailyLoveConfigure;
+import com.bamanker.dailylove.domain.DataItem;
 import com.bamanker.dailylove.domain.TianXinReqParam;
 import com.bamanker.dailylove.domain.Weather;
 import com.bamanker.dailylove.service.DataRemoteClient;
-import lombok.extern.slf4j.Slf4j;
-import org.bouncycastle.util.Strings;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
 import jakarta.annotation.Resource;
-import java.text.ParseException;
+import lombok.extern.slf4j.Slf4j;
-import java.text.SimpleDateFormat;
+import org.junit.jupiter.api.Test;
-import java.util.Calendar;
+import org.springframework.beans.factory.annotation.Autowired;
-import java.util.Date;
+import org.springframework.boot.test.context.SpringBootTest;
-
+import tools.jackson.databind.JsonNode;
-import static com.bamanker.dailylove.utils.DataUtils.getBirthdays;
+import tools.jackson.databind.ObjectMapper;
+import com.bamanker.dailylove.domain.*;
 
 @SpringBootTest
 @Slf4j
@@ -28,6 +21,10 @@ class DailyLoveApplicationTests {
 //    @Resource
 //    DataRemoteClient dataRemoteClient;
 //
+//    @Autowired
+//    ObjectMapper mapper;
+
+    //
 //    String remark = "❤";
 //
 //    @Test
@@ -106,24 +103,61 @@ class DailyLoveApplicationTests {
 //
 //    @Test
 //    void test2() {
+
+//        ResultVo resultVo = ResultVo.initializeResultVo(DailyLoveConfigure.Open_ID,
+//                DailyLoveConfigure.Template_ID_Night,
+//                DailyLoveConfigure.Color_Top);
 //
 //        TianXinReqParam param1 = new TianXinReqParam();
 //        param1.setKey(DailyLoveConfigure.TianXin_Key);
 //        param1.setCity(DailyLoveConfigure.City_ID);
 //        param1.setType("7");
-//        String weatherJson = dataRemoteClient.getWeather(param1);
+//        String weatherResp = dataRemoteClient.getWeather(param1);
-//        log.info("weather:{}", weatherJson);
+////        log.info("weather:{}", weatherResp);
-//        JSONObject resWeather = JSONObject.parseObject(weatherJson);
+//        JsonNode weatherJson = mapper.readTree(weatherResp).get("result").get("list").get(1);
-//        JSONObject result = resWeather.getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2);
+//        System.out.println("-----------------------------");
+//        System.out.println(weatherJson);
+//        String city = mapper.readTree(weatherResp).get("result").get("area").asString();
+//        System.out.println("-----------------------------");
+//        System.out.println(city);
+//        Weather weather = mapper.treeToValue(weatherJson, Weather.class);
+//        System.out.println("-----------------------------");
+//        System.out.println(weather);
+//
+//        resultVo.setAttribute("tomorrow", new DataItem(weather.getDate() + " " + weather.getWeek(), DailyLoveConfigure.Color_tomorrow));
+//        resultVo.setAttribute("city", new DataItem(city, DailyLoveConfigure.Color_city));
+//        resultVo.setAttribute("weather", new DataItem(weather.getWeather(), DailyLoveConfigure.Color_weather));
+//        resultVo.setAttribute("min_temperature", new DataItem(weather.getLowest(), DailyLoveConfigure.Color_minTem));
+//        resultVo.setAttribute("max_temperature", new DataItem(weather.getHighest(), DailyLoveConfigure.Color_maxTem));
+//        resultVo.setAttribute("quality", new DataItem(weather.getVis(), DailyLoveConfigure.Color_quality));
+//
+//        System.out.println("-----------------------------");
+//        System.out.println(resultVo);
+
+//        TianXinReqParam param2 = new TianXinReqParam();
+//        param2.setKey(DailyLoveConfigure.TianXin_Key);
+//
+//        String tipsResp = dataRemoteClient.getTips(param2);
+//       String tips = mapper.readTree(tipsResp).get("result").get("content").asString();
+//
+//        System.out.println("-----------------------------");
+//        System.out.println(tips);
+//
+//        TianXinReqParam param1 = new TianXinReqParam();
+//        param1.setKey(DailyLoveConfigure.TianXin_Key);
+//        param1.setCity(DailyLoveConfigure.City_ID);
+//        param1.setType("1");
+//        String weatherResp = dataRemoteClient.getWeather(param1);
+//        JsonNode weatherJson = mapper.readTree(weatherResp).get("result");
+//        Weather weather = mapper.treeToValue(weatherJson, Weather.class);
+//
+//        System.out.println("-----------------------------");
+//        System.out.println(weather);
+
 //        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