CY
/
mcwl-ai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: CY:42a4d25a8f895ab9806569bb6a51c367b5cb1011
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment
..
compare: CY:1b32f289cbb2aca2ef6ffc8c58895899f075a029
Branches Tags
CY:feature/admin
CY:preview
CY:feature/community-center
CY:master
CY:feature/resource
CY:feature/knowledge-Planet
CY:feature/my-invitation
CY:feature/comment

No commits in common. "42a4d25a8f895ab9806569bb6a51c367b5cb1011" and "1b32f289cbb2aca2ef6ffc8c58895899f075a029" have entirely different histories.
42a4d25a8f ... 1b32f289cb

7 changed files with 8 additions and 95 deletions
Show Stats Expand all files Collapse all files

2
mcwl-admin/src/main/java/com/mcwl/web/controller/system/SysLoginController.java
View File

@ -86,7 +86,7 @@ public class SysLoginController
rabbitTemplate.convertAndSend(QueueConstants.CODE_QUEUE,s);
return AjaxResult.success(s);
return AjaxResult.success();
}

26
mcwl-admin/src/main/java/com/mcwl/web/controller/system/WXController.java
View File

@ -6,17 +6,13 @@ import com.mcwl.common.core.domain.AjaxResult;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.common.core.domain.model.LoginUser;
import com.mcwl.common.core.redis.RedisCache;
import com.mcwl.common.utils.StringUtils;
import com.mcwl.common.utils.uuid.IdUtils;
import com.mcwl.framework.web.service.SysPermissionService;
import com.mcwl.framework.web.service.TokenService;
import com.mcwl.system.domain.SysUserThirdAccount;
import com.mcwl.system.service.ISysUserService;
import com.mcwl.system.service.ISysUserThirdAccountService;
import com.mcwl.system.service.IWXService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@ -34,7 +30,6 @@ import java.util.concurrent.TimeUnit;
* @apiNote
*/
@Slf4j
@RestController
@RequestMapping("/wx")
public class WXController {
@ -42,12 +37,6 @@ public class WXController {
@Autowired
private RedisCache redisCache;
@Autowired
private RedisTemplate<String,String> redisTemplate;
@Autowired
private ISysUserService iSysUserService;
@Resource
private ISysUserThirdAccountService iSysUserThirdAccountService;
@ -60,6 +49,7 @@ public class WXController {
@Resource
private SysPermissionService permissionService;
/**
* 扫码登录用uuid生成
*/
@ -101,21 +91,17 @@ public class WXController {
@Anonymous
@GetMapping("/uuid/login")
public AjaxResult loginByOpenId(@RequestParam("uuid") String uuid) throws IOException {
AjaxResult ajax = AjaxResult.success();
String verifyKey = CacheConstants.WX_OPENID_KEY + uuid;
// String openid = redisCache.getCacheObject(verifyKey);
String openid = redisTemplate.opsForValue().get(verifyKey);
String openid = redisCache.getCacheObject(verifyKey);
ajax.put("status", 0);
System.out.println("openid：{}" + openid);
if (!StringUtils.isEmpty(openid)) {
redisTemplate.delete(verifyKey);
if (openid != null) {
SysUser user = iSysUserThirdAccountService.selectUserByOpenId(openid);
System.out.println("用户：{}" + user);
if (user.getUserId() == null) {
iSysUserService.addUser(openid,CacheConstants.WE_CHAT,null);
user = iSysUserThirdAccountService.selectUserByOpenId(openid);
if (user == null) {
System.out.println("用户不存在");
return AjaxResult.error("用户不存在");
}
LoginUser loginUser = new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
// 生成token

9
mcwl-framework/src/main/java/com/mcwl/framework/web/service/SysLoginService.java
View File

@ -21,7 +21,6 @@ import com.mcwl.framework.security.context.AuthenticationContextHolder;
import com.mcwl.framework.security.sms.SmsCodeAuthenticationToken;
import com.mcwl.system.service.ISysConfigService;
import com.mcwl.system.service.ISysUserService;
import com.mcwl.system.service.impl.SysUserServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@ -61,9 +60,6 @@ public class SysLoginService
@Autowired
private ISysConfigService configService;
@Autowired
private SysUserServiceImpl sysUserService;
/**
* 登录验证
*
@ -199,10 +195,7 @@ public class SysLoginService
//根据手机号查询数据
SysUser sysUser = userService.selectUserByPhone(phone);
if (sysUser == null){
//注册数据
sysUserService.addUser(null,null,phone);
sysUser = userService.selectUserByPhone(phone);
throw new UserNotExistsException();
}
// 登录前置校验

1
mcwl-system/src/main/java/com/mcwl/system/service/ISysUserService.java
View File

@ -207,5 +207,4 @@ public interface ISysUserService
SysUser selectUserByPhone(String phone);
void addUser(String openid,String type,String phone);
}

3
mcwl-system/src/main/java/com/mcwl/system/service/ISysUserThirdAccountService.java
View File

@ -1,7 +1,6 @@
package com.mcwl.system.service;
import com.mcwl.common.core.domain.entity.SysUser;
import com.mcwl.system.domain.SysUserThirdAccount;
/**
* 第三方登录表
@ -13,6 +12,4 @@ import com.mcwl.system.domain.SysUserThirdAccount;
public interface ISysUserThirdAccountService {
SysUser selectUserByOpenId(String openid);
void add(SysUserThirdAccount sysUserThirdAccount);
}

55
mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserServiceImpl.java
View File

@ -12,12 +12,10 @@ import com.mcwl.common.utils.spring.SpringUtils;
import com.mcwl.system.domain.SysPost;
import com.mcwl.system.domain.SysUserPost;
import com.mcwl.system.domain.SysUserRole;
import com.mcwl.system.domain.SysUserThirdAccount;
import com.mcwl.system.mapper.*;
import com.mcwl.system.service.ISysConfigService;
import com.mcwl.system.service.ISysDeptService;
import com.mcwl.system.service.ISysUserService;
import com.mcwl.system.service.ISysUserThirdAccountService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -26,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.validation.Validator;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -65,16 +62,6 @@ public class SysUserServiceImpl implements ISysUserService
@Autowired
protected Validator validator;
@Autowired
private ISysUserThirdAccountService iSysUserThirdAccountService;
private static final String UPPER_CASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
private static final String LOWER_CASE_LETTERS = "abcdefghijklmnopqrstuvwxyz";
private static final String DIGITS = "0123456789";
// private static final String SPECIAL_CHARACTERS = "!@#$%^&*()-_=+[]{}|;:,.<>?";
private static final String ALL_CHARACTERS = UPPER_CASE_LETTERS + LOWER_CASE_LETTERS + DIGITS;
private static final SecureRandom random = new SecureRandom();
/**
* 根据条件分页查询用户列表
*
@ -563,46 +550,4 @@ public class SysUserServiceImpl implements ISysUserService
return userMapper.selectUserByPhone(phone);
}
@Override
public void addUser(String openid,String type,String phone) {
//初始化一个用户信息
SysUser sysUser = new SysUser();
sysUser.setUserName("默认用户:"+ generateRandomPassword(8));
sysUser.setNickName("用户:" + generateRandomPassword(8));
sysUser.setPassword(SecurityUtils.encryptPassword(generateRandomPassword(10)));
sysUser.setPhonenumber(phone);
sysUser.setRoleIds(new Long[]{2L});
//新增用户
insertUser(sysUser);
if (openid != null){
SysUserThirdAccount sysUserThirdAccount = SysUserThirdAccount.builder().userId(sysUser.getUserId())
.bindType(type)
.openid(openid.substring(1, openid.length() - 1)).build();
iSysUserThirdAccountService.add(sysUserThirdAccount);
}
}
/**
* 生成随机密码
* @param length
* @return
*/
public static String generateRandomPassword(int length) {
if (length < 1) {
throw new IllegalArgumentException("Password length must be at least 1");
}
StringBuilder sb = new StringBuilder(length);
for (int i = 0; i < length; i++) {
int randomIndex = random.nextInt(ALL_CHARACTERS.length());
sb.append(ALL_CHARACTERS.charAt(randomIndex));
}
return sb.toString();
}
}

7
mcwl-system/src/main/java/com/mcwl/system/service/impl/SysUserThirdAccountServiceImpl.java
View File

@ -47,11 +47,4 @@ public class SysUserThirdAccountServiceImpl implements ISysUserThirdAccountServi
return sysUserService.selectUserById(sysUserThirdAccount.getUserId());
}
@Override
public void add(SysUserThirdAccount sysUserThirdAccount) {
//添加第三方登录权限
sysUserThirdAccountMapper.insert(sysUserThirdAccount);
}
}