飞书接口优化

mtaDeploy.sh

@@ -208,8 +208,6 @@ common(){
   echo -e "\033[30;42m ${buildEvn}前端代码信息替换中，请稍后。。。 \033[0m"
   fileMenu=view/Menu.view.xml
   fileIndex=index.html
-  isServerConfig="true" #旧值
-  isServerConfigNew="false" #新值
   titleStr="联创杰" #旧值
   titleStrNew="联创杰"${nameStr} #新值
   #替换版本号 部署完成后，前端变化不用用户清缓存了
@@ -291,6 +289,14 @@ common(){
   ## echo -e "\033[30;42m ${buildEvn}发布完成的通知已发送 \033[0m"
 
   #结束时间（北京时间）
+  echo -e "\033[30;42m 部署文件配置恢复中，请稍后。。。 \033[0m"
+  endtime0=`date +%s`
+  secondsToTime ${starttime} ${endtime0}
+  git checkout ${defaultEnv}
+  git checkout ${resourcesDefaultEnv}
+  git checkout ${dbDefaultEnv}
+  git checkout ${mta}
+  git checkout ${xsSecurity}
   echo -e "\033[30;42m 部署完成 \033[0m"
   endtime=`date +%s`
   secondsToTime ${starttime} ${endtime}

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

@@ -129,21 +129,34 @@ public class OperateAuthFilter implements Filter {
                     !StringUtils.isEmpty(appKey) &&
                     appKey.equals(tokenForFeiShu)
             ) {
-                String requestParamStr = request.getReader().lines().collect(Collectors.joining(System.lineSeparator()));
-                log.info("uri:{}, paramStr:{}, isJson:{}", uri, requestParamStr, JsonUtil.isJsonObject(requestParamStr));
-                Result<?> result = Result.ok("openFeishuService调用成功！");
                 if ("/odata/v4/openFeishuService/ApproveFeiShuUserDeptEvent".equals(uri)) {
+                    try {
                         feiShuController.feiShuUserDeptEvent(request, response);
+                    } catch (Throwable e) {
+                        throw new BtpException(e.getMessage());
+                    }
+                    return;//返回结果
                 }
                 if ("/odata/v4/openFeishuService/ApproveEvent".equals(uri)) {
+                    try {
                         feiShuController.event(request, response);
+                    } catch (Throwable e) {
+                        throw new BtpException(e.getMessage());
+                    }
+                    return;//返回结果
                 }
                 if ("/odata/v4/openFeishuService/ApaasLog".equals(uri)) {
-                    result = feiShuController.addApaasLog(JsonUtil.isJsonObject(requestParamStr)?JSONObject.parseObject(requestParamStr):new JSONObject());
+                    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;//返回结果
                 }
+            }
 
             if (cookies == null || cookies.length == 0) {
                 Result<Object> wrapResult = Result.error("requestIP=" + ip + " requestURI=" + uri + " odata请求 cookies 不能为空！");

srv/src/main/java/customer/lianchuangjie/feiShu/controller/FeiShuController.java

@@ -317,7 +317,9 @@ public class FeiShuController {
     }
 
 
-    private final EventDispatcher EVENT_DISPATCHER_USER = EventDispatcher.newBuilder(SymbolConstant.VERIFICATION_TOKEN_USER, SymbolConstant.ENCRYPT_KEY_USER)
+    //飞书人员组织架构事件 RIVQR5Gxh45DXwOk1mUkUewJcRH4Rmsb
+    private final EventDispatcher EVENT_DISPATCHER_USER = EventDispatcher.newBuilder("RIVQR5Gxh45DXwOk1mUkUewJcRH4Rmsb", "")
+    //private final EventDispatcher EVENT_DISPATCHER_USER = EventDispatcher.newBuilder(SymbolConstant.VERIFICATION_TOKEN_USER, SymbolConstant.ENCRYPT_KEY_USER)
             .onP2UserCreatedV3(new ContactService.P2UserCreatedV3Handler() {
                 @Override
                 public void handle(P2UserCreatedV3 event) throws Exception {
@@ -365,6 +367,7 @@ public class FeiShuController {
         }
     }
 
+    //飞书审批事件 48Vg7plnyoS45JxgLSscrcWuyCbPA6CC
     private final EventDispatcher EVENT_DISPATCHER = EventDispatcher.newBuilder("48Vg7plnyoS45JxgLSscrcWuyCbPA6CC", "")
     //private final EventDispatcher EVENT_DISPATCHER = EventDispatcher.newBuilder(SymbolConstant.VERIFICATION_TOKEN, SymbolConstant.ENCRYPT_KEY)
             .onCustomizedEvent("approval_instance", new CustomEventHandler() {