修改管理员手机号和密码短信发送调整

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UserController.java

@@ -3,6 +3,7 @@ package com.gic.auth.web.controller;
 import com.gic.auth.web.vo.SuperUserVO;
 import com.gic.auth.web.vo.UserOfGicVO;
 import com.gic.enterprise.base.EnterpriseInfo;
+import com.gic.enterprise.constants.Constants;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -71,23 +72,26 @@ public class UserController {
             if (isNeedSendSms) {
                 //发送短信，通知自动生成密码
                 if (StringUtils.isBlank(userDTO.getPhoneAreaCode())) {
-                    userDTO.setPhoneAreaCode("86");
+                    userDTO.setPhoneAreaCode(Constants.NATION_CODE);
                 }
-                smsArr = new String[] { UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName(),
-                        userDTO.getPhoneNumber(), password };
+                smsArr = new String[] { UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName(), password };
             }
         }
         ServiceResponse userResult;
         //普通用户
         userDTO.setSuperAdmin(0);
+
+        //sms场景ID
+        String smsSenceId = "GICSHHT003";
         if (userDTO.getUserId() == null) {
             userResult = userApiService.saveUser(userDTO);
         } else {
+            smsSenceId = "GICSHHT004";
             userResult = userApiService.editUser(userDTO);
         }
         if (userResult.isSuccess()) {
             if (isNeedSendSms) {
-                ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICpassword001",
+                ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(smsSenceId,
                         UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseId(),
                         userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
                 if (!smsSendResult.isSuccess()) {
@@ -153,7 +157,7 @@ public class UserController {
     @RequestMapping("send-auth-code-to-modify-phone")
     public RestResponse sendAuthCode(String phone, String nationCode) {
         if (StringUtils.isBlank(nationCode)) {
-            nationCode = "86";
+            nationCode = Constants.NATION_CODE;
         }
         AuthCodeDTO authCodeDTO = new AuthCodeDTO();
         authCodeDTO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
@@ -168,9 +172,8 @@ public class UserController {
         if (result.isSuccess()) {
             Integer authCodeId = result.getResult();
             //发送手机验证码
-            String[] smsArr = new String[] { authCode,
-                    UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName() };
-            ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICphone",
+            String[] smsArr = new String[] { authCode };
+            ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICSHHT005",
                     UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseId(), nationCode, phone, smsArr);
             if (!smsSendResult.isSuccess()) {
                 return EnterpriseRestResponse.failure(smsSendResult);
@@ -213,9 +216,9 @@ public class UserController {
         if (result.isSuccess()) {
             Integer authCodeId = result.getResult();
             //发送手机验证码
-            String[] smsArr = new String[] { authCode,
-                    UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName() };
-            ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICpassword",
+            String[] smsArr = new String[] {
+                    UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseName(), authCode };
+            ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICSHHT004",
                     UserDetailUtils.getUserDetail().getEnterpriseInfo().getEnterpriseId(),
                     UserDetailUtils.getUserDetail().getUserInfo().getPhoneAreaCode(),
                     UserDetailUtils.getUserDetail().getUserInfo().getPhoneNumber(), smsArr);