Ver Fonte

fix 新增升级版镜像gpt地址

chenbiao há 1 ano atrás
pai
commit
c253b6f487

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -175,7 +175,8 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
             ChatgptUser chatgptUser = getChatgptCarUser(userId, relationId, groupsRelation, goodsDonSku);
             String DOMAIN = getGptDomain(domain, goodsDonSku);
             log.info("domain:{},用户:{},所在车次:{},座位id:{},在{}获取跳转GPT镜像的登录url", DOMAIN, userId, groupsTrips.getId(), relationId, DateTime.now());
-            return DOMAIN + "/auth/logintoken?carid=" + carId + "&usertoken=" + chatgptUser.getUserToken();
+            //另外一版镜像gpt
+            return DOMAIN + (DOMAIN.equals("https://gpt.bestaistore.com") ? "/codetoken?logintoken=" + chatgptUser.getUserToken() : "/auth/logintoken?carid=" + carId + "&usertoken=" + chatgptUser.getUserToken() );
         } else {
             throw BusinessRuntimeException.getInstance("服务器出了点问题");
         }

+ 17 - 4
netflix-web/src/main/java/com/cyksj/web/controller/mirror/MirrorController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.EnvCommonService;
@@ -112,21 +113,33 @@ public class MirrorController {
      * @return 登陆结果
      */
     @RequestMapping("/gpt/oauth")
-    public Result<String> gptOauth(@RequestParam("usertoken") String userToken) {
+    public String gptOauth(@RequestParam("usertoken") String userToken) {
         try {
             log.info("用户通过userToken:{}", userToken);
             ChatgptUser user = chatGptAccountService.findByUserTokenAndExpireTimeAfter(userToken, LocalDateTime.now());
             if (user == null) {
-                return GatewayResponse.SUCCESS.newBuilder().setMsg("用户不存在或已过期").setCode(0).toResult();
+                JSONObject result = new JSONObject();
+                result.putOpt("code",0);
+                result.putOpt("msg","用户不存在或已过期");
+                return result.toString();
             }
 
             //ChatgptSession session = chatGptAccountService.checkSession(carId);
             //
-            return GatewayResponse.SUCCESS.newBuilder().setMsg("登陆成功").setCode(1).toResult(StringUtil.getString(user.getRelationId()));
+            JSONObject result = new JSONObject();
+            result.putOpt("code",1);
+            result.putOpt("msg","登录成功");
+            result.putOpt("avatar",user.getImg());
+            result.putOpt("nickname",user.getName());
+            result.putOpt("uid",user.getRelationId());
+            return result.toString();
             //}
         } catch (Exception e) {
             log.error("服务器错误", e);
-            return GatewayResponse.FAIL.newBuilder().setMsg("服务器错误").setCode(0).toResult();
+            JSONObject result = new JSONObject();
+            result.putOpt("code",0);
+            result.putOpt("msg","服务器错误");
+            return result.toString();
         }
     }