From 3fec986b6e0a8c1b18feb666f91625b6d24d28aa Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 19 Jul 2024 14:04:27 +0800
Subject: [PATCH] md

---
 emis-biz/pom.xml                              | 15 ++++----
 .../erp/emis/service/sms/CMCCSMSService.java  | 37 ++++++++-----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/emis-biz/pom.xml b/emis-biz/pom.xml
index c16722532..66d62d4ce 100644
--- a/emis-biz/pom.xml
+++ b/emis-biz/pom.xml
@@ -105,13 +105,14 @@
             <version>1.1.14</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.mascloud</groupId>
-            <artifactId>massdk</artifactId>
-            <version>1.0.3</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath>
-        </dependency>
+<!--        江苏移动短信-->
+<!--        <dependency>-->
+<!--            <groupId>com.mascloud</groupId>-->
+<!--            <artifactId>massdk</artifactId>-->
+<!--            <version>1.0.3</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${project.basedir}/lib/masmgc.sdk.sms-1.0.3-SNAPSHOT.jar</systemPath>-->
+<!--        </dependency>-->
 
 
         <!--        <dependency>-->
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java
index 117ef9493..79d756f96 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/sms/CMCCSMSService.java
@@ -2,12 +2,7 @@ package com.xdadan.erp.emis.service.sms;
 
 
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.mascloud.model.MoModel;
-import com.mascloud.model.StatusReportModel;
-import com.mascloud.sdkclient.Client;
-import com.mascloud.util.JsonUtil;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.system.service.ISysConfigService;
@@ -15,8 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 中国移动短信
  */
@@ -73,21 +66,21 @@ public class CMCCSMSService {
     ) throws EmisBizError {
         try {
 
-            Client client = Client.getInstance( );
-            // 登录地址需另外提供
-            boolean isLoggedin = client.login( url, userAccount, password, ecname );
-            if( !isLoggedin ) {
-                log.error("移动短信渠道登录失败");
-                throw new EmisBizError(EmisBizErrorType.FAIL,"移动短信渠道登录失败");
-            }
-
-            // 普通短信
-            int rst = client.sendDSMS( new String[]{phone}, content, seqNo, 1, signCode, null, true );
-
-            // 获取状态报告——开始
-            List<StatusReportModel> statusReportlist = client.getReport( );
-            log.error( "===>移动短信渠道发送状态==>:" + JSON.toJSONString( statusReportlist ) );
-            // 获取状态报告——结束
+//            Client client = Client.getInstance( );
+//            // 登录地址需另外提供
+//            boolean isLoggedin = client.login( url, userAccount, password, ecname );
+//            if( !isLoggedin ) {
+//                log.error("移动短信渠道登录失败");
+//                throw new EmisBizError(EmisBizErrorType.FAIL,"移动短信渠道登录失败");
+//            }
+//
+//            // 普通短信
+//            int rst = client.sendDSMS( new String[]{phone}, content, seqNo, 1, signCode, null, true );
+            int rst=1;
+//            // 获取状态报告——开始
+//            List<StatusReportModel> statusReportlist = client.getReport( );
+//            log.error( "===>移动短信渠道发送状态==>:" + JSON.toJSONString( statusReportlist ) );
+//            // 获取状态报告——结束
 
 //
             if(rst==1) {