简化配置

.run/ygm build image.run.xml

@@ -0,0 +1,22 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="ygm build image" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="data-base:ygm" />
+        <option name="containerName" value="data-base" />
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="8080" />
+              <option name="hostPort" value="8080" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
+        <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>
+  </configuration>
+</component>

mainFactory/Dockerfile

@@ -0,0 +1,6 @@
+FROM l7871878100/openjdk:17-jre
+RUN mkdir "/app"
+COPY ./target/*.jar /app/app.jar
+WORKDIR /app
+EXPOSE 8080
+ENTRYPOINT ["java","-jar","/app/app.jar"]

mainFactory/src/main/java/org/bfkj/MainFactoryApplication.java

@@ -1,5 +1,6 @@
 package org.bfkj;
 
+import com.ibm.disthub2.impl.client.BaseConfig;
 import org.bfkj.application.DataProcess;
 import org.bfkj.application.ServiceInputControl;
 import org.bfkj.config.*;
@@ -8,6 +9,7 @@ import org.bfkj.utils.MapTools;
 import org.bfkj.utils.MyDbHelper;
 import org.bfkj.utils.ScheduleUtil;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -27,18 +29,20 @@ import java.util.*;
 @EnableScheduling
 public class MainFactoryApplication implements InitializingBean {
 
+
+    @Value("${baseConfig.sourceData:true}")
+    private String sourceData;
+
     private final String INSERT_SQL = "INSERT INTO log_success ( success, location, logContent, createtime, serviceId, workId, event, iNDataContent, outDataContent, calculationLocation, dataObjectId) VALUES (?,?,?,?,?,?,?,?,?,?,?)";
     private final String ERROR_SQL = "INSERT INTO log_error ( success, location, logContent, createtime, serviceId, workId, event, iNDataContent, outDataContent, calculationLocation, dataObjectId) VALUES (?,?,?,?,?,?,?,?,?,?,?)";
 
     private RemoteDB remoteDB;
     private RemoteLogDB remoteLogDB;
 
-    private final BaseConfig baseConfig;
 
-    public MainFactoryApplication(RemoteDB remoteDB, RemoteLogDB remoteLogDB, BaseConfig baseConfig) {
+    public MainFactoryApplication(RemoteDB remoteDB, RemoteLogDB remoteLogDB) {
         this.remoteDB = remoteDB;
         this.remoteLogDB = remoteLogDB;
-        this.baseConfig = baseConfig;
     }
 
     /*服务初始化： 启动服务*/
@@ -249,7 +253,9 @@ public class MainFactoryApplication implements InitializingBean {
         Map<String, List<Object>> logSuccessMap = LogUtils.logSuccessMapList;
         Map<String, List<Object>> logErrorMap = LogUtils.logErrorMapList;
         /*批量写日志*/
-        if (logSuccessMap.size() == 0 && logErrorMap.size() == 0) return;
+        if (logSuccessMap.size() == 0 && logErrorMap.size() == 0) {
+            return;
+        }
         long current = System.currentTimeMillis();
         List<String> successList = logSuccessMap.keySet().stream().filter(key -> Long.parseLong(key) < current).toList();
         List<Object> logSuccessList = new ArrayList<>();
@@ -270,8 +276,12 @@ public class MainFactoryApplication implements InitializingBean {
         }
 
         try {
-            if (logSuccessList.size() > 0) logDbHelper.JDBCBatch(INSERT_SQL, logSuccessList, null);
-            if (logErrorList.size() > 0) logDbHelper.JDBCBatch(ERROR_SQL, logErrorList, null);
+            if (logSuccessList.size() > 0) {
+                logDbHelper.JDBCBatch(INSERT_SQL, logSuccessList, null);
+            }
+            if (logErrorList.size() > 0) {
+                logDbHelper.JDBCBatch(ERROR_SQL, logErrorList, null);
+            }
         } catch (Exception e) {
             System.out.println("日志记录异常" + LogUtils.getException(e));
         }
@@ -289,7 +299,7 @@ public class MainFactoryApplication implements InitializingBean {
             maplogDB.put("driver-class-name", maplogDB.get("driverClassName"));
             AppConfig.REMOTE_DB_LOG_CONNECT = MapTools.objToJSONStr(maplogDB);
             AppConfig.serviceURL = remoteDB.getServiceURL();
-            AppConfig.SOURCE_DATA = baseConfig.getSourceData();
+            AppConfig.SOURCE_DATA = sourceData;
 
         } catch (Exception e) {
             System.out.println("配置文件中，连接数据库信息错误");

mainFactory/src/main/java/org/bfkj/config/BaseConfig.java

@@ -1,25 +0,0 @@
-package org.bfkj.config;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @author Administrator
- * 特殊配置处理
- */
-@Component
-@ConfigurationProperties(prefix = "baseConfig")
-public class BaseConfig {
-    @Value("${baseConfig.sourceData}")
-    private String sourceData;
-
-    public String getSourceData() {
-        return sourceData;
-    }
-
-    public void setSourceData(String sourceData) {
-        this.sourceData = sourceData;
-    }
-}