Compare commits
6 Commits
v3.0.5-nat
...
v3.0.8-nat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
06cfebccab | ||
|
|
54202d8fd7 | ||
|
|
21b8d2e6e6 | ||
| b7b3d44992 | |||
|
|
1cb7828acf | ||
|
|
2929e0d1c0 |
64
README.md
64
README.md
@@ -1,37 +1,27 @@
|
|||||||
# dailyLove
|
# dailyLove
|
||||||
|
|
||||||
#### 介绍
|
#### 介绍
|
||||||
公众号每日问候推送
|
公众号每日问候推送
|
||||||
|
|
||||||
#### 软件架构
|
#### 软件架构
|
||||||
软件架构说明
|
软件架构说明
|
||||||
|
|
||||||
|
|
||||||
#### 安装教程
|
#### 安装教程
|
||||||
|
|
||||||
1. xxxx
|
1. xxxx
|
||||||
2. xxxx
|
2. xxxx
|
||||||
3. xxxx
|
3. xxxx
|
||||||
|
|
||||||
#### 使用说明
|
#### 使用说明
|
||||||
|
|
||||||
1. xxxx
|
1. xxxx
|
||||||
2. xxxx
|
2. xxxx
|
||||||
3. xxxx
|
3. xxxx
|
||||||
|
|
||||||
#### 参与贡献
|
#### 参与贡献
|
||||||
|
|
||||||
1. Fork 本仓库
|
1. Fork 本仓库
|
||||||
2. 新建 Feat_xxx 分支
|
2. 新建 Feat_xxx 分支
|
||||||
3. 提交代码
|
3. 提交代码
|
||||||
4. 新建 Pull Request
|
4. 新建 Pull Request
|
||||||
|
|
||||||
|
|
||||||
#### 特技
|
|
||||||
|
|
||||||
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
|
|
||||||
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
|
|
||||||
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
|
|
||||||
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
|
|
||||||
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
|
|
||||||
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
|
|
||||||
|
|||||||
@@ -2,17 +2,17 @@ apiVersion: apps/v1
|
|||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: $APP_NAME
|
app: $APP_NAME # 标签 用于选择器
|
||||||
version: $APP_TAG
|
version: $APP_TAG
|
||||||
name: $APP_NAME
|
name: $APP_NAME # Deployment名称
|
||||||
namespace: default #一定要写名称空间
|
namespace: default # 一定要写名称空间
|
||||||
spec:
|
spec:
|
||||||
progressDeadlineSeconds: 600
|
progressDeadlineSeconds: 600
|
||||||
replicas: 1
|
replicas: 1 # 副本数 1个 pod
|
||||||
revisionHistoryLimit: 2
|
revisionHistoryLimit: 2
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: $APP_NAME
|
app: $APP_NAME # 选择器 匹配 pod 标签
|
||||||
strategy:
|
strategy:
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
maxSurge: 50%
|
maxSurge: 50%
|
||||||
@@ -21,31 +21,62 @@ spec:
|
|||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: $APP_NAME
|
app: $APP_NAME # pod 标签
|
||||||
version: $APP_TAG
|
version: $APP_TAG
|
||||||
spec:
|
spec:
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
- name: dockerhub-id #提前在项目下配置访问阿里云的账号密码
|
- name: dockerhub-id #提前在项目下配置访问私有镜像仓库的账号密码
|
||||||
containers:
|
containers:
|
||||||
- image: $REGISTRY/$IMAGE_NAMESPACE/$IMAGE_NAME:$APP_TAG
|
- name: $APP_NAME # 容器名称
|
||||||
name: $APP_NAME
|
image: $REGISTRY/$IMAGE_NAMESPACE/$IMAGE_NAME:$APP_TAG # 镜像地址
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
|
# 存活探针配置
|
||||||
livenessProbe: # 存活探针:失败意味着应用彻底挂了,需要重启来恢复
|
livenessProbe: # 存活探针:失败意味着应用彻底挂了,需要重启来恢复
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /test
|
path: /actuator/health/liveness # 探针路径
|
||||||
port: 13145
|
port: 13145 # 探针端口
|
||||||
initialDelaySeconds: 10 # 延迟xx秒开始执行
|
scheme: HTTP # 协议
|
||||||
periodSeconds: 15 # 每隔15秒执行一次
|
initialDelaySeconds: 20 # 容器启动后延迟 xx秒开始检查
|
||||||
timeoutSeconds: 10 # 10秒未返回结果则超时
|
periodSeconds: 10 # 每隔 15秒检查一次
|
||||||
failureThreshold: 10 # 探测失败后的重试次数,当达到这个次数后就判定结果为失败
|
timeoutSeconds: 5 # 10秒未返回结果则超时
|
||||||
# successThreshold: 5
|
# successThreshold: 1 # 成功 1 次就认定为健康
|
||||||
|
failureThreshold: 3 # 探测失败后的重试次数,当达到这个次数后就判定结果为失败,重启容器
|
||||||
|
#就绪探针配置
|
||||||
|
readinessProbe:
|
||||||
|
httpGet:
|
||||||
|
path: /actuator/health/readiness # 探针路径
|
||||||
|
port: 13145 # 探针端口
|
||||||
|
scheme: HTTP # 协议
|
||||||
|
initialDelaySeconds: 10 # 容器启动后等 30 秒再开始检查
|
||||||
|
periodSeconds: 5 # 每 5 秒检查一次,比存活探针频繁
|
||||||
|
timeoutSeconds: 5 # 超时时间 3 秒
|
||||||
|
# successThreshold: 1 # 成功 1 次就认为就绪
|
||||||
|
failureThreshold: 2 # 失败 3 次才认为未就绪,会从负载均衡摘掉
|
||||||
|
# 启动探针配置(可选,启动慢的应用必须配)
|
||||||
|
# startupProbe:
|
||||||
|
# httpGet:
|
||||||
|
# path: /actuator/health/liveness # 用存活探针的路径
|
||||||
|
# port: 13145
|
||||||
|
# scheme: HTTP
|
||||||
|
# initialDelaySeconds: 0 # 立即开始检查
|
||||||
|
# periodSeconds: 5 # 每 5 秒检查一次
|
||||||
|
# timeoutSeconds: 3 # 超时时间 3 秒
|
||||||
|
# successThreshold: 1 # 成功 1 次就认为启动完成
|
||||||
|
# failureThreshold: 30 # 失败 30 次(150 秒)才认为启动失败
|
||||||
|
# 生命周期钩子,优雅关闭
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
sleep:
|
||||||
|
seconds: 10 #容器停止前先等 10 秒,让流量切走
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 13145
|
- containerPort: 13145 # 应用端口
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
# 资源限制
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpu: 99m
|
cpu: 99m # 最多 0.1核 CPU
|
||||||
memory: 65Mi
|
memory: 65Mi # 最多 65m 内存
|
||||||
|
# 环境变量配置
|
||||||
env:
|
env:
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: "Asia/Shanghai"
|
value: "Asia/Shanghai"
|
||||||
|
|||||||
30
pom.xml
30
pom.xml
@@ -32,7 +32,7 @@
|
|||||||
<java.version>25</java.version>
|
<java.version>25</java.version>
|
||||||
<maven.compiler.source>25</maven.compiler.source>
|
<maven.compiler.source>25</maven.compiler.source>
|
||||||
<maven.compiler.target>25</maven.compiler.target>
|
<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>
|
<openfeign.version>5.0.0</openfeign.version>
|
||||||
<hutool.version>5.8.25</hutool.version>
|
<hutool.version>5.8.25</hutool.version>
|
||||||
<docker.private.repository>registry.cn-chengdu.aliyuncs.com/bamanker</docker.private.repository>
|
<docker.private.repository>registry.cn-chengdu.aliyuncs.com/bamanker</docker.private.repository>
|
||||||
@@ -65,11 +65,11 @@
|
|||||||
<groupId>tools.jackson.core</groupId>
|
<groupId>tools.jackson.core</groupId>
|
||||||
<artifactId>jackson-core</artifactId>
|
<artifactId>jackson-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- <dependency>-->
|
<!-- <dependency>-->
|
||||||
<!-- <groupId>com.alibaba.fastjson2</groupId>-->
|
<!-- <groupId>com.alibaba.fastjson2</groupId>-->
|
||||||
<!-- <artifactId>fastjson2</artifactId>-->
|
<!-- <artifactId>fastjson2</artifactId>-->
|
||||||
<!-- <version>${fastjson.version}</version>-->
|
<!-- <version>${fastjson.version}</version>-->
|
||||||
<!-- </dependency>-->
|
<!-- </dependency>-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
@@ -87,6 +87,11 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-autoconfigure</artifactId>
|
<artifactId>spring-boot-autoconfigure</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!-- Spring Boot Actuator,提供健康检查端点 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<build>
|
<build>
|
||||||
<finalName>dailylove</finalName>
|
<finalName>dailylove</finalName>
|
||||||
@@ -109,12 +114,15 @@
|
|||||||
<buildArgs>
|
<buildArgs>
|
||||||
<!--开启dashboard-->
|
<!--开启dashboard-->
|
||||||
<!-- <arg>-H:DashboardDump=dailylove -H:+DashboardAll</arg>-->
|
<!-- <arg>-H:DashboardDump=dailylove -H:+DashboardAll</arg>-->
|
||||||
<arg->-H:+ReportExceptionStackTraces</arg->
|
<buildArg>-H:+ReportExceptionStackTraces</buildArg>
|
||||||
<!--开启JFR-->
|
<!--生成诊断报告-->
|
||||||
<arg>--enable-monitoring=jfr</arg>
|
<buildArg>-H:+PrintAnalysisCallTree</buildArg>
|
||||||
<!-- <arg>--gc=G1</arg>-->
|
<!--开启监控代理-->
|
||||||
|
<buildArg>--enable-monitoring=jfr,heapdump,jvmstat</buildArg>
|
||||||
<!-- <arg>--pgo</arg>-->
|
<!-- <arg>--pgo</arg>-->
|
||||||
<arg>-Ob</arg>
|
<!---Ob: 快速构建模式,编译快但性能差点,适合开发调试-->
|
||||||
|
<buildArg>-Ob</buildArg>
|
||||||
|
<!-- <buildArg>--gc=G1</buildArg>-->
|
||||||
<!-- <arg>-march=native</arg>-->
|
<!-- <arg>-march=native</arg>-->
|
||||||
<!-- <arg>-H:+BuildReport</arg>-->
|
<!-- <arg>-H:+BuildReport</arg>-->
|
||||||
</buildArgs>
|
</buildArgs>
|
||||||
|
|||||||
@@ -4,6 +4,12 @@ import org.springframework.beans.factory.annotation.Value;
|
|||||||
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
import org.springframework.cloud.context.config.annotation.RefreshScope;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @descriptions
|
||||||
|
* @author bamanker
|
||||||
|
* @date 2026/1/8 12:12
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@Component
|
@Component
|
||||||
public class DailyLoveConfigure {
|
public class DailyLoveConfigure {
|
||||||
// public static String Access_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}";
|
// public static String Access_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}";
|
||||||
@@ -26,6 +32,7 @@ public class DailyLoveConfigure {
|
|||||||
public static String Color_bbir;
|
public static String Color_bbir;
|
||||||
public static String Color_cbir;
|
public static String Color_cbir;
|
||||||
public static String Color_loveDay;
|
public static String Color_loveDay;
|
||||||
|
public static String Color_weddingDay;
|
||||||
public static String Color_remark;
|
public static String Color_remark;
|
||||||
|
|
||||||
@Value("${wechat.color.tomorrow:null}")
|
@Value("${wechat.color.tomorrow:null}")
|
||||||
@@ -113,6 +120,11 @@ public class DailyLoveConfigure {
|
|||||||
Color_loveDay = color_loveDay;
|
Color_loveDay = color_loveDay;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Value("${wechat.color.weddingDay:null}")
|
||||||
|
public void setColor_weddingDay(String color_weddingDay) {
|
||||||
|
Color_loveDay = color_weddingDay;
|
||||||
|
}
|
||||||
|
|
||||||
@Value("${wechat.color.remark:null}")
|
@Value("${wechat.color.remark:null}")
|
||||||
public void setColor_remark(String color_remark) {
|
public void setColor_remark(String color_remark) {
|
||||||
Color_remark = color_remark;
|
Color_remark = color_remark;
|
||||||
@@ -182,28 +194,35 @@ public class DailyLoveConfigure {
|
|||||||
public static String Boy_Birthday;
|
public static String Boy_Birthday;
|
||||||
|
|
||||||
@Value("${DL.boy-birthday}")
|
@Value("${DL.boy-birthday}")
|
||||||
public void setBoyBirthday(String BoyBirthday) {
|
public void setBoyBirthday(String boyBirthday) {
|
||||||
Boy_Birthday = BoyBirthday;
|
Boy_Birthday = boyBirthday;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String Girl_Birthday;
|
public static String Girl_Birthday;
|
||||||
|
|
||||||
@Value("${DL.girl-birthday}")
|
@Value("${DL.girl-birthday}")
|
||||||
public void setGirlBirthday(String GirlBirthday) {
|
public void setGirlBirthday(String girlBirthday) {
|
||||||
Girl_Birthday = GirlBirthday;
|
Girl_Birthday = girlBirthday;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String Cat_Birthday;
|
public static String Cat_Birthday;
|
||||||
|
|
||||||
@Value("${DL.cat-birthday}")
|
@Value("${DL.cat-birthday}")
|
||||||
public void setCatBirthday(String CatBirthday) {
|
public void setCatBirthday(String catBirthday) {
|
||||||
Cat_Birthday = CatBirthday;
|
Cat_Birthday = catBirthday;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String Love_Day;
|
public static String Love_Day;
|
||||||
|
|
||||||
@Value("${DL.love-day}")
|
@Value("${DL.love-day}")
|
||||||
public void setLoveDay(String LoveDay) {
|
public void setLoveDay(String loveDay) {
|
||||||
Love_Day = LoveDay;
|
Love_Day = loveDay;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String Wedding_Day;
|
||||||
|
|
||||||
|
@Value("${DL.wedding-day}")
|
||||||
|
public void setWeddingDay(String weddingDay) {
|
||||||
|
Wedding_Day = weddingDay;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,6 +8,7 @@ import com.bamanker.dailylove.service.DataRemoteClient;
|
|||||||
import com.bamanker.dailylove.service.WechatRequestClient;
|
import com.bamanker.dailylove.service.WechatRequestClient;
|
||||||
import com.bamanker.dailylove.utils.DataUtils;
|
import com.bamanker.dailylove.utils.DataUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@@ -17,6 +18,12 @@ import tools.jackson.databind.ObjectMapper;
|
|||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author bamanker
|
||||||
|
* @descriptions
|
||||||
|
* @date 2026/1/8 12:04
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@RestController
|
@RestController
|
||||||
public class PushDailyController {
|
public class PushDailyController {
|
||||||
@@ -24,7 +31,6 @@ public class PushDailyController {
|
|||||||
final
|
final
|
||||||
ObjectMapper mapper;
|
ObjectMapper mapper;
|
||||||
|
|
||||||
|
|
||||||
final
|
final
|
||||||
DataRemoteClient dataRemoteClient;
|
DataRemoteClient dataRemoteClient;
|
||||||
|
|
||||||
@@ -43,6 +49,7 @@ public class PushDailyController {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@GetMapping("/pushNight")
|
@GetMapping("/pushNight")
|
||||||
|
@RegisterReflectionForBinding(Weather.class)
|
||||||
public String pushNight() {
|
public String pushNight() {
|
||||||
|
|
||||||
ResultVo resultVo = ResultVo.initializeResultVo(DailyLoveConfigure.Open_ID,
|
ResultVo resultVo = ResultVo.initializeResultVo(DailyLoveConfigure.Open_ID,
|
||||||
@@ -56,8 +63,6 @@ public class PushDailyController {
|
|||||||
String weatherResp = dataRemoteClient.getWeather(param1);
|
String weatherResp = dataRemoteClient.getWeather(param1);
|
||||||
JsonNode weatherJson = mapper.readTree(weatherResp).get("result").get("list").get(1);
|
JsonNode weatherJson = mapper.readTree(weatherResp).get("result").get("list").get(1);
|
||||||
String city = mapper.readTree(weatherResp).get("result").get("area").asString();
|
String city = mapper.readTree(weatherResp).get("result").get("area").asString();
|
||||||
// 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);
|
Weather weather = mapper.treeToValue(weatherJson, Weather.class);
|
||||||
|
|
||||||
resultVo.setAttribute("tomorrow", new DataItem(weather.getDate() + " " + weather.getWeek(), DailyLoveConfigure.Color_tomorrow));
|
resultVo.setAttribute("tomorrow", new DataItem(weather.getDate() + " " + weather.getWeek(), DailyLoveConfigure.Color_tomorrow));
|
||||||
@@ -73,17 +78,14 @@ public class PushDailyController {
|
|||||||
|
|
||||||
String tipsResp = dataRemoteClient.getTips(param2);
|
String tipsResp = dataRemoteClient.getTips(param2);
|
||||||
String tips = mapper.readTree(tipsResp).get("result").get("content").asString();
|
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));
|
resultVo.setAttribute("tips", new DataItem(tips, DailyLoveConfigure.Color_tips));
|
||||||
|
|
||||||
String nightResp = dataRemoteClient.getNight(param2);
|
String nightResp = dataRemoteClient.getNight(param2);
|
||||||
String night = mapper.readTree(nightResp).get("result").get("content").asString();
|
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));
|
resultVo.setAttribute("night", new DataItem(night, DailyLoveConfigure.Color_night));
|
||||||
|
|
||||||
String rainbowResp = dataRemoteClient.getRainbow(param2);
|
String rainbowResp = dataRemoteClient.getRainbow(param2);
|
||||||
String rainbow = mapper.readTree(rainbowResp).get("result").get("content").asString();
|
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));
|
resultVo.setAttribute("rainbow", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn));
|
||||||
|
|
||||||
// String englishResp = dataRemoteClient.getDailyEnglish(param2);
|
// String englishResp = dataRemoteClient.getDailyEnglish(param2);
|
||||||
@@ -99,44 +101,50 @@ public class PushDailyController {
|
|||||||
|
|
||||||
|
|
||||||
int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday);
|
int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday);
|
||||||
log.debug("gbir_day:{}", girlBirthdays);
|
log.info("gbir_days:{}", girlBirthdays);
|
||||||
resultVo.setAttribute("gbir_day", new DataItem(girlBirthdays - 1 + "", DailyLoveConfigure.Color_gbir));
|
resultVo.setAttribute("gbir_day", new DataItem(girlBirthdays - 1 + "", DailyLoveConfigure.Color_gbir));
|
||||||
|
|
||||||
int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday);
|
int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday);
|
||||||
log.debug("bbir_day:{}", boyBirthdays);
|
log.info("bbir_days:{}", boyBirthdays);
|
||||||
resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays - 1 + "", DailyLoveConfigure.Color_bbir));
|
resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays - 1 + "", DailyLoveConfigure.Color_bbir));
|
||||||
|
|
||||||
int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
|
int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
|
||||||
log.debug("cbir_day:{}", catBirthdays);
|
log.info("cbir_days:{}", catBirthdays);
|
||||||
resultVo.setAttribute("cbir_day", new DataItem(catBirthdays - 1 + "", DailyLoveConfigure.Color_cbir));
|
resultVo.setAttribute("cbir_day", new DataItem(catBirthdays - 1 + "", DailyLoveConfigure.Color_cbir));
|
||||||
|
|
||||||
String words = "普通的一天";
|
String words = "普通的一天";
|
||||||
|
|
||||||
if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 1) {
|
if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 1) {
|
||||||
words = "明天是恋爱周年纪念日!永远爱你~mua";
|
words = "明天是恋爱周年纪念日!永远爱你~mua";
|
||||||
} else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 99) {
|
} else if ((DataUtils.getDayDiff(DailyLoveConfigure.Love_Day)) % 100 == 99) {
|
||||||
words = "明天是恋爱百日纪念日!提前庆祝哦~";
|
words = "明天是恋爱百日纪念日!提前庆祝哦~";
|
||||||
|
} else if (DataUtils.getBirthdays(DailyLoveConfigure.Wedding_Day) == 1) {
|
||||||
|
words = "明天是结婚周年纪念日!提前庆祝哦~";
|
||||||
} else if (girlBirthdays == 1) {
|
} else if (girlBirthdays == 1) {
|
||||||
words = "明天是lili大宝贝的生日啦";
|
words = "明天是lili大宝贝的生日啦";
|
||||||
} else if (boyBirthdays == 1) {
|
} else if (boyBirthdays == 1) {
|
||||||
words = "明天是ss的生日!别忘了哦~";
|
words = "明天是菘菘的生日!别忘了哦~";
|
||||||
} else if (catBirthdays == 1) {
|
} else if (catBirthdays == 1) {
|
||||||
words = "明天是小离谱的生日!别忘了小鱼干!";
|
words = "明天是小离谱的生日!别忘了小鱼干!";
|
||||||
}
|
}
|
||||||
|
|
||||||
resultVo.setAttribute("words", new DataItem(words, DailyLoveConfigure.Color_remark));
|
resultVo.setAttribute("words", new DataItem(words, DailyLoveConfigure.Color_remark));
|
||||||
|
|
||||||
int loveDays = DataUtils.getLoveDays(DailyLoveConfigure.Love_Day);
|
int loveDays = DataUtils.getDayDiff(DailyLoveConfigure.Love_Day);
|
||||||
log.debug("love_day:{}", loveDays);
|
log.info("love_days:{}", loveDays);
|
||||||
resultVo.setAttribute("love_day", new DataItem(loveDays + 1 + "", DailyLoveConfigure.Color_loveDay));
|
resultVo.setAttribute("love_day", new DataItem(loveDays + 1 + "", DailyLoveConfigure.Color_loveDay));
|
||||||
|
|
||||||
log.debug("resultVo:{}", resultVo);
|
int weddingDays = DataUtils.getDayDiff(DailyLoveConfigure.Wedding_Day);
|
||||||
|
log.info("wedding_days:{}", weddingDays);
|
||||||
|
resultVo.setAttribute("wedding_day", new DataItem(weddingDays + 1 + "", DailyLoveConfigure.Color_weddingDay));
|
||||||
|
|
||||||
|
log.info("resultVo:{}", resultVo);
|
||||||
WechatTokenParam wechatTokenParam = new WechatTokenParam();
|
WechatTokenParam wechatTokenParam = new WechatTokenParam();
|
||||||
wechatTokenParam.setAppid(DailyLoveConfigure.App_ID);
|
wechatTokenParam.setAppid(DailyLoveConfigure.App_ID);
|
||||||
wechatTokenParam.setSecret(DailyLoveConfigure.App_Secret);
|
wechatTokenParam.setSecret(DailyLoveConfigure.App_Secret);
|
||||||
|
|
||||||
String accessTokenResp = wechatRequestClient.getAccessToken(wechatTokenParam);
|
String accessTokenResp = wechatRequestClient.getAccessToken(wechatTokenParam);
|
||||||
log.debug("accessTokenJson:{}", accessTokenResp);
|
log.info("accessTokenJson:{}", accessTokenResp);
|
||||||
String token = mapper.readTree(accessTokenResp).get("access_token").asString();
|
String token = mapper.readTree(accessTokenResp).get("access_token").asString();
|
||||||
// String token1 = JSONObject.parseObject(accessTokenResp).getString("access_token");
|
// String token1 = JSONObject.parseObject(accessTokenResp).getString("access_token");
|
||||||
return wechatRequestClient.sendMsg(resultVo, token);
|
return wechatRequestClient.sendMsg(resultVo, token);
|
||||||
@@ -147,6 +155,7 @@ public class PushDailyController {
|
|||||||
* 推送早安
|
* 推送早安
|
||||||
*/
|
*/
|
||||||
@GetMapping("/pushMorning")
|
@GetMapping("/pushMorning")
|
||||||
|
@RegisterReflectionForBinding(Weather.class)
|
||||||
public String pushMorning() {
|
public String pushMorning() {
|
||||||
|
|
||||||
TianXinReqParam param1 = new TianXinReqParam();
|
TianXinReqParam param1 = new TianXinReqParam();
|
||||||
@@ -203,37 +212,43 @@ public class PushDailyController {
|
|||||||
|
|
||||||
|
|
||||||
int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday);
|
int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday);
|
||||||
log.debug("gbir_day:{}", girlBirthdays);
|
log.info("gbir_days:{}", girlBirthdays);
|
||||||
resultVo.setAttribute("gbir_day", new DataItem(girlBirthdays + "", DailyLoveConfigure.Color_gbir));
|
resultVo.setAttribute("gbir_day", new DataItem(girlBirthdays + "", DailyLoveConfigure.Color_gbir));
|
||||||
|
|
||||||
int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday);
|
int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday);
|
||||||
log.debug("bbir_day:{}", boyBirthdays);
|
log.info("bbir_days:{}", boyBirthdays);
|
||||||
resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays + "", DailyLoveConfigure.Color_bbir));
|
resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays + "", DailyLoveConfigure.Color_bbir));
|
||||||
|
|
||||||
int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
|
int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
|
||||||
log.debug("cbir_day:{}", catBirthdays);
|
log.info("cbir_days:{}", catBirthdays);
|
||||||
resultVo.setAttribute("cbir_day", new DataItem(catBirthdays + "", DailyLoveConfigure.Color_cbir));
|
resultVo.setAttribute("cbir_day", new DataItem(catBirthdays + "", DailyLoveConfigure.Color_cbir));
|
||||||
|
|
||||||
String words = "普通的一天";
|
String words = "普通的一天";
|
||||||
|
|
||||||
if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 0) {
|
if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 0) {
|
||||||
words = "今天是恋爱周年纪念日!永远爱你~mua";
|
words = "今天是恋爱周年纪念日!永远爱你~mua";
|
||||||
} else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 0) {
|
} else if ((DataUtils.getDayDiff(DailyLoveConfigure.Love_Day)) % 100 == 0) {
|
||||||
words = "今天是恋爱百日纪念日!永远爱你~";
|
words = "今天是恋爱百日纪念日!永远爱你~";
|
||||||
|
} else if (DataUtils.getBirthdays(DailyLoveConfigure.Wedding_Day) == 0) {
|
||||||
|
words = "今天是结婚周年纪念日!永远爱你~";
|
||||||
} else if (girlBirthdays == 0) {
|
} else if (girlBirthdays == 0) {
|
||||||
words = "今天是lili宝贝的生日!生日快乐哟~";
|
words = "今天是lili宝贝的生日!生日快乐哟~";
|
||||||
} else if (boyBirthdays == 0) {
|
} else if (boyBirthdays == 0) {
|
||||||
words = "今天是ss的生日!别忘了好好爱他~";
|
words = "今天是菘菘的生日!别忘了好好爱他~";
|
||||||
} else if (catBirthdays == 0) {
|
} else if (catBirthdays == 0) {
|
||||||
words = "今天是小离谱的生日!别忘了小鱼干!";
|
words = "今天是小离谱的生日!别忘了小鱼干!";
|
||||||
}
|
}
|
||||||
|
|
||||||
resultVo.setAttribute("words", new DataItem(words, DailyLoveConfigure.Color_remark));
|
resultVo.setAttribute("words", new DataItem(words, DailyLoveConfigure.Color_remark));
|
||||||
|
|
||||||
int loveDays = DataUtils.getLoveDays(DailyLoveConfigure.Love_Day);
|
int loveDays = DataUtils.getDayDiff(DailyLoveConfigure.Love_Day);
|
||||||
log.debug("love_day:{}", loveDays);
|
log.info("love_days:{}", loveDays);
|
||||||
resultVo.setAttribute("love_day", new DataItem(loveDays + "", DailyLoveConfigure.Color_loveDay));
|
resultVo.setAttribute("love_day", new DataItem(loveDays + "", DailyLoveConfigure.Color_loveDay));
|
||||||
|
|
||||||
|
int weddingDays = DataUtils.getDayDiff(DailyLoveConfigure.Wedding_Day);
|
||||||
|
log.info("wedding_days:{}", weddingDays);
|
||||||
|
resultVo.setAttribute("wedding_day", new DataItem(weddingDays + "", DailyLoveConfigure.Color_weddingDay));
|
||||||
|
|
||||||
log.debug("resultVo:{}", resultVo);
|
log.debug("resultVo:{}", resultVo);
|
||||||
WechatTokenParam wechatTokenParam = new WechatTokenParam();
|
WechatTokenParam wechatTokenParam = new WechatTokenParam();
|
||||||
wechatTokenParam.setAppid(DailyLoveConfigure.App_ID);
|
wechatTokenParam.setAppid(DailyLoveConfigure.App_ID);
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ import org.bouncycastle.util.Strings;
|
|||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.temporal.ChronoUnit;
|
||||||
|
import java.time.temporal.Temporal;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
@@ -35,7 +38,7 @@ public class DataUtils {
|
|||||||
Calendar dateToday = Calendar.getInstance();
|
Calendar dateToday = Calendar.getInstance();
|
||||||
int todayYear = dateToday.get(Calendar.YEAR);
|
int todayYear = dateToday.get(Calendar.YEAR);
|
||||||
//把生日的年改为今年,方便计算
|
//把生日的年改为今年,方便计算
|
||||||
ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay,false);
|
ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay, false);
|
||||||
//农历日期对应的阳历日期
|
//农历日期对应的阳历日期
|
||||||
int gregorianDay = chineseDate.getGregorianDay();
|
int gregorianDay = chineseDate.getGregorianDay();
|
||||||
//计算时间差
|
//计算时间差
|
||||||
@@ -121,22 +124,36 @@ public class DataUtils {
|
|||||||
return days;
|
return days;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// /**
|
||||||
* 计算恋爱天数 days
|
// * 计算恋爱天数 days
|
||||||
*
|
// *
|
||||||
* @param loveday
|
// * @param loveDay
|
||||||
* @return
|
// * @return
|
||||||
*/
|
// */
|
||||||
public static int getLoveDays(String loveday) {
|
// public static int getLoveDays(String loveDay) {
|
||||||
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
||||||
int days = 0;
|
// int days = 0;
|
||||||
try {
|
// try {
|
||||||
long time = System.currentTimeMillis() - dateFormat.parse(loveday).getTime();
|
// long time = System.currentTimeMillis() - dateFormat.parse(loveDay).getTime();
|
||||||
days = (int) (time / (24 * 60 * 60 * 1000));
|
// days = (int) (time / (24 * 60 * 60 * 1000));
|
||||||
|
//
|
||||||
|
// } catch (ParseException e) {
|
||||||
|
// e.printStackTrace();
|
||||||
|
// }
|
||||||
|
// return days;
|
||||||
|
// }
|
||||||
|
|
||||||
} catch (ParseException e) {
|
/**
|
||||||
e.printStackTrace();
|
* @param startDay
|
||||||
}
|
* @return int
|
||||||
return days;
|
* @descriptions 计算日期茶 days
|
||||||
|
* @author bamanker
|
||||||
|
* @date 2026/1/8 12:38
|
||||||
|
*/
|
||||||
|
public static int getDayDiff(String startDay) {
|
||||||
|
|
||||||
|
LocalDate dateNow = LocalDate.now();
|
||||||
|
LocalDate dateStart = LocalDate.parse(startDay);
|
||||||
|
return (int) ChronoUnit.DAYS.between(dateStart, dateNow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ DL:
|
|||||||
boy-birthday: 1995-3-30
|
boy-birthday: 1995-3-30
|
||||||
love-day: 2022-07-16
|
love-day: 2022-07-16
|
||||||
cat-birthday: 2022-10-23
|
cat-birthday: 2022-10-23
|
||||||
|
wedding-day: 2025-10-08
|
||||||
|
|
||||||
wechat:
|
wechat:
|
||||||
app-id: wxba68702957f8b93e
|
app-id: wxba68702957f8b93e
|
||||||
@@ -22,8 +23,8 @@ wechat:
|
|||||||
# ME: oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
|
# ME: oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
|
||||||
#LILI: oo5bL6QafHJa9zQNYKS0fIhFC0zM
|
#LILI: oo5bL6QafHJa9zQNYKS0fIhFC0zM
|
||||||
open-id: oo5bL6QafHJa9zQNYKS0fIhFC0zM
|
open-id: oo5bL6QafHJa9zQNYKS0fIhFC0zM
|
||||||
template-id-morning: E7eBkU0uzBFDwC9MiqPtHNlSlByDafw4BIqZvfOtTOs
|
template-id-morning: dWNAL-ZOzpBhnByFoTamt9DlJQYLB5z3ldKLvQstyU4
|
||||||
template-id-night: 5ExwX0ID1ccueXNb7v-dqTcDH-lYtHatg0Mqt4FDIaY
|
template-id-night: oraLiXC-8740stYc1a7mpzUFHiAIRaM3JikqibZ2grE
|
||||||
|
|
||||||
color:
|
color:
|
||||||
now: '#99CCCC'
|
now: '#99CCCC'
|
||||||
@@ -39,6 +40,7 @@ wechat:
|
|||||||
bbir: '#FF3399'
|
bbir: '#FF3399'
|
||||||
cbir: '#FF3399'
|
cbir: '#FF3399'
|
||||||
loveDay: '#FF3399'
|
loveDay: '#FF3399'
|
||||||
|
weddingDay: '#FF3399'
|
||||||
remark: '#FF6666'
|
remark: '#FF6666'
|
||||||
city: ""
|
city: ""
|
||||||
tips: ""
|
tips: ""
|
||||||
@@ -54,4 +56,25 @@ logging:
|
|||||||
level:
|
level:
|
||||||
com.bamanker.dailylove.service: debug #指定openfeign日志以什么级别监控哪个接口(可多个)
|
com.bamanker.dailylove.service: debug #指定openfeign日志以什么级别监控哪个接口(可多个)
|
||||||
|
|
||||||
scanclass: false
|
scanclass: false
|
||||||
|
|
||||||
|
# Actuator 配置
|
||||||
|
management:
|
||||||
|
# 端点配置
|
||||||
|
endpoints:
|
||||||
|
web:
|
||||||
|
exposure:
|
||||||
|
# 暴露健康端点,生产环境要慎重,别把敏感信息暴露了
|
||||||
|
include: health,info
|
||||||
|
# 健康端点配置
|
||||||
|
endpoint:
|
||||||
|
health:
|
||||||
|
# 显示详细的健康信息,方便调试
|
||||||
|
# 生产环境建议设为 when-authorized,需要认证才能看详情
|
||||||
|
show-details: always
|
||||||
|
# 开启探针支持,这个必须设置
|
||||||
|
probes:
|
||||||
|
enabled: true
|
||||||
|
# 在主端口上也暴露探针路径
|
||||||
|
# 这样 K8s 探针可以直接访问应用端口,不用单独配置 management 端口
|
||||||
|
add-additional-paths: true
|
||||||
@@ -5,6 +5,7 @@ import com.bamanker.dailylove.domain.DataItem;
|
|||||||
import com.bamanker.dailylove.domain.TianXinReqParam;
|
import com.bamanker.dailylove.domain.TianXinReqParam;
|
||||||
import com.bamanker.dailylove.domain.Weather;
|
import com.bamanker.dailylove.domain.Weather;
|
||||||
import com.bamanker.dailylove.service.DataRemoteClient;
|
import com.bamanker.dailylove.service.DataRemoteClient;
|
||||||
|
import com.bamanker.dailylove.utils.DataUtils;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
@@ -162,8 +163,8 @@ class DailyLoveApplicationTests {
|
|||||||
//
|
//
|
||||||
// @Test
|
// @Test
|
||||||
// void test1() {
|
// void test1() {
|
||||||
// int loveDays = getBirthdays("2023-05-14");
|
// int weddingDays = DataUtils.getWeddingDays("2025-10-08");
|
||||||
// log.info("-------------------------------{}", loveDays);
|
// log.info("wedding_days:{}", weddingDays);
|
||||||
// }
|
// }
|
||||||
//
|
//
|
||||||
// public static int getLoveDays(String loveday) {
|
// public static int getLoveDays(String loveday) {
|
||||||
|
|||||||
Reference in New Issue
Block a user