|
|
|
@@ -133,7 +133,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@AuthIgnore |
|
|
|
@TenantIgnore |
|
|
|
@TenantIgnore |
|
|
|
@PostMapping("/login") |
|
|
|
@ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") |
|
|
|
public ResultData userLogin(@RequestBody Map<String, String> map) { |
|
|
|
@@ -218,7 +218,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
if (null != session) { |
|
|
|
logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//获取会话密钥(session_key) |
|
|
|
session_key = session.getSessionKey(); |
|
|
|
openId = session.getOpenid(); |
|
|
|
@@ -428,7 +428,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
|
|
|
|
WxCUser user = getWxCUser(); |
|
|
|
if (StringUtils.isBlank(user.getScene()) || |
|
|
|
user.getScene().equalsIgnoreCase(Constant.UNDEFINED)) { |
|
|
|
user.getScene().equalsIgnoreCase(Constant.UNDEFINED)) { |
|
|
|
if(StringUtils.isNotBlank(scene) && scene.equalsIgnoreCase(Constant.UNDEFINED)) { |
|
|
|
user.setScene(scene); |
|
|
|
wxCUserService.updateScene(user); |
|
|
|
@@ -555,7 +555,7 @@ public class WxUserGrantController extends BaseController { |
|
|
|
user.setLanguage(userInfo.getLanguage()); |
|
|
|
wxCUserService.saveOrUpdate(updateUser); |
|
|
|
|
|
|
|
String key = Constant.tokenPrev + user.getOpenId(); |
|
|
|
String key = Constant.tokenPrev + user.getToken(); |
|
|
|
if(baseCUserTokenRedisTemplate.hasKey(key)){ |
|
|
|
baseCUserTokenRedisTemplate.delete(key); |
|
|
|
} |
|
|
|
@@ -641,7 +641,6 @@ public class WxUserGrantController extends BaseController { |
|
|
|
// user.setScore(memScore + score); |
|
|
|
// } |
|
|
|
} |
|
|
|
wxCUserService.saveOrUpdate(user); |
|
|
|
|
|
|
|
if (!user.getPhone().contains("*")) { // 用户手机非加密 |
|
|
|
String phone = user.getPhone(); |
|
|
|
@@ -649,18 +648,14 @@ public class WxUserGrantController extends BaseController { |
|
|
|
phone = user.getVerifyCodePhone(); |
|
|
|
} |
|
|
|
// 更新到basicinfo |
|
|
|
Long userId = user.getId(); |
|
|
|
if(user.isBasicInfo()){ |
|
|
|
userId = user.getUserId(); |
|
|
|
} |
|
|
|
Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); |
|
|
|
Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); |
|
|
|
if (null != userBasicId) { |
|
|
|
user.setUserId(userBasicId); |
|
|
|
wxCUserService.updateUserId(user); |
|
|
|
} |
|
|
|
wxCUserService.saveOrUpdate(user); |
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user); |
|
|
|
} |
|
|
|
String key = Constant.tokenPrev + user.getOpenId(); |
|
|
|
String key = Constant.tokenPrev + user.getToken(); |
|
|
|
if(baseCUserTokenRedisTemplate.hasKey(key)){ |
|
|
|
baseCUserTokenRedisTemplate.delete(key); |
|
|
|
} |
|
|
|
|