Procházet zdrojové kódy

修改飞书 请求方式

syh před 5 roky
rodič
revize
b23f943f18

+ 13 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -89,18 +89,20 @@ public class LoginController {
         }
     }
     @GetMapping("/feishu/auth")
-    public Map<String,Object> feishuAuth(HttpServletRequest request,
+    public Result<JSONObject> feishuAuth(HttpServletRequest request,
                            HttpServletResponse response,
                            @RequestParam(name = "code",defaultValue = "code") String code,
                            @RequestParam(name = "state",defaultValue = "_t") String state) throws IOException {
-        Map<String,Object> result = new HashMap<>();
+        Result<JSONObject> result = new Result<>();
         //1:根据code值获取用户飞书信息
         try {
             if(code.trim().equals("code")){
+                JSONObject setData = new JSONObject();
                 String url = AuthProvider.getAuthUrl("");
-                result.put("url",url);
-                result.put("type",1);
-                ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+                setData.put("url",url);
+                setData.put("type",1);
+                result.setResult(setData);
+                result.success("重定向");
                 return result;
             }
             JSONObject data = AuthProvider.getFeishuUserInfo(code);
@@ -111,24 +113,20 @@ public class LoginController {
             JSONObject dataObject = userData.getJSONObject("data");
             String email = dataObject.getString("email");
             if(null == email||email.trim().equals("")){
-                ResultMapUtils.setResultMap(result,StatusCode.CTOP_FEISHU_EMAIL_NOT_EXIST);
-                return result;
+                return result.error500(StatusCode.CTOP_FEISHU_EMAIL_NOT_EXIST.getDesc());
             }
             SysUser sysUser = sysUserService.getUserByEmail(email);
             if (sysUser == null) {
-                ResultMapUtils.setResultMap(result,StatusCode.CTOP_FEISHU_ACCOUNT_NOT_EXIST);
-                return result;
+                return result.error500(StatusCode.CTOP_FEISHU_ACCOUNT_NOT_EXIST.getDesc());
             }
             if(sysUser.getStatus() != 1){
-                ResultMapUtils.setResultMap(result,StatusCode.CTOP_FEISHU_ACCOUNT_NOT_EXIST);
-                return result;
+                return result.error500(StatusCode.CTOP_FEISHU_ACCOUNT_NOT_EXIST.getDesc());
             }
             String departId = sysDepartService.selectIdByOrdCode(sysUser.getOrgCode());
             sysUser.setDepartId(departId);
             Result<JSONObject> getResult = sysUserService.checkUserIsEffective(sysUser);
             if (!getResult.isSuccess()) {
-                ResultMapUtils.setResultMap(result,StatusCode.COMMON_ACCOUNT_ERROR);
-                return result;
+                return result.error500(StatusCode.COMMON_ACCOUNT_ERROR.getDesc());
             }
             //用户登录信息
             userInfo(sysUser, getResult);
@@ -149,12 +147,10 @@ public class LoginController {
                 feishuUser.setUpdateTime(new Date());
                 corpFeishuUserService.save(feishuUser);
             }
-            ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
-            return result;
+            return getResult;
         } catch (Exception e) {
             e.printStackTrace();
-            ResultMapUtils.setResultMap(result,StatusCode.COMMON_SERVER_ERROR);
-            return result;
+            return result.error500(StatusCode.COMMON_SERVER_ERROR.getDesc());
         }
     }
 

+ 3 - 2
jeecg-boot-module-system/src/main/resources/application-wps.yml

@@ -108,7 +108,8 @@ spring:
   #redis 配置
   redis:
     database: 0
-    host: 172.30.0.17
+#    host: 172.30.0.17
+    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -116,7 +117,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: foobared
+    password:
     port: 6379
 #mybatis plus 设置
 mybatis-plus: