Merge remote-tracking branch 'origin/master'

src/main/java/kd/bos/login/utils/DemoSMSSender.java

@@ -46,23 +46,25 @@ public class DemoSMSSender implements SMSSender {
         String servername =  jkpzxx.getString("nckd_servername");
         String port =  jkpzxx.getString("nckd_port");
         //2.获取xml对象
-        String bodyxml = createSingleMessageRequest(phone,message);
+        String bodyxml = createSingleMessageRequest(phone,message,jkpzxx);
+        log.info("[密码重置短信发送]申请报文："+bodyxml);
         //3.调用接口
         JSONObject cbsReturnJson =socketService(servername,port,bodyxml);
+        log.info("[密码重置短信发送]返回报文："+cbsReturnJson);
         if(cbsReturnJson!=null) {
             JSONObject reMessage = cbsReturnJson.getJSONObject("Message");
             JSONObject reBodyInfo = reMessage.getJSONObject("BodyInfo");
             if (reBodyInfo.getString("Fs_retMsg").contains("success")) {//相应成功
                 if ("000".equals(reBodyInfo.getString("Fs_retCode"))) {
                     flag = true;
-                    log.info("短信前置机响应成功，前置机接口发送成功");
+                    log.info("[密码重置短信发送]前置机响应成功，前置机接口发送成功");
                     //写入日志
                     writeLog(phone);
                 } else {
-                    log.info("短信前置机响应成功，前置机接口发送失败");
+                    log.info("[密码重置短信发送]前置机响应成功，前置机接口发送失败");
                 }
             } else {
-                log.info("短信发送前置机响应失败："+reBodyInfo.getString("Fs_retMsg"));
+                log.info("[密码重置短信发送]发送前置机响应失败："+reBodyInfo.getString("Fs_retMsg"));
             }
         }
         return flag;
@@ -107,7 +109,7 @@ public class DemoSMSSender implements SMSSender {
         return flag;
     }
 
-    private String createSingleMessageRequest(String phone, String message) {
+    private String createSingleMessageRequest(String phone, String message, DynamicObject jkpzxx) {
         try {
             DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
             DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
@@ -138,7 +140,8 @@ public class DemoSMSSender implements SMSSender {
             String regOrg = getRegOrg(phone);
             createElement(doc, body, "Fs_regOrg", regOrg);//发送机构（待提供），例100802
             createElement(doc, body, "Fs_bizId", "00007");//业务类型id
-            createElement(doc, body, "Fs_templateId", "2409029227");//模板id
+            String templateId = jkpzxx.getString("nckd_user");
+            createElement(doc, body, "Fs_templateId", templateId);//模板id,2409029227
 
             String nowStr2 = formatter.format(now);
             String Fs_reqDate = nowStr2.substring(0,8);