|
|
@@ -128,19 +128,12 @@ public class MirrorController {
|
|
|
log.info("用户通过userToken:{}", userToken);
|
|
|
ChatgptUser user = chatGptAccountService.findByUserTokenAndExpireTimeAfter(userToken, LocalDateTime.now());
|
|
|
if (user == null) {
|
|
|
- WholesaleUser wholesaleUser = wholesaleUserMapper.selectOne(Wrappers.lambdaQuery(WholesaleUser.class).eq(WholesaleUser::getToken, userToken).gt(WholesaleUser::getExpireTime, LocalDateTime.now()).last("limit 1"));
|
|
|
- if (wholesaleUser == null) {
|
|
|
- JSONObject result = new JSONObject();
|
|
|
- result.putOpt("code", 0);
|
|
|
- result.putOpt("msg", "用户不存在或已过期");
|
|
|
- return result.toString();
|
|
|
- }
|
|
|
JSONObject result = new JSONObject();
|
|
|
- result.putOpt("code",1);
|
|
|
- result.putOpt("msg","登录成功");
|
|
|
- result.putOpt("nickname", wholesaleUser.getUsername());
|
|
|
+ result.putOpt("code",0);
|
|
|
+ result.putOpt("msg","用户不存在或已过期");
|
|
|
return result.toString();
|
|
|
}
|
|
|
+ //ChatgptSession session = chatGptAccountService.checkSession(carId);
|
|
|
JSONObject result = new JSONObject();
|
|
|
result.putOpt("code",1);
|
|
|
result.putOpt("msg","登录成功");
|
|
|
@@ -149,8 +142,10 @@ public class MirrorController {
|
|
|
result.putOpt("uid",user.getRelationId());
|
|
|
result.putOpt("limit",user.getLimitNum());
|
|
|
result.putOpt("time",user.getLimitTime());
|
|
|
- GroupsRelation relation = relationMapper.selectById(user.getRelationId());
|
|
|
- result.putOpt("isVip", relation.getIsVip());
|
|
|
+ if (user.getRelationId() != null) {
|
|
|
+ GroupsRelation relation = relationMapper.selectById(user.getRelationId());
|
|
|
+ result.putOpt("isVip", relation.getIsVip());
|
|
|
+ }
|
|
|
return result.toString();
|
|
|
} catch (Exception e) {
|
|
|
log.error("服务器错误", e);
|
|
|
@@ -398,13 +393,14 @@ public class MirrorController {
|
|
|
log.info("用户通过userToken:{}访问claude镜像车队carId:{}", userToken, carId);
|
|
|
ClaudeUser user = claudeService.findByUserTokenAndExpireTimeAfter(userToken, LocalDateTime.now());
|
|
|
if (user == null) {
|
|
|
- WholesaleUser wholesaleUser = wholesaleUserMapper.selectOne(Wrappers.lambdaQuery(WholesaleUser.class).eq(WholesaleUser::getToken, userToken).gt(WholesaleUser::getExpireTime, LocalDateTime.now()).last("limit 1"));
|
|
|
- if (wholesaleUser == null) {
|
|
|
- return GatewayResponse.SUCCESS.newBuilder().setMsg("用户不存在或已过期").setCode(0).toResult();
|
|
|
- }
|
|
|
- return GatewayResponse.SUCCESS.newBuilder().setMsg("登陆成功").setCode(1).toResult();
|
|
|
+ return GatewayResponse.SUCCESS.newBuilder().setMsg("用户不存在或已过期").setCode(0).toResult();
|
|
|
}
|
|
|
- return GatewayResponse.SUCCESS.newBuilder().setMsg("登陆成功").setCode(1).toResult(StringUtil.getString(user.getRelationId()));
|
|
|
+ GatewayResponse.buildGateWay builder = GatewayResponse.SUCCESS.newBuilder()
|
|
|
+ .setMsg("登陆成功")
|
|
|
+ .setCode(1);
|
|
|
+ return user.getRelationId() != null
|
|
|
+ ? builder.toResult(StringUtil.getString(user.getRelationId()))
|
|
|
+ : builder.toResult();
|
|
|
} catch (Exception e) {
|
|
|
log.error("服务器错误", e);
|
|
|
return GatewayResponse.FAIL.newBuilder().setMsg("服务器错误").setCode(0).toResult();
|
|
|
@@ -554,19 +550,10 @@ public class MirrorController {
|
|
|
log.info("用户通过userToken:{}访问grok镜像", userToken);
|
|
|
GrokUser user = grokService.findByUserTokenAndExpireTimeAfter(userToken, LocalDateTime.now());
|
|
|
JSONObject result = new JSONObject();
|
|
|
+
|
|
|
if (user == null) {
|
|
|
- WholesaleUser wholesaleUser = wholesaleUserMapper.selectOne(Wrappers.lambdaQuery(WholesaleUser.class).eq(WholesaleUser::getToken, userToken).gt(WholesaleUser::getExpireTime, LocalDateTime.now()).last("limit 1"));
|
|
|
- if (wholesaleUser == null) {
|
|
|
- result.putOpt("code",0);
|
|
|
- result.putOpt("msg","用户不存在或已过期");
|
|
|
- return result.toString();
|
|
|
- }
|
|
|
- result.putOpt("code",1);
|
|
|
- result.putOpt("msg","登陆成功");
|
|
|
- result.putOpt("isPro",true);
|
|
|
- result.putOpt("usertoken",userToken);
|
|
|
- result.putOpt("userToken",userToken);
|
|
|
- result.putOpt("expireTime", new DateTime(wholesaleUser.getExpireTime()).toString());
|
|
|
+ result.putOpt("code",0);
|
|
|
+ result.putOpt("msg","用户不存在或已过期");
|
|
|
return result.toString();
|
|
|
}
|
|
|
result.putOpt("code",1);
|