From cca504b84583f8f8289b34e794939b8590a16446 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 23 五月 2023 14:34:22 +0800
Subject: [PATCH] optimzie exit room

---
 java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java |   63 +++++++++++++++++++++++++++----
 1 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java b/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
index cab4471..af2e659 100644
--- a/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/YidongSendMessageFactory.java
@@ -94,17 +94,64 @@
         return result;
     }
 
-    public static void sendMessage(String tel, String code) {
+//    public static void sendMessage(String tel, String code) {
+//
+//        String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
+//        String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
+//        String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
+//        String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
+//        String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
+//        String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
+//        String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
+//
+//        String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+//
+//        //寮�濮嬪彂閫侀獙璇佺爜
+//        String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+//                "<WsSubmitTempletReq>\n" +
+//                "  <apId>" + apId + "</apId>\n" +
+//                "  <secretKey>" + secretKey + "</secretKey>\n" +
+//                "  <ecName>" + ecName + "</ecName>\n" +
+//                "  <mobiles>\n" +
+//                "    <string>" + tel + "</string>\n" +
+//                "  </mobiles>\n" +
+//                "  <params>\n" +
+//                "    <string>" + code + "</string>\n" +
+//                "  </params>\n" +
+//                "  <sign>" + sign + "</sign>\n" +
+//                "  <addSerial>" + addSerial + "</addSerial>\n" +
+//                "  <mac>" + mac + "</mac>\n" +
+//                "  <templateId>" + templateId + "</templateId>\n" +
+//                "</WsSubmitTempletReq>";
+//
+//        reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+//        logger.debug("璇锋眰绉诲姩鍏徃璇锋眰鎶ユ枃锛歿}",reqParam);
+//        HttpHeaders httpHeaders = new HttpHeaders();
+//        httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
+//        outRestTemplate = ApplicationContextFactory.getBean("outRestTemplate",OutRestTemplate.class);
+//        HttpEntity<MultiValueMap<String, Object>> httpEntity = new HttpEntity(reqParam, httpHeaders);
+//        try {
+//            ResponseEntity<String> responseEntity = outRestTemplate.exchange(url, HttpMethod.POST, httpEntity, String.class);
+//            logger.debug("绉诲姩鍏徃杩斿洖鎶ユ枃,{}",responseEntity);
+//        }catch (HttpStatusCodeException e){
+//            logger.error("璋冪敤寮傚父",e);
+//        }catch (Exception e){
+//            logger.error("璋冪敤寮傚父",e);
+//        }
+//
+//    }
 
+    public static void sendMessage(String tel, String code) {
         String apId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "apId");
         String secretKey = MappingCache.getValue(YIDONG_SMS_DOMAIN, "secretKey");
         String ecName = MappingCache.getValue(YIDONG_SMS_DOMAIN, "ecName");
         String sign = MappingCache.getValue(YIDONG_SMS_DOMAIN, "sign");
         String addSerial = MappingCache.getValue(YIDONG_SMS_DOMAIN, "addSerial");
-        String templateId = MappingCache.getValue(YIDONG_SMS_DOMAIN, "templateId");
         String url = MappingCache.getValue(YIDONG_SMS_DOMAIN, "yidong_url");
 
-        String mac = getMac(ecName, apId, secretKey, templateId, tel, code, sign, addSerial);
+        String param = "鎮ㄧ殑楠岃瘉鐮佹槸锛�"+code+",楠岃瘉鐮佹湁鏁堟湡5鍒嗛挓";
+
+        String mac = getMac(ecName, apId, secretKey, tel, param, sign, addSerial);
 
         //寮�濮嬪彂閫侀獙璇佺爜
         String reqParam = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
@@ -115,16 +162,13 @@
                 "  <mobiles>\n" +
                 "    <string>" + tel + "</string>\n" +
                 "  </mobiles>\n" +
-                "  <params>\n" +
-                "    <string>" + code + "</string>\n" +
-                "  </params>\n" +
+                "    <content>" + param + "</content>\n" +
                 "  <sign>" + sign + "</sign>\n" +
                 "  <addSerial>" + addSerial + "</addSerial>\n" +
                 "  <mac>" + mac + "</mac>\n" +
-                "  <templateId>" + templateId + "</templateId>\n" +
                 "</WsSubmitTempletReq>";
 
-        reqParam = WEBSERVICE_BODY.replace("REQUESTBODY",reqParam);
+        reqParam = WEBSERVICE_BODY2.replace("REQUESTBODY",reqParam);
         logger.debug("璇锋眰绉诲姩鍏徃璇锋眰鎶ユ枃锛歿}",reqParam);
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.add("Content-Type","text/xml;charset=UTF-8");
@@ -138,6 +182,7 @@
         }catch (Exception e){
             logger.error("璋冪敤寮傚父",e);
         }
+
 
     }
 
@@ -173,7 +218,7 @@
                 "  <mobiles>\n" +
                 "    <string>" + tel + "</string>\n" +
                 "  </mobiles>\n" +
-                "    <content>" + param + "</string>\n" +
+                "    <content>" + param + "</content>\n" +
                 "  <sign>" + sign + "</sign>\n" +
                 "  <addSerial>" + addSerial + "</addSerial>\n" +
                 "  <mac>" + mac + "</mac>\n" +

--
Gitblit v1.8.0