diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java index a759eee..1a3ec1c 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java @@ -13,6 +13,7 @@ import com.jjb.saas.message.client.message.request.MessageTargetCmd; import com.zcloud.basic.info.command.convertor.UserCoConvertor; import com.zcloud.basic.info.command.query.CorpInfoQueryExe; import com.zcloud.basic.info.constant.RedisConstant; +import com.zcloud.basic.info.domain.config.CodeConfig; import com.zcloud.basic.info.domain.enums.UserEmploymentFlagEnum; import com.zcloud.basic.info.domain.enums.UserFlowFlagEnum; import com.zcloud.basic.info.domain.gateway.*; @@ -26,12 +27,10 @@ import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.annotation.Resource; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -65,6 +64,12 @@ public class UserAddExe { private ZcloudRedisUtil zcloudRedisUtil; private final UserCorpRecordRepository userCorpRecordRepository; +// private final String sourceCode; +// @Value("${seng.message:MS000087}") +// public void setSourceCode(String sourceCode) { +// this.sourceCode = sourceCode; +// } + private final CodeConfig codeConfig; @Transactional(rollbackFor = Exception.class) public boolean execute(UserAddCmd cmd) { @@ -128,6 +133,7 @@ public class UserAddExe { } BeanUtils.copyProperties(cmd, userE); userE.setPassword(cmd.getNewPassword()); + userE.encryptionPassword(); userE.setCorpinfoId(corpInfoDO.getId()); userE.setDepartmentId(corpInfoDO.getId()); userGateway.register(userE); @@ -259,7 +265,7 @@ public class UserAddExe { MessageTargetCmd messageTargetCmd = new MessageTargetCmd(); messageTargetCmd.setMobile(phone); messageSendCmd.setTargetCmd(messageTargetCmd); - messageSendCmd.setSourceCode("MS000087"); + messageSendCmd.setSourceCode(codeConfig.getMessage()); Map sendParams = new HashMap(); sendParams.put("code", phoneCode); messageSendCmd.setParams(sendParams); diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 31031cb..90a0af9 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -259,6 +259,7 @@ public class UserQueryExe { corpInfoCOList.addAll(corpInfoCOS); } userLoginCO.setCorpInfoCOList(corpInfoCOList); + userLoginCO.setUserCO(userCoConvertor.converDOToCO(userDO)); return userLoginCO; } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java index 4eca9d6..0e03c44 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/UserLoginCO.java @@ -23,5 +23,6 @@ public class UserLoginCO extends ClientObject { private Boolean isInfoComplete; @ApiModelProperty(value = "用户关联的公司列表") private List corpInfoCOList; + private UserCO userCO; } diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/config/CodeConfig.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/CodeConfig.java new file mode 100644 index 0000000..ee0cb24 --- /dev/null +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/config/CodeConfig.java @@ -0,0 +1,13 @@ +package com.zcloud.basic.info.domain.config; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "code") +@Data +public class CodeConfig { + + private String message="MS000087"; +} diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java index cc92bc0..4460606 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java +++ b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/UserE.java @@ -279,8 +279,9 @@ public class UserE extends BaseE { } public void encryptionPassword() { - - this.setPassword(Sm2Util.encryptHex(MD5.md5(password), publicKey)); + if(StringUtils.isNotEmpty(password)){ + this.setPassword(Sm2Util.encryptHex(MD5.md5(password), publicKey)); + } if (StringUtils.isNotEmpty(newPassword)) { this.setNewPassword(Sm2Util.encryptHex(MD5.md5(newPassword), publicKey)); }