优化了短信模块

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/common/util/ZwSmsClient.java

@@ -27,22 +27,22 @@ public class ZwSmsClient {
     /**
      * 短信平台账号（明文，发送前经 AZDG 加密）
      */
-    @Value("${sms.account:}")
+    @Value("${sms.account}")
     private String username;
 
-    @Value("${sms.pwd:}")
+    @Value("${sms.pwd}")
     private String password;
 
     /**
      * 短信平台 WebService 地址
      */
-    @Value("${sms.url:https://szsms.sz.gov.cn:8000/services/Sms}")
+    @Value("${sms.url}")
     private String url;
 
     /**
      * 批次号
      */
-    @Value("${sms.batch:2409}")
+    @Value("${sms.batch}")
     private String batch;
 
     /**

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpNoticeServiceImpl.java

@@ -167,33 +167,34 @@ public class EfcodeCpNoticeServiceImpl implements IEfcodeCpNoticeService {
      */
     public void getSendYuGaoMsg(EfcodeCpNotice entity){
 
-        // 发送前校验系统参数开关
-        if (!isSnsSendEnabled()) {
-            log.info("系统参数[sns.send]未开启，跳过预告消息(站内信/短信)发送，预告ID：{}", entity.getId());
         return;
-        }
-
-        generateSystemMessage(entity);
-        try{
-            YuGaoMsgParamBo paramBo = new YuGaoMsgParamBo();
-            paramBo.setSourceId(entity.getId());
-            paramBo.setEnterpriseId(entity.getEnterpriseId());
-            paramBo.setEnterpriseName(entity.getEnterpriseName());
-            paramBo.setCreateByName(LoginHelper.getUsername());
-            paramBo.setDeptName(entity.getDeptName());
-            paramBo.setEnforceDate(entity.getEnforceDate());
-            siqService.sendYuGaoMsg(paramBo);
-
-        }catch (Exception e){
-            log.error("发送预告消息异常：{}", e.getMessage());
-        }
-
-        try {
-            // 异步发送预告短信
-            sendYuGaoSms(entity);
-        }catch (Exception e){
-            log.error("发送预告短信异常：{}", e.getMessage());
-        }
+        // 发送前校验系统参数开关
+//        if (!isSnsSendEnabled()) {
+//            log.info("系统参数[sns.send]未开启，跳过预告消息(站内信/短信)发送，预告ID：{}", entity.getId());
+//            return;
+//        }
+//
+//        generateSystemMessage(entity);
+//        try{
+//            YuGaoMsgParamBo paramBo = new YuGaoMsgParamBo();
+//            paramBo.setSourceId(entity.getId());
+//            paramBo.setEnterpriseId(entity.getEnterpriseId());
+//            paramBo.setEnterpriseName(entity.getEnterpriseName());
+//            paramBo.setCreateByName(LoginHelper.getUsername());
+//            paramBo.setDeptName(entity.getDeptName());
+//            paramBo.setEnforceDate(entity.getEnforceDate());
+//            siqService.sendYuGaoMsg(paramBo);
+//
+//        }catch (Exception e){
+//            log.error("发送预告消息异常：{}", e.getMessage());
+//        }
+//
+//        try {
+//            // 异步发送预告短信
+//            sendYuGaoSms(entity);
+//        }catch (Exception e){
+//            log.error("发送预告短信异常：{}", e.getMessage());
+//        }
 
     }
 

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml

@@ -402,3 +402,10 @@ springdoc:
       packages-to-scan: com.zdxt.enforcementcode
     - group: 3.系统模块
       packages-to-scan: org.dromara.system
+
+#短信平台
+sms:
+  account: XXX
+  pwd: XXX
+  batch: 2409
+  url: https://XXX:8000/services/Sms

zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-prod.yml

@@ -332,6 +332,8 @@ mssq:
 sms:
   account: 122
   pwd: szsfj1800
+  batch: 2409
+  url: https://szsms.sz.gov.cn:8000/services/Sms
 
 
 #市监代理页面