更新

.run/ygm build image.run.xml

@@ -15,8 +15,6 @@
         <option name="sourceFilePath" value="mainFactory/Dockerfile" />
       </settings>
     </deployment>
-    <method v="2">
-      <option name="Maven.BeforeRunTask" enabled="true" file="D:\workspace\data_base\database_2.0\mainFactory/pom.xml" goal="clean package" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>

mainFactory/Dockerfile

@@ -1,6 +1,12 @@
-FROM ibm-semeru-runtimes:open-17-jre
-RUN mkdir "/app"
-COPY ./target/*.jar /app/app.jar
-WORKDIR /app
+FROM l7871878100/openjdk:17-jre-alpine as builder
+ARG JAR_FILE=target/*.jar
+COPY ${JAR_FILE} application.jar
+RUN java -Djarmode=layertools -jar application.jar extract
+
+FROM l7871878100/openjdk:17-jre-alpine
+COPY --from=builder dependencies/ ./
+COPY --from=builder snapshot-dependencies/ ./
+COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 EXPOSE 8080
-ENTRYPOINT ["java","-jar","/app/app.jar"]
+ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"]

mainFactory/pom.xml

@@ -3,12 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>dataHandler</artifactId>
-        <groupId>org.bfkj</groupId>
-        <version>1.0-SNAPSHOT</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.0.6</version>
+        <relativePath/> <!-- lookup parent from repository -->
     </parent>
+    <version>2.0</version>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>mainFactory</artifactId>
+    <artifactId>main-factory</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -84,6 +86,17 @@
             <groupId>com.ibm.mq</groupId>
             <artifactId>com.ibm.mq.allclient</artifactId>
             <version>9.3.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.json</groupId>
+                    <artifactId>json</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20230227</version>
         </dependency>
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
@@ -119,6 +132,11 @@
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -131,6 +149,14 @@
                 </configuration>
             </plugin>
         </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*-dev.*</exclude>
+                </excludes>
+            </resource>
+        </resources>
     </build>
 
 </project>

mainFactory/src/main/java/org/bfkj/api/CommonApi.java

@@ -33,9 +33,9 @@ public class CommonApi {
     /**
      * 服务数据恢复 ： 因为日志的数据内容拆分为4个字段，所有此方法需要调整可
      */
