|
@@ -15,6 +15,7 @@ import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.http.HttpUtil;
|
|
import cn.hutool.http.HttpUtil;
|
|
|
import cn.hutool.json.JSONObject;
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.jcraft.jsch.HASH;
|
|
import com.jcraft.jsch.HASH;
|
|
|
import com.orcas.common.sso.model.SsoUserAuthDto;
|
|
import com.orcas.common.sso.model.SsoUserAuthDto;
|
|
|
import com.orcas.common.usercenter.entity.RoleEntity;
|
|
import com.orcas.common.usercenter.entity.RoleEntity;
|
|
@@ -97,7 +98,11 @@ public class WChatUserServiceImpl implements WChatUserService {
|
|
|
req.setUniformCreditCode(creditCode);
|
|
req.setUniformCreditCode(creditCode);
|
|
|
req.setIsAdmin(0);
|
|
req.setIsAdmin(0);
|
|
|
staffByUserName = staffClient.addStaff(req);
|
|
staffByUserName = staffClient.addStaff(req);
|
|
|
- //保存数据库
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ QueryWrapper<WChatUserPo> queryWrapper = new QueryWrapper<>();
|
|
|
|
|
+ queryWrapper.eq("wx_phone",mobile);
|
|
|
|
|
+ if (wChatUserMapper.selectOne(queryWrapper) == null) {
|
|
|
|
|
+ //保存微信用户
|
|
|
WChatUserDto dto = new WChatUserDto();
|
|
WChatUserDto dto = new WChatUserDto();
|
|
|
dto.setMiniOpenId(dto.getMiniOpenId());
|
|
dto.setMiniOpenId(dto.getMiniOpenId());
|
|
|
dto.setLastLoginTime(new Date());
|
|
dto.setLastLoginTime(new Date());
|
|
@@ -126,7 +131,6 @@ public class WChatUserServiceImpl implements WChatUserService {
|
|
|
userLoginRequest.setAccount(mobile);
|
|
userLoginRequest.setAccount(mobile);
|
|
|
userLoginRequest.setPassword(sub);
|
|
userLoginRequest.setPassword(sub);
|
|
|
SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request, response, userLoginRequest);
|
|
SsoUserAuthDto ssoUserAuthDto = commonService.doLogin(request, response, userLoginRequest);
|
|
|
-
|
|
|
|
|
return ssoUserAuthDto;
|
|
return ssoUserAuthDto;
|
|
|
}
|
|
}
|
|
|
|
|
|