lyhzzz преди 2 години
родител
ревизия
ab59ac9e22
променени са 2 файла, в които са добавени 18 реда и са изтрити 5 реда
  1. 1 0
      src/main/java/com/fdkankan/site/common/ResultCode.java
  2. 17 5
      src/main/java/com/fdkankan/site/controller/LoginController.java

+ 1 - 0
src/main/java/com/fdkankan/site/common/ResultCode.java

@@ -10,6 +10,7 @@ public enum ResultCode {
     USER_EXIST(4004,"用户已添加"),
     PROJECT_CREATER_NOT_DEL(4005,"项目创建人不能删除"),
     USER_NOT_LOGIN(4008,"用户未登录"),
+    FD_ERROR(4009,"四维登录失败"),
 
     PROJECT_CREATER_NOT_EXIST(5001,"项目创建人不存在"),
     PROJECT_NOT_EXIST(5002,"项目不存在,或已删除"),

+ 17 - 5
src/main/java/com/fdkankan/site/controller/LoginController.java

@@ -2,7 +2,9 @@ package com.fdkankan.site.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.site.common.BaseController;
+import com.fdkankan.site.common.ResultCode;
 import com.fdkankan.site.common.ResultData;
+import com.fdkankan.site.exception.BusinessException;
 import com.fdkankan.site.httpClient.client.FdKKClient;
 import com.fdkankan.site.httpClient.request.FdkkLoginRequest;
 import com.fdkankan.site.httpClient.response.FdkkLoginVo;
@@ -29,11 +31,16 @@ public class LoginController extends BaseController {
 
     @PostMapping("/fdLogin")
     public ResultData fdLogin(@RequestBody FdkkLoginRequest request){
-        FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(request);
-        if(fdkkLoginVo.getCode() == 0){
-            return ResultData.ok(fdkkLoginVo.getData());
+        try {
+            FdkkResponse<FdkkLoginVo> fdkkLoginVo = fdKKClient.fdkkLogin(request);
+            if(fdkkLoginVo.getCode() == 0){
+                return ResultData.ok(fdkkLoginVo.getData());
+            }
+            return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
+        }catch (Exception e){
+            e.printStackTrace();
         }
-        return ResultData.error(fdkkLoginVo.getCode(),fdkkLoginVo.getMsg());
+        throw new BusinessException(ResultCode.FD_ERROR);
     }
 
     @PostMapping("/fdLogout")
@@ -48,6 +55,11 @@ public class LoginController extends BaseController {
      */
     @PostMapping("/getUserInfo")
     public ResultData getUserInfo(){
-        return ResultData.ok(fdKKClient.getUserInfo(new JSONObject(),getToken()).getData());
+        try {
+            return ResultData.ok(fdKKClient.getUserInfo(new JSONObject(), getToken()).getData());
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        throw new BusinessException(ResultCode.USER_NOT_LOGIN);
     }
 }