Commit 6f81706a by guojuxing

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

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