Browse Source

实现适配器多数据源

shilin 1 year ago
parent
commit
eaade78405

+ 19 - 2
realtime/datatraining-server-cph/pom.xml

@@ -19,7 +19,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.test.skip>true</maven.test.skip>
-
+        <pgsql.version>42.2.5</pgsql.version>
         <groovy.version>3.0.8</groovy.version>
         <spring-boot.version>2.3.7.RELEASE</spring-boot.version>
 
@@ -54,7 +54,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.0.1</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -123,6 +127,12 @@
             </exclusions>
 
         </dependency>
+
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${pgsql.version}</version>
+        </dependency>
         <!-- ********************** plugin ********************** -->
         <!-- groovy-all -->
         <dependency>
@@ -161,6 +171,13 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.3.7.RELEASE</version>
+                <configuration>
+                    <!--maven编译时将本地引用的jar包一起打包-->
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+
+
                 <executions>
                     <execution>
                         <goals>

+ 1 - 0
realtime/datatraining-server-cph/src/main/java/com/gyee/datatraining/config/XxlJobConfig.java

@@ -37,6 +37,7 @@ import org.springframework.core.env.Environment;
         xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
         xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
         xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+//        xxlJobSpringExecutor.setAddress("http://10.81.3.152:8175/xxl-job-admin");
         xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
         xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
         xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));

+ 1 - 1
realtime/datatraining-server-cph/src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: hb
+    active: jn
 #    active: jn

+ 3 - 3
realtime/datatraining-server-cph/src/main/resources/xxl-job-executor.properties

@@ -1,6 +1,6 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
-xxl.job.admin.addresses=http://192.168.2.198:8175/xxl-job-admin
-
+#xxl.job.admin.addresses=http://192.168.2.198:8175/xxl-job-admin
+xxl.job.admin.addresses=http://10.81.3.152:8175/xxl-job-admin
 ### xxl-job, access token
 xxl.job.accessToken=
 
@@ -10,7 +10,7 @@ xxl.job.executor.appname=datatraining-job
 xxl.job.executor.address=
 ### xxl-job executor server-info
 xxl.job.executor.ip=
-xxl.job.executor.port=9101
+xxl.job.executor.port=9111
 ### xxl-job executor log-path
 xxl.job.executor.logpath=d:\\jobs\\datatraining-job
 ### xxl-job executor log-retention-days