修改部分代码

jz-dm-apigateway/src/main/java/com/jz/dm/service/impl/OrganizationManageImpl.java

@@ -223,7 +223,7 @@ public class OrganizationManageImpl implements OrganizationManageService {
     public ApiOrg getAuthOrganization(Long apiOrgId) {
         QueryWrapper<ApiOrg> query = new QueryWrapper<>();
         query.eq("id", apiOrgId);
-        query.eq("status", OrgStatusEnum.NORMAL.name());
+        query.eq("status",1);
         query.eq("is_deleted", 0);
         return apiOrgMapper.selectOne(query);
     }

jz-dm-apigateway/src/main/java/com/jz/dm/web/aspect/SystemLogAspect.java

@@ -69,7 +69,6 @@ public class SystemLogAspect {
     }
 
 
-
     @Around("aroundAspect()")
     public void doAround(ProceedingJoinPoint joinPoint) {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
@@ -81,8 +80,9 @@ public class SystemLogAspect {
                 params += JsonUtils.objectToJson(joinPoint.getArgs()[i]) + ";";
             }
         }
-        if (StringUtils.isNotBlank(params)){
-            params= params.substring(0,params.length()-1).split(";")[0];;
+        if (StringUtils.isNotBlank(params)) {
+            params = params.substring(0, params.length() - 1).split(";")[0];
+            ;
         }
         //获取请求路径
         String url = UrlUtil.getServerUrl(request);
@@ -95,33 +95,37 @@ public class SystemLogAspect {
         String paramsList = jsonObject.getString("openApiParams");
         com.alibaba.fastjson.JSONObject jsonParamsList = com.alibaba.fastjson.JSONObject.parseObject(paramsList);
         ApiReqLog reqLog = new ApiReqLog();
-        JSONObject jsonResult =null;
-        try {
-            reqLog.setRequestIp(ip);
-            reqLog.setApiKey(jsonObject.getString("apiKey"));
-            reqLog.setRequestParams(params);
-            reqLog.setResponseParams("");//响应参数
-            reqLog.setRequestUrl(url);
-            reqLog.setRequestMethod(contextPath);
-            reqLog.setEncryMode(jsonObject.getString("signType")); //加密方式:MD5,RSA
-            reqLog.setEncryMode("MD5"); //加密方式暂时写死MD5
-            reqLog.setTransMode(request.getMethod());//传输方式 GET POST
-            reqLog.setRequestToken(jsonParamsList.getString("authCode"));
-            reqLog.setRequestStartTime(new Date());
-            reqLog.setRemark(getServiceMethodDescription(joinPoint));
-            log.info("请求参数:",reqLog);
-            if (null != reqLog) {
-                apiReqLogMapper.insert(reqLog);
+        JSONObject jsonResult = null;
+        Boolean isTest = jsonParamsList.getBoolean("isTest");
+        //不保存测试数据
+        if (!isTest) {
+            try {
+                reqLog.setRequestIp(ip);
+                reqLog.setApiKey(jsonObject.getString("apiKey"));
+                reqLog.setRequestParams(params);
+                reqLog.setResponseParams("");//响应参数
+                reqLog.setRequestUrl(url);
+                reqLog.setRequestMethod(contextPath);
+                reqLog.setEncryMode(jsonObject.getString("signType")); //加密方式:MD5,RSA
+                //reqLog.setEncryMode("MD5"); //加密方式暂时写死MD5
+                reqLog.setTransMode(request.getMethod());//传输方式 GET POST
+                reqLog.setRequestToken(jsonParamsList.getString("authCode"));
+                reqLog.setRequestStartTime(new Date());
+                reqLog.setRemark(getServiceMethodDescription(joinPoint));
+                log.info("请求参数:", reqLog);
+                if (null != reqLog) {
+                    apiReqLogMapper.insert(reqLog);
+                }
+                Object result = joinPoint.proceed(joinPoint.getArgs());
+                jsonResult = JSONObject.fromObject(result);
+                log.info("around响应结果为{}", jsonResult);
+                apiLogService.updateLog(reqLog.getId(), jsonResult);
+            } catch (GatewayException ex) {
+                log.info("切面处理保存异常信息:{}", ex.getMessage());
+                apiLogService.updateLog(reqLog.getId(), jsonResult);
+            } catch (Throwable throwable) {
+                throwable.printStackTrace();
             }
-            Object result =  joinPoint.proceed(joinPoint.getArgs());
-             jsonResult = JSONObject.fromObject(result);
-            log.info("around响应结果为{}", jsonResult);
-            apiLogService.updateLog(reqLog.getId(), jsonResult);
-        } catch (GatewayException ex) {
-            log.info("切面处理保存异常信息:{}",ex.getMessage());
-           apiLogService.updateLog(reqLog.getId(), jsonResult);
-        }catch (Throwable throwable){
-            throwable.printStackTrace();
         }
     }
     /*@Before("beforeAspect()")
@@ -204,7 +208,7 @@ public class SystemLogAspect {
     //        log.error("异常信息{}", e.getMessage());
     //    }
 
-   // }
+    // }
 
     /**
      * 获取注解中对方法的描述信息 用于service层注解