飞书接口优化

srv/src/main/java/customer/lianchuangjie/common/filter/OperateAuthFilter.java

@@ -121,43 +121,42 @@ public class OperateAuthFilter implements Filter {
                 }
             }
         }
-        //处理ODATA接口 OData接口仅允许本机访问 只有odata接口需要从cookies中读取参数
-        if (Pattern.matches("(.*/odata/v4/.*)", uri) && !"127.0.0.1".equals(ip) && !"0:0:0:0:0:0:0:1".equals(ip)) {
-            //拦截openFeishuService开放接口做特殊处理
-            if (
-                    Pattern.matches("(.*/odata/v4/openFeishuService/.*)", uri) &&
-                    !StringUtils.isEmpty(appKey) &&
-                    appKey.equals(tokenForFeiShu)
-            ) {
-                if ("/odata/v4/openFeishuService/ApproveFeiShuUserDeptEvent".equals(uri)) {
-                    try {
-                        feiShuController.feiShuUserDeptEvent(request, response);
-                    } catch (Throwable e) {
-                        throw new BtpException(e.getMessage());
-                    }
-                    return;//返回结果
+        //拦截飞书使用的开放的odata接口做特殊处理
+        if (
+                Pattern.matches("(.*/odata/v4/openFeishuService/.*)", uri) &&
+                !StringUtils.isEmpty(appKey) &&
+                appKey.equals(tokenForFeiShu)
+        ) {
+            if ("/odata/v4/openFeishuService/ApproveFeiShuUserDeptEvent".equals(uri)) {
+                try {
+                    feiShuController.feiShuUserDeptEvent(request, response);
+                } catch (Throwable e) {
+                    throw new BtpException(e.getMessage());
                 }
-                if ("/odata/v4/openFeishuService/ApproveEvent".equals(uri)) {
-                    try {
-                        feiShuController.event(request, response);
-                    } catch (Throwable e) {
-                        throw new BtpException(e.getMessage());
-                    }
-                    return;//返回结果
+                return;//返回结果
+            }
+            if ("/odata/v4/openFeishuService/ApproveEvent".equals(uri)) {
+                try {
+                    feiShuController.event(request, response);
+                } catch (Throwable e) {
+                    throw new BtpException(e.getMessage());
                 }
-                if ("/odata/v4/openFeishuService/ApaasLog".equals(uri)) {
-                    JSONObject jsonObject = new JSONObject();
-                    String requestParamStr = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
-                    log.info("uri:{}, paramStr:{}, isJson:{}", uri, requestParamStr, JsonUtil.isJsonObject(requestParamStr));
-                    if (JsonUtil.isJsonObject(requestParamStr)) {
-                        jsonObject = JSONObject.parseObject(requestParamStr);
-                    }
-                    Result<?> result = feiShuController.addApaasLog(jsonObject);
-                    writeResult(response, result);
-                    return;//返回结果
+                return;//返回结果
+            }
+            if ("/odata/v4/openFeishuService/ApaasLog".equals(uri)) {
+                JSONObject jsonObject = new JSONObject();
+                String requestParamStr = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
+                log.info("uri:{}, paramStr:{}, isJson:{}", uri, requestParamStr, JsonUtil.isJsonObject(requestParamStr));
+                if (JsonUtil.isJsonObject(requestParamStr)) {
+                    jsonObject = JSONObject.parseObject(requestParamStr);
                 }
+                Result<?> result = feiShuController.addApaasLog(jsonObject);
+                writeResult(response, result);
+                return;//返回结果
             }
-
+        }
+        //拦截非本机访问的odata接口从cookies中读取参数做特殊处理（报表）
+        if (Pattern.matches("(.*/odata/v4/.*)", uri) && !"127.0.0.1".equals(ip) && !"0:0:0:0:0:0:0:1".equals(ip)) {
             if (cookies == null || cookies.length == 0) {
                 Result<Object> wrapResult = Result.error("requestIP=" + ip + " requestURI=" + uri + " odata请求 cookies 不能为空！");
                 writeResult(response, wrapResult);
@@ -256,6 +255,7 @@ public class OperateAuthFilter implements Filter {
             writeResult(response, wrapResult);
             return;
         }
+        //首页重定向
         if (request.getMethod().equals("GET") && ("/index.html".equals(uri))) {// "/index.html"跳转到"/"
             response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
             response.setHeader("Pragma", "no-cache");