Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

代码提交

Browse Source
This commit is contained in:
xuyang
2023-06-27 10:18:13 +08:00
parent 77adf7b42c
commit fdb0e3fdd2
7 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppRoleServiceImpl.java
View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.PubUtils;
import com.njcn.redis.utils.RedisUtil;
import com.njcn.user.enums.UserResponseEnum;
import com.njcn.user.pojo.po.UserRole;
@@ -53,7 +54,7 @@ public class AppRoleServiceImpl implements IAppRoleService {
LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
for (Map.Entry<String, String> entry : map.entrySet()) {
if (Objects.equals(entry.getKey(),referralCode)){
roleMap.put(ReferralCodeServiceImpl.getCode(),entry.getValue());
roleMap.put(PubUtils.getCode(6),entry.getValue());
} else {
roleMap.put(entry.getKey(),entry.getValue());
}

4
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java
View File

@@ -259,7 +259,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
}
private void judgeCode(String phone, String code, String devCode) {
String key = phone + devCode;
String key = RedisKeyEnum.SMS_LOGIN_KEY.getKey() + phone;
String redisCode = redisUtil.getStringByKey(key);
if (StringUtils.isEmpty(redisCode) || !code.equalsIgnoreCase(redisCode)) {
throw new BusinessException(UserResponseEnum.LOGIN_WRONG_CODE);
@@ -286,7 +286,7 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, User> impleme
user.setState(UserState.ENABLE);
user.setOrigin(UserState.NORMAL_ORIGIN);
user.setCasualUser(UserType.OFFICIAL);
user.setPwdState(UserState.NEED);
user.setPwdState(UserState.NEEDLESS);
user.setRegisterTime(LocalDateTime.now());
user.setLoginTime(LocalDateTime.now());
user.setPwdValidity(LocalDateTime.now());

30
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/ReferralCodeServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.njcn.user.service.impl;
import com.njcn.common.utils.PubUtils;
import com.njcn.redis.utils.RedisUtil;
import com.njcn.user.pojo.vo.app.RoleReferralCodeVO;
import com.njcn.user.service.IReferralCodeService;
@@ -22,8 +23,6 @@ import java.util.*;
@AllArgsConstructor
public class ReferralCodeServiceImpl implements IReferralCodeService {
private static final String BASIC = "123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZZ";
private final RedisUtil redisUtil;
private final IRoleService roleService;
@@ -34,9 +33,9 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
Object object = redisUtil.getObjectByKey("roleReferralCode");
if (Objects.isNull(object)){
LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
String code1 = getCode();
String code2 = getCode();
String code3 = getCode();
String code1 = PubUtils.getCode(6);
String code2 = PubUtils.getCode(6);
String code3 = PubUtils.getCode(6);
roleMap.put(code1,"market_user");
roleMap.put(code2,"engineering_user");
roleMap.put(code3,"app_user");
@@ -66,9 +65,9 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
@Override
public List<RoleReferralCodeVO> refreshReferralCode() {
LinkedHashMap<String,String> roleMap = new LinkedHashMap<>();
String code1 = getCode();
String code2 = getCode();
String code3 = getCode();
String code1 = PubUtils.getCode(6);
String code2 = PubUtils.getCode(6);
String code3 = PubUtils.getCode(6);
roleMap.put(code1,"market_user");
roleMap.put(code2,"engineering_user");
roleMap.put(code3,"app_user");
@@ -82,21 +81,8 @@ public class ReferralCodeServiceImpl implements IReferralCodeService {
RoleReferralCodeVO vo3 = new RoleReferralCodeVO();
vo3.setRoleName(roleService.getRoleByCode("app_user").getName());
vo3.setRoleReferralCode(code3);
return Arrays.asList(vo1,vo2,vo3);
}
/**
* 生成随机推荐码
*/
public static String getCode(){
char[] basicArray = BASIC.toCharArray();
Random random = new Random();
char[] result = new char[6];
for (int i = 0; i < result.length; i++) {
int index = random.nextInt(100) % (basicArray.length);
result[i] = basicArray[index];
}
return new String(result);
}
}

22
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -251,19 +251,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
return null;
}
BeanUtil.copyProperties(user, userVO);
Dept dept = deptService.getDeptById(user.getDeptId());
//非自定义部门
if (Objects.equals(dept.getType(),0)){
String areaId = deptService.getAreaIdByDeptId(user.getDeptId());
userVO.setAreaId(areaId);
userVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
} else {
userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
if (!Objects.isNull(user.getDeptId())){
Dept dept = deptService.getDeptById(user.getDeptId());
//非自定义部门
if (Objects.equals(dept.getType(),0)){
String areaId = deptService.getAreaIdByDeptId(user.getDeptId());
userVO.setAreaId(areaId);
userVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
} else {
userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
}
userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length);
}
userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
userVO.setRoleList(roleService.getIdByUserId(id));
userVO.setRole(roleService.getNameByUserId(id));
userVO.setDeptLevel(dept.getPids().split(StrUtil.COMMA).length);
return userVO;
}

4
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserSetServiceImpl.java
View File

@@ -53,8 +53,10 @@ public class UserSetServiceImpl extends ServiceImpl<UserSetMapper, UserSet> impl
String secretKey = PubUtils.randomCode(16);
userSet.setSecretKey(secretKey);
Sm4Utils sm4 = new Sm4Utils(secretKey);
String password = PubUtils.getCode(8);
System.out.println("password==:" + password);
//SM4加密初始默认密码
String strSm4 = sm4.encryptData_ECB(UserDefaultPassword.DEFAULT_PASSWORD);
String strSm4 = sm4.encryptData_ECB(password);
userSet.setStandBy(strSm4);
this.save(userSet);
return userSet;