update_15

pom.xml

@@ -101,7 +101,10 @@
 			<groupId>com.jayway.jsonpath</groupId>
 			<artifactId>json-path</artifactId>
 		</dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
 	</dependencies>
 
 	<build>

src/main/java/com/scbfkj/uni/api/GenericApi.java

@@ -1,15 +1,18 @@
 package com.scbfkj.uni.api;
 
-import com.fasterxml.jackson.databind.ser.std.MapSerializer;
 import com.scbfkj.uni.library.RequestUtil;
 import com.scbfkj.uni.process.DataBase;
 import com.scbfkj.uni.service.DataProcessService;
 import com.scbfkj.uni.system.Config;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -48,12 +51,15 @@ public class GenericApi {
     @PostMapping("{path}")
     public ResponseEntity<Map<String,Object>> matchService(@RequestBody Map<String, Object> body) throws Exception {
         String uri = RequestUtil.getUri();
-        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where urilist like concat('%',?,'%')", Collections.singletonList(new Object[]{uri}));
+        List<Map<String, Object>> serviceinfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where urilist like concat('%',?,'%')", Collections.singletonList(new Object[]{"/openApi/%s".formatted(uri)}));
 
         if (serviceinfoList.isEmpty()) {
             return ResponseEntity.status(HttpStatusCode.valueOf(404)).build();
         }
-        Map<String, Object> process = DataProcessService.process(body);
-        return ResponseEntity.ok(process);
+
+        Object serviceid = serviceinfoList.get(0).get("serviceid");
+        body.put("serviceid",serviceid);
+        return ResponseEntity.ok(body);
     }
+
 }

src/main/java/com/scbfkj/uni/api/LogAop.java

