|
@@ -11,6 +11,7 @@ import org.jeecg.common.exception.JeecgBootException;
|
|
|
import org.jeecg.common.system.util.JwtUtil;
|
|
|
import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.common.util.RedisUtil;
|
|
|
+import org.jeecg.common.util.oConvertUtils;
|
|
|
import org.jeecg.modules.app.service.IUserService;
|
|
|
import org.jeecg.modules.app.vo.LoginUserVO;
|
|
|
import org.jeecg.modules.app.vo.MsgInfoVO;
|
|
@@ -58,8 +59,13 @@ public class UserServiceImpl implements IUserService {
|
|
|
// 用户不存在则创建
|
|
|
user = new SysUser()
|
|
|
.setOpenid(openid)
|
|
|
+ .setPassword(openid)
|
|
|
+ .setStatus(1)
|
|
|
+ .setDelFlag(0)
|
|
|
+ .setSalt(oConvertUtils.randomGen(8))
|
|
|
+ .setCreateBy("admin")
|
|
|
.setRealname("微信用户")
|
|
|
- .setUsername("微信用户")
|
|
|
+ .setUsername("微信用户_" + System.currentTimeMillis())
|
|
|
.setOrgCode("A03");
|
|
|
boolean result = sysUserMapper.insert(user) > 0;
|
|
|
if (!result) {
|
|
@@ -102,16 +108,8 @@ public class UserServiceImpl implements IUserService {
|
|
|
|
|
|
|
|
|
private LoginUserVO generateLoginUserVO(SysUser user) {
|
|
|
- String orgCode = user.getOrgCode().substring(0, 3);
|
|
|
- String userAccount = "";
|
|
|
- String userPassword = "";
|
|
|
- if(orgCode.equals("A03") || user.getOpenid() != null){
|
|
|
- userAccount = user.getUsername();
|
|
|
- userPassword = user.getOpenid();
|
|
|
- }else if (orgCode.equals("A04")){
|
|
|
- userAccount = user.getUsername();
|
|
|
- userPassword = user.getPassword();
|
|
|
- }
|
|
|
+ String userAccount = user.getUsername();
|
|
|
+ String userPassword = user.getPassword();
|
|
|
// 1.生成token
|
|
|
String token = JwtUtil.sign(userAccount, userPassword);
|
|
|
// 设置token缓存有效时间
|