| @@ -126,7 +126,7 @@ public class MiniAppUserController extends BaseController { | |||||
| resultMap.put("openId", openId); | resultMap.put("openId", openId); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error(e.getMessage(), 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(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| @@ -25,15 +25,6 @@ public class WxCUser extends CUser { | |||||
| appPlat = EnumAppPlat.WX; | 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) { | public String createToken(Date currentDate,String tenantId) { | ||||
| if(StringUtils.isBlank(tenantId)){ | if(StringUtils.isBlank(tenantId)){ | ||||
| tenantId = "1"; | tenantId = "1"; | ||||
| @@ -206,7 +206,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| if (user != null) { | if (user != null) { | ||||
| // 已有用户 | // 已有用户 | ||||
| user.createToken(new Date(),user.getTenantId()); | |||||
| // user.createToken(new Date(),user.getTenantId()); | |||||
| user.setRegisterIp(cUser.getRegisterIp()); | user.setRegisterIp(cUser.getRegisterIp()); | ||||
| user.setSessionKey(cUser.getSessionKey()); | user.setSessionKey(cUser.getSessionKey()); | ||||
| user.setUnionId(cUser.getUnionId()); | user.setUnionId(cUser.getUnionId()); | ||||
| @@ -224,7 +224,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| // 新用户 | // 新用户 | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| user.setId(idWorker.nextId()); | user.setId(idWorker.nextId()); | ||||
| user.createToken(new Date(),user.getTenantId()); | |||||
| // user.createToken(new Date(),user.getTenantId()); | |||||
| user.setRegisterIp(cUser.getRegisterIp()); | user.setRegisterIp(cUser.getRegisterIp()); | ||||
| user.setSessionKey(cUser.getSessionKey()); | user.setSessionKey(cUser.getSessionKey()); | ||||
| user.setUnionId(cUser.getUnionId()); | user.setUnionId(cUser.getUnionId()); | ||||
| @@ -235,7 +235,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| user.setUpdateDate(new Date()); | user.setUpdateDate(new Date()); | ||||
| ttCUserMapper.insert(user); | ttCUserMapper.insert(user); | ||||
| } | } | ||||
| updateTokenCache(user.getToken(), user); | |||||
| // updateTokenCache(user.getToken(), user); | |||||
| return user; | return user; | ||||
| } | } | ||||
| @@ -219,7 +219,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| Date now = new Date(); | Date now = new Date(); | ||||
| if (user != null) { | if (user != null) { | ||||
| // 已有用户 | // 已有用户 | ||||
| user.createToken(new Date(),user.getTenantId()); | |||||
| // user.createToken(new Date(),user.getTenantId()); | |||||
| user.setSessionKey(cUser.getSessionKey()); | user.setSessionKey(cUser.getSessionKey()); | ||||
| user.setUnionId(cUser.getUnionId()); | user.setUnionId(cUser.getUnionId()); | ||||
| user.setExtraInfo(cUser.getExtraInfo()); | user.setExtraInfo(cUser.getExtraInfo()); | ||||
| @@ -244,7 +244,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| user.setActiveTime(now); | user.setActiveTime(now); | ||||
| user.setCreateDate(now); | user.setCreateDate(now); | ||||
| user.setUpdateDate(now); | user.setUpdateDate(now); | ||||
| user.createToken(now,user.getTenantId()); | |||||
| // user.createToken(now,user.getTenantId()); | |||||
| wxCUserMapper.insert(user); | wxCUserMapper.insert(user); | ||||
| } | } | ||||
| return user; | return user; | ||||