“wangjinsheng” 3 роки тому
батько
коміт
120a28b2db

+ 2 - 2
test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4.yml

@@ -11,8 +11,8 @@ spring:
       primary: db1
       datasource:
         db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 
           username: thsjzt
           password: thsjzt

test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet.yml → test-api/src/main/java/com/sooka/api_pagefile/application-dev-internet(互联网使用).yml


+ 5 - 5
test-api/src/main/java/com/sooka/model/bo/BaseBean_Guiji.java

@@ -10,11 +10,11 @@ import java.util.Date;
 @Setter
 public class BaseBean_Guiji {
 
-    String id;
-    String cd_source;
-    String cd_time;
-    String cd_batch;
-    String cd_operation;
+    public String id;
+    public String cd_source;
+    public String cd_time;
+    public String cd_batch;
+    public String cd_operation;
 
     JSONObject Data;
 

+ 10 - 14
test-api/src/main/java/com/sooka/utils/Test.java

@@ -1,24 +1,20 @@
 package com.sooka.utils;
 
-public class Test {
-
-    public static void main(String[] args){
-       String url="http://172.17.5.4:7777/api/test/guiji_library_baseinfo";
-
-
-//        for(int i=300000;i<600000;i++){
-//            String str = "{\"Data\":{\"name\":\"孙一石\",\"cardno\":\"008091\",\"idCardNo\":\"\",\"sex\":\"F\",\"birthday\":\"\",\"address\":\"\",\"endDate\":\"20150128\"},\"id\":\""+i+"\",\"cd_time\":\"2021-08-31 17:03:42\",\"cd_batch\":\"202108314033\",\"cd_operation\":\"I\",\"cd_source\":\"503033\"}\n";
-//
-//            HttpUtil.doPost(url,str);
-//
-//        }
+import javafx.scene.input.DataFormat;
 
+import java.sql.BatchUpdateException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
+public class Test {
 
 
-        String str = "{\"Data\":{\"name\":\"孙一石\",\"cardno\":\"008091\",\"idCardNo\":\"\",\"sex\":\"F\",\"birthday\":\"\",\"address\":\"\",\"endDate\":\"20150128\"},\"id\":\""+"0"+"\",\"cd_time\":\"2021-08-31 17:03:42\",\"cd_batch\":\"202108314033\",\"cd_operation\":\"D\",\"cd_source\":\"503033\"}\n";
-        HttpUtil.doPost(url,str,null);
+    private static int batch = 0;
 
+    public static void main(String[] args){
+        batch++;
+        System.out.println(batch);
 
     }
 

+ 150 - 62
test-api/src/main/resources/application-dev.yml

@@ -6,68 +6,156 @@ spring:
   #
   ############################################################
   # jdbc_config   datasource
-#  datasource:
-#    dynamic:
-#      primary: db1
-#      datasource:
-#        db1:
-#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#
-#          username: thsjzt
-#          password: thsjzt
-#            # Hikari will use the above plus the following to setup connection pooling
-#          type: com.zaxxer.hikari.HikariDataSource
-#          hikari:
-#        # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
-#            connection-timeout: 30000
-#              # 最小连接数
-#            minimum-idle: 5
-#        # 最大连接数
-#            maximum-pool-size: 15
-#        # 自动提交
-#            auto-commit: true
-#        # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
-#            idle-timeout: 600000
-#        # 连接池的名字
-#            pool-name: DatebookHikariCP
-#        # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
-#            max-lifetime: 28740000
-#            connection-test-query: SELECT 1
-#
-#        db2:
-##          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          username: thsjzt
-##          password: thsjzt
-#
-#          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          username: jl503033
-#          password: Bx82TIg0
-#                  # Hikari will use the above plus the following to setup connection pooling
-#          type: com.zaxxer.hikari.HikariDataSource
-#          hikari:
-#              # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
-#            connection-timeout: 30000
-#                    # 最小连接数
-#            minimum-idle: 5
-#              # 最大连接数
-#            maximum-pool-size: 15
-#              # 自动提交
-#            auto-commit: true
-#              # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
-#            idle-timeout: 600000
-#              # 连接池的名字
-#            pool-name: DatebookHikariCP
-#              # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
-#            max-lifetime: 28740000
-#            connection-test-query: SELECT 1
+  datasource:
+    dynamic:
+      primary: db1
+      datasource:
+        db1:
+          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          #url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+
+          username: thsjzt
+          password: thsjzt
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+        db2:
+          url: jdbc:mysql://59.198.246.77:32368/jl503033?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503033
+          password: Bx82TIg0
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+        db3:
+          url: jdbc:mysql://59.198.246.77:32368/jl503029?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503029
+          password: Lp18NUg8
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+        db4:
+          url: jdbc:mysql://59.198.246.77:32368/jl503011?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503011
+          password: Oq82TSa8
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+        db5:
+          url: jdbc:mysql://59.198.246.77:32368/jl503026?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503026
+          password: Sw80ABr2
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+        db6:
+          url: jdbc:mysql://59.198.246.77:32368/jl503008?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: jl503008
+          password: Jl10PEr0
+          # Hikari will use the above plus the following to setup connection pooling
+          type: com.zaxxer.hikari.HikariDataSource
+          hikari:
+            # 等待连接池分配连接的最大时长(毫秒),超过这个时长还没有的连接则发生SQLException,默认:30秒
+            connection-timeout: 30000
+            # 最小连接数
+            minimum-idle: 5
+            # 最大连接数
+            maximum-pool-size: 15
+            # 自动提交
+            auto-commit: true
+            # 一个连接idle状态的最大时长(毫秒),超时则被释放(retired),默认:10分钟
+            idle-timeout: 600000
+            # 连接池的名字
+            pool-name: DatebookHikariCP
+            # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
+            max-lifetime: 28740000
+            connection-test-query: SELECT 1
+
+
+
+
+
 
-#    driver-class-name: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#        username: jl503034
-#        password: Cs56DIi9
-#    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+  #    driver-class-name: com.mysql.cj.jdbc.Driver
+  #        url: jdbc:mysql://59.198.246.77:32368/jl503034?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+  #        username: jl503034
+  #        password: Cs56DIi9
+  #    url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+  #    url: jdbc:mysql://10.0.51.4:8888/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 
   jersey:
     application-path: api
@@ -109,4 +197,4 @@ xd:
   base_url: http://syggzy.jlsy.gov.cn/EpointWebService/rest/projectinformation
 project:
   setting:
-    env: internate
+    env: local

+ 4 - 4
test-api/src/main/resources/application.yml

@@ -8,9 +8,9 @@ spring:
       discovery:
 #vpn
 #        server-addr: 172.17.5.4:8848
-#内网
-#        server-addr: 172.18.128.78
-#互联网
-        server-addr: 10.0.51.4:8848
+#政务外网使用
+        server-addr: 172.18.128.78
+#互联网使用
+#        server-addr: 10.0.51.4:8848