Commit 5167791c authored by caotao's avatar caotao

对人员管理中密码进行DES加密

parent 0fa71662
...@@ -18,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil; ...@@ -18,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
...@@ -53,6 +54,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -53,6 +54,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
//人员教育信息 //人员教育信息
@Autowired @Autowired
PersonSkillEducationServiceImpl personSkillEducationService; PersonSkillEducationServiceImpl personSkillEducationService;
@Value("${amos.secret.key}")
String secretKey;
/** /**
* 分页查询 * 分页查询
...@@ -118,9 +121,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -118,9 +121,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
} }
usd.setOrgRoleSeqs(map); usd.setOrgRoleSeqs(map);
//密码 //密码
usd.setPassword(DesUtil.encode(personAccount.getPassword(), "qaz")); usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
//二次密码 //二次密码
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz")); usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
//用户名 //用户名
usd.setRealName(personAccount.getName()); usd.setRealName(personAccount.getName());
//账号 //账号
...@@ -154,6 +157,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -154,6 +157,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
} }
personAccount.setPuserId(agencyUserModel.getUserId()); personAccount.setPuserId(agencyUserModel.getUserId());
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personAccount.setPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
this.personBasicMapper.updateById(personBasic); this.personBasicMapper.updateById(personBasic);
this.personAccountService.updateById(personAccount); this.personAccountService.updateById(personAccount);
} }
...@@ -205,9 +210,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -205,9 +210,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
} }
usd.setOrgRoleSeqs(map); usd.setOrgRoleSeqs(map);
//密码 //密码
usd.setPassword(DesUtil.encode(personAccount.getPassword(), "qaz")); usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
//二次密码 //二次密码
usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), "qaz")); usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
//用户名 //用户名
usd.setRealName(personAccount.getName()); usd.setRealName(personAccount.getName());
//账号 //账号
...@@ -242,6 +247,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -242,6 +247,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace())); personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
} }
personAccount.setProjectName(companyModel.getCompanyName()); personAccount.setProjectName(companyModel.getCompanyName());
personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
personAccount.setPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
this.personBasicMapper.updateById(personBasic); this.personBasicMapper.updateById(personBasic);
personAccountService.updateById(personAccount); personAccountService.updateById(personAccount);
return model; return model;
...@@ -275,6 +282,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -275,6 +282,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
//人员账号信息 //人员账号信息
PersonAccount personAccount = personAccountService.getOne(wrapper4); PersonAccount personAccount = personAccountService.getOne(wrapper4);
personAccount.setPhoneNum(personBasic.getPhone()); personAccount.setPhoneNum(personBasic.getPhone());
//对于密码进行解密
personAccount.setPassword(DesUtil.decode(personAccount.getPassword(), secretKey));
personAccount.setSecondaryPassword(DesUtil.decode(personAccount.getSecondaryPassword(), secretKey));
if (personBasic.getNativePlace() != null) { if (personBasic.getNativePlace() != null) {
personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class)); personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(), Integer.class));
} }
...@@ -418,5 +428,4 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa ...@@ -418,5 +428,4 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
return page; return page;
} }
} }
\ No newline at end of file
...@@ -72,3 +72,9 @@ spring.security.user.password=a1234560 ...@@ -72,3 +72,9 @@ spring.security.user.password=a1234560
fire-rescue=123 fire-rescue=123
mybatis-plus.global-config.db-config.update-strategy=ignored mybatis-plus.global-config.db-config.update-strategy=ignored
# user-amos setting : This value is the secretkey for person manage moudle accout password encryption.please don't change it!!!
amos.secret.key=qaz
# if your service can't be access ,you can use this setting , you need change ip as your.
#eureka.instance.prefer-ip-address=true
#eureka.instance.ip-address=172.16.3.122
\ No newline at end of file
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