From f84e186541e7991147d2b09d1b10247d281c2996 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:51:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-test.yml | 12 ++++--
ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/model/WeixinProperties.java | 71 +++++++++++++++++++++++++++++++++++
ruoyi-applet/src/main/resources/application-prod.yml | 10 ++++-
ruoyi-admin/src/main/resources/application-prod.yml | 10 ++++-
ruoyi-applet/src/main/resources/application-test.yml | 10 ++++-
5 files changed, 103 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index f168337..f6fa34b 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -195,8 +195,14 @@
prefix: ""
wx:
conf:
- appId: wx75922efb57320f77
- secretId: 7a2aa1f837b7aeb3bc24a6b569c65110
+ appId: wx27937c4532eb9c00
+ secretId: ee6302e95174b9ef987738e622f8ead4
+ taskResultTemplateId: aQmmeNeSoU08zjIp_a0OQXT4kjz1gUJD98n9-QAZk_o # 任务数据提交结果通知
+ dayWorkTemplateId: z8EEMyoGuRB_olmbStIipDFHY68sBxZG6lVW2pu_KSo # 每日工作未完成提醒
+ appealResultTemplateId: l4upF2DrmkvQJoXAl6OqFHHSJBlh3JMz5vy2NYiuGrs # 申诉结果通知
+ pendApprovalTemplateId: rP4qq4LvisYTOSh14qoIalSWcL0ZpR_NrNHYwoxn8iY # 待审核提醒
+ makeCopyTemplateId: JliafsC5BfjudMSrFw8YT4mnXQ1mbdHg3dRHsKUMoFU # 审核抄送通知
+ problemRectificationTemplateId: _OEwRxqNZevSKryp4AU62a-yzbX16kIdliUVbbc8q-E # 问题整改通知
#OSS及短信配置
code:
config:
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index f5a8d21..ee3f480 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -196,10 +196,14 @@
# prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
conf:
- appId: wxe91f1af7638aa5dd
- secretId: a787e1a462715604e0c9528b6d8960d1
- templateResultId: C4YA0kRIhoJYwKbhrNhxi8wcRLP4R92QME-lc6eygAo
- templateDateId: fWv6EnWlUNhR5Gu-6b6rv0xbk-yr7pB_kKH_Xnt7ts4
+ appId: wx27937c4532eb9c00
+ secretId: ee6302e95174b9ef987738e622f8ead4
+ taskResultTemplateId: aQmmeNeSoU08zjIp_a0OQXT4kjz1gUJD98n9-QAZk_o # 任务数据提交结果通知
+ dayWorkTemplateId: z8EEMyoGuRB_olmbStIipDFHY68sBxZG6lVW2pu_KSo # 每日工作未完成提醒
+ appealResultTemplateId: l4upF2DrmkvQJoXAl6OqFHHSJBlh3JMz5vy2NYiuGrs # 申诉结果通知
+ pendApprovalTemplateId: rP4qq4LvisYTOSh14qoIalSWcL0ZpR_NrNHYwoxn8iY # 待审核提醒
+ makeCopyTemplateId: JliafsC5BfjudMSrFw8YT4mnXQ1mbdHg3dRHsKUMoFU # 审核抄送通知
+ problemRectificationTemplateId: _OEwRxqNZevSKryp4AU62a-yzbX16kIdliUVbbc8q-E # 问题整改通知
#OSS及短信配置
code:
config:
diff --git a/ruoyi-applet/src/main/resources/application-prod.yml b/ruoyi-applet/src/main/resources/application-prod.yml
index 9216208..28ce92a 100644
--- a/ruoyi-applet/src/main/resources/application-prod.yml
+++ b/ruoyi-applet/src/main/resources/application-prod.yml
@@ -203,8 +203,14 @@
prefix: ""
wx:
conf:
- appId: wx75922efb57320f77
- secretId: 7a2aa1f837b7aeb3bc24a6b569c65110
+ appId: wx27937c4532eb9c00
+ secretId: ee6302e95174b9ef987738e622f8ead4
+ taskResultTemplateId: aQmmeNeSoU08zjIp_a0OQXT4kjz1gUJD98n9-QAZk_o # 任务数据提交结果通知
+ dayWorkTemplateId: z8EEMyoGuRB_olmbStIipDFHY68sBxZG6lVW2pu_KSo # 每日工作未完成提醒
+ appealResultTemplateId: l4upF2DrmkvQJoXAl6OqFHHSJBlh3JMz5vy2NYiuGrs # 申诉结果通知
+ pendApprovalTemplateId: rP4qq4LvisYTOSh14qoIalSWcL0ZpR_NrNHYwoxn8iY # 待审核提醒
+ makeCopyTemplateId: JliafsC5BfjudMSrFw8YT4mnXQ1mbdHg3dRHsKUMoFU # 审核抄送通知
+ problemRectificationTemplateId: _OEwRxqNZevSKryp4AU62a-yzbX16kIdliUVbbc8q-E # 问题整改通知
#OSS及短信配置
code:
config:
diff --git a/ruoyi-applet/src/main/resources/application-test.yml b/ruoyi-applet/src/main/resources/application-test.yml
index 670b190..f717fad 100644
--- a/ruoyi-applet/src/main/resources/application-test.yml
+++ b/ruoyi-applet/src/main/resources/application-test.yml
@@ -197,8 +197,14 @@
# prefix: https://xzgt.test.591taxi.cn:${server.port}${server.servlet.context-path}
wx:
conf:
- appId: wxe91f1af7638aa5dd
- secretId: a787e1a462715604e0c9528b6d8960d1
+ appId: wx27937c4532eb9c00
+ secretId: ee6302e95174b9ef987738e622f8ead4
+ taskResultTemplateId: aQmmeNeSoU08zjIp_a0OQXT4kjz1gUJD98n9-QAZk_o # 任务数据提交结果通知
+ dayWorkTemplateId: z8EEMyoGuRB_olmbStIipDFHY68sBxZG6lVW2pu_KSo # 每日工作未完成提醒
+ appealResultTemplateId: l4upF2DrmkvQJoXAl6OqFHHSJBlh3JMz5vy2NYiuGrs # 申诉结果通知
+ pendApprovalTemplateId: rP4qq4LvisYTOSh14qoIalSWcL0ZpR_NrNHYwoxn8iY # 待审核提醒
+ makeCopyTemplateId: JliafsC5BfjudMSrFw8YT4mnXQ1mbdHg3dRHsKUMoFU # 审核抄送通知
+ problemRectificationTemplateId: _OEwRxqNZevSKryp4AU62a-yzbX16kIdliUVbbc8q-E # 问题整改通知
#OSS及短信配置
code:
config:
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/model/WeixinProperties.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/model/WeixinProperties.java
index 5a6d407..9619f29 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/model/WeixinProperties.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/wx/model/WeixinProperties.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.utils.wx.model;
+import lombok.Data;
import lombok.ToString;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -43,6 +44,76 @@
* @return secret ID
*/
private String taskResultTemplateId;
+ /**
+ * 每日工作未完成提醒
+ *
+ * @return secret ID
+ */
+ private String dayWorkTemplateId;
+ /**
+ * 申诉结果通知
+ *
+ * @return secret ID
+ */
+ private String appealResultTemplateId;
+ /**
+ * 待审核提醒
+ *
+ * @return secret ID
+ */
+ private String pendApprovalTemplateId;
+ /**
+ * 审核抄送通知
+ *
+ * @return secret ID
+ */
+ private String makeCopyTemplateId;
+ /**
+ * 问题整改通知
+ *
+ * @return secret ID
+ */
+ private String problemRectificationTemplateId;
+
+ public String getDayWorkTemplateId() {
+ return dayWorkTemplateId;
+ }
+
+ public void setDayWorkTemplateId(String dayWorkTemplateId) {
+ this.dayWorkTemplateId = dayWorkTemplateId;
+ }
+
+ public String getAppealResultTemplateId() {
+ return appealResultTemplateId;
+ }
+
+ public void setAppealResultTemplateId(String appealResultTemplateId) {
+ this.appealResultTemplateId = appealResultTemplateId;
+ }
+
+ public String getPendApprovalTemplateId() {
+ return pendApprovalTemplateId;
+ }
+
+ public void setPendApprovalTemplateId(String pendApprovalTemplateId) {
+ this.pendApprovalTemplateId = pendApprovalTemplateId;
+ }
+
+ public String getMakeCopyTemplateId() {
+ return makeCopyTemplateId;
+ }
+
+ public void setMakeCopyTemplateId(String makeCopyTemplateId) {
+ this.makeCopyTemplateId = makeCopyTemplateId;
+ }
+
+ public String getProblemRectificationTemplateId() {
+ return problemRectificationTemplateId;
+ }
+
+ public void setProblemRectificationTemplateId(String problemRectificationTemplateId) {
+ this.problemRectificationTemplateId = problemRectificationTemplateId;
+ }
public String getTaskResultTemplateId() {
return taskResultTemplateId;
--
Gitblit v1.7.1