Browse Source

//login

private_deployment
xhxu 1 year ago
parent
commit
4ab97a58e4
4 changed files with 6 additions and 15 deletions
  1. +1
    -1
      suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java
  2. +0
    -9
      suimangService/src/main/java/com/iformall/domain/po/WxCUser.java
  3. +3
    -3
      suimangService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  4. +2
    -2
      suimangService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java

+ 1
- 1
suimangCApi/src/main/java/com/iformall/controller/MiniAppUserController.java View File

@@ -126,7 +126,7 @@ public class MiniAppUserController extends BaseController {
resultMap.put("openId", openId);
} catch (Exception e) {
logger.error(e.getMessage(), e);
return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR, resultMap);
return new ResultData(ErrorCode.SESSION_KEY_DECODE_ERR);
}

HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();


+ 0
- 9
suimangService/src/main/java/com/iformall/domain/po/WxCUser.java View File

@@ -25,15 +25,6 @@ public class WxCUser extends CUser {
appPlat = EnumAppPlat.WX;
}

@io.swagger.annotations.ApiModelProperty(value="EnumBusinessCircleAuthorizeState 授权商圈快速积分状态",name="authorizeState")
private Integer authorizeState;

@io.swagger.annotations.ApiModelProperty(value="授权时间",name="authorizeTime")
private Date authorizeTime;

@io.swagger.annotations.ApiModelProperty(value="取消授权时间",name="deauthorizeTime")
private Date deauthorizeTime;

public String createToken(Date currentDate,String tenantId) {
if(StringUtils.isBlank(tenantId)){
tenantId = "1";


+ 3
- 3
suimangService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java View File

@@ -206,7 +206,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer

if (user != null) {
// 已有用户
user.createToken(new Date(),user.getTenantId());
// user.createToken(new Date(),user.getTenantId());
user.setRegisterIp(cUser.getRegisterIp());
user.setSessionKey(cUser.getSessionKey());
user.setUnionId(cUser.getUnionId());
@@ -224,7 +224,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer
// 新用户
final IdWorker idWorker = IdWorker.get();
user.setId(idWorker.nextId());
user.createToken(new Date(),user.getTenantId());
// user.createToken(new Date(),user.getTenantId());
user.setRegisterIp(cUser.getRegisterIp());
user.setSessionKey(cUser.getSessionKey());
user.setUnionId(cUser.getUnionId());
@@ -235,7 +235,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer
user.setUpdateDate(new Date());
ttCUserMapper.insert(user);
}
updateTokenCache(user.getToken(), user);
// updateTokenCache(user.getToken(), user);
return user;
}



+ 2
- 2
suimangService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java View File

@@ -219,7 +219,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer
Date now = new Date();
if (user != null) {
// 已有用户
user.createToken(new Date(),user.getTenantId());
// user.createToken(new Date(),user.getTenantId());
user.setSessionKey(cUser.getSessionKey());
user.setUnionId(cUser.getUnionId());
user.setExtraInfo(cUser.getExtraInfo());
@@ -244,7 +244,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer
user.setActiveTime(now);
user.setCreateDate(now);
user.setUpdateDate(now);
user.createToken(now,user.getTenantId());
// user.createToken(now,user.getTenantId());
wxCUserMapper.insert(user);
}
return user;


Loading…
Cancel
Save