Administrator 3 years ago
parent
commit
8390324ba2
31 changed files with 354 additions and 302 deletions
  1. 318 268
      .idea/workspace.xml
  2. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar
  3. BIN
      sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original
  4. 4 4
      sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml
  5. 1 1
      sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt
  6. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar
  7. BIN
      sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original
  8. 4 4
      sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml
  9. 1 1
      sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt
  10. 2 2
      test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java
  11. 2 0
      test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java
  12. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjBsxxMapper.java
  13. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjDbxxMapper.java
  14. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjDkxxMapper.java
  15. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjDwckzhbdxxMapper.java
  16. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjDwxxMapper.java
  17. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjDwzhxxMapper.java
  18. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrckzhbdxxMapper.java
  19. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrdkyqxxMapper.java
  20. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrdkzhbdxxMapper.java
  21. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrdkzhxxMapper.java
  22. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrxxMapper.java
  23. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGrzhxxMapper.java
  24. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjGtjkrxxMapper.java
  25. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjHmdxxMapper.java
  26. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjKjhzbMapper.java
  27. 1 1
      test-api/src/main/java/com/sooka/mapper/TgjjZcxxMapper.java
  28. 1 1
      test-api/src/main/resources/application-dev.yml
  29. 4 4
      test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml
  30. 1 1
      test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt
  31. BIN
      test-api/target/test-api-0.0.1-SNAPSHOT.jar.original

File diff suppressed because it is too large
+ 318 - 268
.idea/workspace.xml


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar


BIN
sooka-auth/target/sooka-auth-0.0.1-SNAPSHOT.jar.original


File diff suppressed because it is too large
+ 4 - 4
sooka-auth/target/surefire-reports/TEST-com.sooka.AuthApplicationTests.xml


+ 1 - 1
sooka-auth/target/surefire-reports/com.sooka.AuthApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.AuthApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.411 s - in com.sooka.AuthApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.546 s - in com.sooka.AuthApplicationTests

BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar


BIN
sooka-gateway/target/sooka-gateway-0.0.1-SNAPSHOT.jar.original


File diff suppressed because it is too large
+ 4 - 4
sooka-gateway/target/surefire-reports/TEST-com.sooka.gateway.GatewayApplicationTests.xml


+ 1 - 1
sooka-gateway/target/surefire-reports/com.sooka.gateway.GatewayApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.gateway.GatewayApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.636 s - in com.sooka.gateway.GatewayApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.61 s - in com.sooka.gateway.GatewayApplicationTests

+ 2 - 2
test-api/src/main/java/com/sooka/api/Guiji_healthcommission.java

@@ -55,10 +55,10 @@ public class Guiji_healthcommission extends BaseApi {
     // 指定请求与返回的相应体为JSON
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public ResultModel guiji_healthcommission_xx_forward(String str,HttpServletRequest request) {
+    public ResultModel guiji_healthcommission_xx_forward(String str) {
         System.out.println("guiji_healthcommission_xx_forward:" + str);
         ResultModel r = guiji_healthcommission_service.add_guiji_healthcommission_xx(str);
-        recordLog("xxx",request,1);
+//        recordLog("xxx",request,1);
         return r;
     }
 

+ 2 - 0
test-api/src/main/java/com/sooka/mapper/Guiji_Housingconstruction_Mapper.java

@@ -1,5 +1,6 @@
 package com.sooka.mapper;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.sooka.model.bo.Guiji_housingconstruction_hqrlsj_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_yhjjxx_Bean;
 import com.sooka.model.bo.Guiji_housingconstruction_ysljc_Bean;
@@ -7,6 +8,7 @@ import com.sooka.model.bo.Guiji_housingconstruction_zlskfrx_Bean;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
+@DS("db1")
 public interface Guiji_Housingconstruction_Mapper {
 
 

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjBsxxMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjBsxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjDbxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjDbxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjDkxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjDkxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjDwckzhbdxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjDwckzhbdxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjDwxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjDwxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjDwzhxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjDwzhxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrckzhbdxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrckzhbdxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrdkyqxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrdkyqxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrdkzhbdxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrdkzhbdxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrdkzhxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrdkzhxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGrzhxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGrzhxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjGtjkrxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjGtjkrxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjHmdxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjHmdxxMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjKjhzbMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjKjhzbMapper
 {
     /**

+ 1 - 1
test-api/src/main/java/com/sooka/mapper/TgjjZcxxMapper.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @date 2021-11-15
  */
 @Mapper
-@DS("db1_gjj")
+@DS("db1gjj")
 public interface TgjjZcxxMapper
 {
     /**

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

@@ -34,7 +34,7 @@ spring:
         # 一个连接的生命时长(毫秒),超时而且没被使用则被释放(retired),默认:30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-        db1_gjj:
+        db1gjj:
           url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 #          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 

File diff suppressed because it is too large
+ 4 - 4
test-api/target/surefire-reports/TEST-com.sooka.ZsjApiApplicationTests.xml


+ 1 - 1
test-api/target/surefire-reports/com.sooka.ZsjApiApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.sooka.ZsjApiApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.063 s - in com.sooka.ZsjApiApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.247 s - in com.sooka.ZsjApiApplicationTests

BIN
test-api/target/test-api-0.0.1-SNAPSHOT.jar.original