@@ -29,7 +29,7 @@ public class LogAop {
     private static List<Map<String, Object>> apiInfos;
 
 
-    @Around(value = "within( com.scbfkj.uni.api.*)")
+    @Around(value = "within( com.scbfkj.uni.api.*Api)")
     public ResponseEntity<Map<String, Object>> invokeAround(ProceedingJoinPoint joinPoint) {
 //        当前时间戳
         long beforeTime = System.currentTimeMillis();
@@ -90,7 +90,9 @@ public class LogAop {
             }
             return ((ResponseEntity<Map<String, Object>>) joinPoint.proceed(args));
         } catch (Throwable e) {
-            e.printStackTrace();
+            if(Config.debug) {
+                e.printStackTrace();
+            }
 //            错误异常消息
             return ResponseEntity.ok(UniReturnUtil.fail(e.getMessage()));
         } finally {

src/main/java/com/scbfkj/uni/service/DataProcessService.java

@@ -1,6 +1,5 @@
 package com.scbfkj.uni.service;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jayway.jsonpath.JsonPath;
 import com.scbfkj.uni.library.DataAliasGetUtil;
 import com.scbfkj.uni.library.DataFormatUtil;
@@ -30,12 +29,19 @@ public class DataProcessService {
         String message = null;
         Object algorithmlibraryid;
 
+        Map<String, Object> serviceInfo = null;
+
         try {
             serviceIdOpt = DataAliasGetUtil.getValue("serviceid", inData);
             if (Objects.isNull(inData) || inData.isEmpty() || serviceIdOpt.isEmpty())
                 throw new RuntimeException("服务编号不能为空");
             serviceId = serviceIdOpt.get();
 
+            List<Map<String, Object>> serviceInfoList = DataBase.query(Config.centerConnectionStr, "select * from serviceinfo where serviceid = ?", Collections.singletonList(new Object[]{serviceId}));
+            if (!serviceInfoList.isEmpty()) {
+                serviceInfo = serviceInfoList.get(0);
+            }
+
 //        熔断
 
             List<Map<String, Object>> algorithmLibraries;
@@ -68,7 +74,6 @@ public class DataProcessService {
                 Object preConditions = algorithmLibrary.get("preconditions");
                 Object preparameterset = algorithmLibrary.get("preparameterset");
                 HashMap<String, Object> data = new HashMap<>();
-                resource.add(data);
 //                记录生命周期ID
                 data.put("lifecycleid", lifecycleid);
                 data.put("algorithmlibraryid", algorithmlibraryid);
@@ -98,11 +103,13 @@ public class DataProcessService {
                     if (Objects.equals("2", preCode)) {
                         break;
                     } else if (Objects.equals("1", preCode)) {
-                        resource.add(null);
+                        continue;
+                    }else if(!Objects.equals("0",preCode)){
                         continue;
                     }
                 }
 
+                resource.add(data);
                 Object parameterSet = algorithmLibrary.get("parameterset");
                 Object dataSourceId = algorithmLibrary.get("datasourceid");
                 List<Map<String, Object>> datasourceList = DataBase.query(Config.centerConnectionStr, "select * from datasource where datasourceid=?", Collections.singletonList(new Object[]{dataSourceId}));
@@ -138,16 +145,18 @@ public class DataProcessService {
             return UniReturnUtil.fail(e);
         } finally {
 //                    不管成功还是失败都记录日志
-            LoggerService.logService(
-                    startDateTime,
-                    serviceId,
-                    DataFormatUtil.toString(resource),
-                    DataFormatUtil.toString(preResource),
-                    LocalDateTime.now(),
-                    Objects.nonNull(message) ? "-1" : "0",
-                    message,
-                    lifecycleid
-            );
+            if (Config.debug || Objects.nonNull(serviceInfo) && Objects.equals("1", serviceInfo.get("enablelog"))) {
+                LoggerService.logService(
+                        startDateTime,
+                        serviceId,
+                        DataFormatUtil.toString(resource),
+                        DataFormatUtil.toString(preResource),
+                        LocalDateTime.now(),
+                        Objects.nonNull(message) ? "-1" : "0",
+                        message,
+                        lifecycleid
+                );
+            }
         }
 
     }
@@ -158,7 +167,8 @@ public class DataProcessService {
      * @return
      * @throws Exception
      */
-    public static Map<String, Object> processByAlgorithm(Map<String, Object> algorithmLibrary, List<Object> parameters) throws Exception {
+    public static Map<String, Object> processByAlgorithm
+    (Map<String, Object> algorithmLibrary, List<Object> parameters) throws Exception {
 
         Object type = algorithmLibrary.get("algorithmtype");
         Object expression = algorithmLibrary.get("computingexpression");
@@ -167,7 +177,7 @@ public class DataProcessService {
         switch (type.toString()) {
 //            java反射
             case "1" -> {
-                return JavaScriptEngineUtil.invoke((Map<String, Object>) parameters.get(0), expression.toString(), parameters.subList(1,parameters.size()));
+                return JavaScriptEngineUtil.invoke((Map<String, Object>) parameters.get(0), expression.toString(), parameters.subList(1, parameters.size()));
             }
 //            JS表达式
             case "2" -> {
@@ -198,13 +208,13 @@ public class DataProcessService {
         for (String it : paths) {
             it = it.trim();
             String type = it.split("\\.")[0];
-            if(!List.of("string","list","map","array","long","integer","boolean","double","float","datetime").contains(type.toLowerCase())){
-                if(Objects.equals("null",type)) {
+            if (!List.of("string", "list", "map", "array", "long", "integer", "boolean", "double", "float", "datetime").contains(type.toLowerCase())) {
+                if (Objects.equals("null", type)) {
                     result.add(null);
-                }else{
+                } else {
                     result.add(type);
                 }
-                    continue;
+                continue;
             }
             String path = it.replace(type + ".", "");
             Object value = null;

src/main/java/com/scbfkj/uni/system/Config.java

@@ -27,6 +27,7 @@ public class Config {
 
     //    是否启动安全验证
     public static boolean enable;
+    public static boolean debug;
 
     public static String containerCode;
 

src/main/java/com/scbfkj/uni/system/SystemInit.java

@@ -33,11 +33,14 @@ public class SystemInit {
     @Value("${log.target}")
     private List<String> targets;
 
+    @Value("${debug:false}")
+    private boolean debug=true;
 
     @PostConstruct
     public void init() throws Exception {
         Config.containerCode = containerCode;
         Config.enable = enableSecurity;
+        Config.debug=debug;
         Config.centerConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(centerConfig);
         Config.securityConnectionStr = DataEncryptionUtil.decryptRSAByPrivateKey(securityconfig);