From: qiaowei <jov123@163.com>
Date: Mon, 9 Sep 2019 08:35:58 +0000 (+0800)
Subject: 修改手机接口
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=38b46169a2f97c9e061276e9ac4f64b6c00b1a7d;p=epayment%2Ffood_payapi.git

修改手机接口
---

diff --git a/payapi/build.gradle b/payapi/build.gradle
index bb6058ce..2d6953f3 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -89,11 +89,14 @@ dependencies {
     implementation group: 'javax.servlet', name: 'jstl', version: '1.2'
     implementation group: 'taglibs', name: 'standard', version: '1.1.2'
     implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
-    implementation files('libs/sms.jar')
+    implementation files('libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar')
 //    implementation files('libs/ojdbc6.jar')
     implementation 'commons-dbcp:commons-dbcp:1.4'
     implementation 'commons-beanutils:commons-beanutils:1.9.3'
 
+    implementation 'log4j:log4j:1.2.17'
+    implementation 'com.alibaba:fastjson:1.2.60'
+
     implementation project(':payapi-common')
     /*支付宝SDK*/
     implementation group: 'com.alipay.sdk', name: 'alipay-sdk-java', version: '3.7.110.ALL'
diff --git a/payapi/libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar b/payapi/libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar
new file mode 100755
index 00000000..a20d7022
Binary files /dev/null and b/payapi/libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar differ
diff --git a/payapi/libs/sms.jar b/payapi/libs/sms.jar
deleted file mode 100755
index 37ff2599..00000000
Binary files a/payapi/libs/sms.jar and /dev/null differ
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt
index c4ae9b6b..3a133e27 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/notify_api_controller.kt
@@ -4,6 +4,7 @@ import com.supwisdom.dlpay.agent.AgentCode
 import com.supwisdom.dlpay.agent.service.AlipayService
 import com.supwisdom.dlpay.agent.service.WechatService
 import com.supwisdom.dlpay.framework.tenant.TenantContext
+import org.dom4j.Element
 import org.dom4j.io.SAXReader
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
@@ -43,7 +44,7 @@ class NotifyController {
             // 得到xml根元素
             val root = document.rootElement
             // 得到根元素的所有子节点
-            val elementList = root.elements()
+            val elementList  = root.elements() as MutableList<Element>
             // 遍历所有子节点
             for (e in elementList) {
                 map[e.name] = e.text
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
index 9c3e2e28..4f38c76a 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/MobileApi.kt
@@ -99,11 +99,11 @@ class ApiInit {
             val code = RandomUtils.randomNumber(6)
             logger.error { code }
             //TODO 先发送成功，再放入redis
-            redisTemplate.opsForValue().set(phone, code, Duration.ofMinutes(5))
             val rs = mobileApiService.sendSms(phone, code)
             if ("0" != rs.retcode) {
                 return JsonResult.error(rs.retmsg)
             }
+            redisTemplate.opsForValue().set(phone, code, Duration.ofMinutes(5))
         }
         return JsonResult.ok("验证码已发送")
     }
diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
index 560a9687..292b73ca 100644
--- a/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/mobile/service/impl/MobileApiServiceImpl.kt
@@ -14,6 +14,7 @@ import com.supwisdom.dlpay.util.ConstantUtil
 import mu.KotlinLogging
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+import org.springframework.util.Base64Utils
 import java.util.*
 
 @Service
@@ -99,11 +100,8 @@ class MobileApiServiceImpl : MobileApiService {
             return resp
         }
         var addserial = systemUtilService.getBusinessValue("sms.addserial")
-        if (pwd.isNullOrEmpty()) {
-            resp.retcode = "1"
-            resp.retmsg = "短信业务参数未配置"
-            logger.error { "短信参数：sms.addserial 未在业务表中配置" }
-            return resp
+        if (addserial.isNullOrEmpty()) {
+            addserial=""
         }
         var sign = systemUtilService.getBusinessValue("sms.sign")
         if (sign.isNullOrEmpty()) {