-    @RequestMapping("abnormalDataRecovery")
-    public Map<String, Object> abnormalDataRecovery(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        String verificationToke = authApplication.verificationUserToken(token);
+    @PostMapping("abnormalDataRecovery")
+    public Map<String, Object> abnormalDataRecovery(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        String verificationToke = authApplication.verificationUserToken(headers);
         if (!MapTools.isBlank(verificationToke)) {
             HashMap<String, Object> errMap = new HashMap<>();
             errMap.put("code", "-1");
@@ -50,16 +50,16 @@ public class CommonApi {
      */
     @PostMapping("query")
     @ResponseBody
-    public Object queryApi(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
+    public Object queryApi(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
         Map<String, Object> stringObjectMap;
         if (params.containsKey("id") && !params.containsKey("serviceId")) {
             Map<String, Object> callBack = new HashMap<>();
             callBack.put("serviceId", "200241");
             callBack.put("dataContent", params);
             callBack.put("event", "0");
-            stringObjectMap = commonInterface(token, callBack, "0");
+            stringObjectMap = commonInterface(headers, callBack, "0");
         } else {
-            stringObjectMap = commonInterface(token, params, "0");
+            stringObjectMap = commonInterface(headers, params, "0");
         }
         return stringObjectMap;
     }
@@ -69,8 +69,8 @@ public class CommonApi {
      */
     @PostMapping("newdata")
     @ResponseBody
-    public Object newDataApi(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        return commonInterface(token, params, "1");
+    public Object newDataApi(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        return commonInterface(headers, params, "1");
     }
 
     /**
@@ -90,17 +90,17 @@ public class CommonApi {
      */
     @PostMapping("movedata")
     @ResponseBody
-    public Object moveDataApi(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        return commonInterface(token, params, "3");
+    public Object moveDataApi(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        return commonInterface(headers, params, "3");
     }
 
     /**
      * 统一接收处理
      */
-    private Map<String, Object> commonInterface(Map<String, String> token, Map<String, Object> params, String defaultEvent) {
+    private Map<String, Object> commonInterface(Map<String, String> headers, Map<String, Object> params, String defaultEvent) {
         if (!params.containsKey("id")) {
-            if (token.containsKey("token")) {
-                String appToken = token.get("token");
+            if (headers.containsKey("token")) {
+                String appToken = headers.get("token");
                 String verificationToke = authApplication.verificationToken(appToken);
                 if (!MapTools.isNumber(verificationToke)) {
                     HashMap<String, Object> errMap = new HashMap<>();
@@ -110,7 +110,7 @@ public class CommonApi {
                 }
                 params.remove("id");
             } else {
-                String verificationToke = authApplication.verificationUserToken(token);
+                String verificationToke = authApplication.verificationUserToken(headers);
                 if (!MapTools.isBlank(verificationToke)) {
                     HashMap<String, Object> errMap = new HashMap<>();
                     errMap.put("code", "-1");
@@ -168,19 +168,19 @@ public class CommonApi {
             errMap.put("message", "服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
             return errMap;
         }
-        return dataProcessObj.processData(params, token.get("user_id"));
+        return dataProcessObj.processData(params, headers.get("user_id"));
     }
 
 
     @PostMapping("/upload")
-    public Object upload(@RequestParam(value = "file") MultipartFile excelFile, @RequestParam(value = "serviceId") String serviceID ,@RequestHeader Map<String,Object> requestHeader) throws Exception {
+    public Object upload(@RequestParam(value = "file") MultipartFile excelFile, @RequestParam(value = "serviceId") String serviceID ,@RequestHeader Map<String,Object> headers) throws Exception {
         if (excelFile.isEmpty()) {
             return MapTools.processFail("文件夹为空，重新上传");
         } else {
             String userName = "";
-            if (requestHeader.containsKey("user_id")){
+            if (headers.containsKey("user_id")){
                 MyDbHelper myDbHelper = ObjectMap.getordropMyDbHelper(AppConfig.REMOTE_DB_CONNECT);
-                Map<String, Object> userId = myDbHelper.queryByParamsReturnList("SELECT user_name FROM t_user  WHERE user_id = ?", Objects.toString(requestHeader.get("user_id")));
+                Map<String, Object> userId = myDbHelper.queryByParamsReturnList("SELECT user_name FROM t_user  WHERE user_id = ?", Objects.toString(headers.get("user_id")));
                 Object o = userId.get("returnData");
                 if (o instanceof List<?> tpList  && !tpList.isEmpty() && tpList.get(0) instanceof Map currentMap ){
                     userName = Objects.toString(currentMap.get("user_name"));

mainFactory/src/main/java/org/bfkj/api/ControllerApi.java

@@ -19,14 +19,14 @@ public class ControllerApi {
 
     /***
      * 主动采集与被动采集的启动
-     * @param token
+     * @param headers
      * @param params
      * @return
      */
     @PostMapping("start")
     @ResponseBody
-    public Map<String,Object> start(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        String verificationToke = authApplication.verificationUserToken(token);
+    public Map<String,Object> start(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        String verificationToke = authApplication.verificationUserToken(headers);
         if (!MapTools.isBlank(verificationToke)) {
             HashMap<String, Object> errMap = new HashMap<>();
             errMap.put("code","-1");
@@ -39,14 +39,14 @@ public class ControllerApi {
     /**
      * 主动采集与被动采集的停止
      *
-     * @param token
+     * @param headers
      * @param params
      * @return
      */
     @PostMapping("stop")
     @ResponseBody
-    public Map<String,Object> stop(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        String verificationToke = authApplication.verificationUserToken(token);
+    public Map<String,Object> stop(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        String verificationToke = authApplication.verificationUserToken(headers);
         if (!MapTools.isBlank(verificationToke)) {
             HashMap<String, Object> errMap = new HashMap<>();
             errMap.put("code","-1");

mainFactory/src/main/java/org/bfkj/api/NewCommonApi.java

@@ -25,16 +25,16 @@ public class NewCommonApi {
 
     @PostMapping("search")
     @ResponseBody
-    public Object search(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
-        return commonInterface(token, params, "0", (params.containsKey("id") && !params.containsKey("serviceId")) ? Objects.toString(params.get("id")) : null);
+    public Object search(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
+        return commonInterface(headers, params, "0", (params.containsKey("id") && !params.containsKey("serviceId")) ? Objects.toString(params.get("id")) : null);
     }
     /**
      * 统一接收处理
      */
-    private Map<String, Object> commonInterface(Map<String, String> token, Map<String, Object> params, String defaultEvent, String... queryId) {
+    private Map<String, Object> commonInterface(Map<String, String> headers, Map<String, Object> params, String defaultEvent, String... queryId) {
         if (Objects.isNull(queryId) || Objects.isNull(queryId[0])) {
-            if (token.containsKey("token")) {
-                String appToken = token.get("token");
+            if (headers.containsKey("token")) {
+                String appToken = headers.get("token");
                 String verificationToke = authApplication.verificationToken(appToken);
                 if (!MapTools.isNumber(verificationToke)) {
                     HashMap<String, Object> errMap = new HashMap<>();
@@ -43,7 +43,7 @@ public class NewCommonApi {
                     return errMap;
                 }
             } else {
-                String verificationToke = authApplication.verificationUserToken(token);
+                String verificationToke = authApplication.verificationUserToken(headers);
                 if (!MapTools.isBlank(verificationToke)) {
                     HashMap<String, Object> errMap = new HashMap<>();
                     errMap.put("code", "-1");
@@ -101,6 +101,6 @@ public class NewCommonApi {
             errMap.put("message", "服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
             return errMap;
         }
-        return dataProcessObj.processData(params, token.get("user_id"));
+        return dataProcessObj.processData(params, headers.get("user_id"));
     }
 }

mainFactory/src/main/java/org/bfkj/api/TransferData.java

@@ -14,13 +14,13 @@ import java.util.Objects;
 @RequestMapping("externalApi/openApi")
 public class TransferData {
     /**
-     * /**
-     * /**
-     * 删除入口CRUD
+     * @param headers headers参数
+     * @param params 请求参数
+     * @return 返回值
      */
     @PostMapping("sendData")
     @ResponseBody
-    public Object sendData(@RequestHeader Map<String, String> token, @RequestBody Map<String, Object> params) {
+    public Object sendData(@RequestHeader Map<String, String> headers, @RequestBody Map<String, Object> params) {
         System.out.println("params"+params);
         Object serviceId = params.get("serviceId");
         if (Objects.isNull(serviceId)) {
@@ -37,6 +37,6 @@ public class TransferData {
             errMap.put("message", "服务不可用：" + (null == dataProcessObj ? "" : dataProcessObj.getErrorMessage()));
             return errMap;
         }
-        return dataProcessObj.processData(params, token.get("user_id"));
+        return dataProcessObj.processData(params, headers.get("user_id"));
     }
 }

pom.xml

@@ -4,14 +4,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.6</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-
-
     <groupId>org.bfkj</groupId>
     <artifactId>dataHandler</artifactId>
     <packaging>pom</packaging>