zhaoyk il y a 3 ans
Parent
commit
445304911f

+ 1 - 1
src/main/java/com/persagy/bdtp/adm/util/DataExtrasUtil.java

@@ -13,7 +13,7 @@ import java.util.Iterator;
 
 public class DataExtrasUtil {
 
-	private static HashSet<String> admObjFields = getEntityFields(ObjectDigital.class, "building_id", "floor_id");
+	private static HashSet<String> admObjFields = getEntityFields(ObjectDigital.class, "buildingId", "floorId");
 
 	private static String objExtraCol = "infos";
 

+ 39 - 0
src/main/resources/application-dev.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8876
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: adm
+          password: adm
+          url: jdbc:mysql://192.168.0.11/adm?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT
+  rabbitmq:
+    host: 192.168.100.93
+    port: 9936
+    username: pbsage
+    password: pbsage123
+    virtualHost: /test
+persagy:
+  common:
+    #    file:
+    #      storage: 0
+    #      url: http://192.168.100.102:31335/
+    #      accessKey: persagy
+    #      secretKey: persagy@2021
+    token:
+      enabled: false
+  adm:
+    oldPlatformUrl: http://39.102.40.239
+  bdtp:
+    rwd:
+      service: http://develop.persagy.com/dmp-rwd
+    file:
+      service: http://develop.persagy.com/dmp-file
+    dic:
+      service: http://develop.persagy.com/dmp-dic
+mybatis-plus:
+  type-handlers-package: com.persagy.**.typehandler
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

+ 37 - 0
src/main/resources/application-test.yml

@@ -0,0 +1,37 @@
+server:
+  port: 8876
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          username: root
+          password: Bdtp@1qaz@WSX
+          url: jdbc:mysql://10.0.0.5:3306/adm-poc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT
+  rabbitmq:
+    host: 82.156.204.212
+    port: 9936
+    username: admin
+    password: bdtp123456
+    virtualHost: /test
+persagy:
+  common:
+    #    file:
+    #      storage: 0
+    #      url: http://192.168.100.102:31335/
+    #      accessKey: persagy
+    #      secretKey: persagy@2021
+    token:
+      enabled: false
+  adm:
+    oldPlatformUrl: http://39.102.40.239
+  bdtp:
+    rwd:
+      service: http://82.157.151.123/dmp-rwd
+    file:
+      service: http://82.157.151.123/dmp-file
+    dic:
+      service: http://82.157.151.123/dmp-dic
+mybatis-plus:
+  type-handlers-package: com.persagy.**.typehandler

+ 3 - 49
src/main/resources/bootstrap.yml

@@ -1,5 +1,4 @@
 server:
-  port: 8876
   compression:
     enabled: true
     mime-types: application/json
@@ -7,52 +6,7 @@ spring:
   application:
     # 应用名称
     name: adm-poc-backend
+  profiles:
+    active: 'test'
   main:
-    allow-bean-definition-overriding: true
-  datasource:
-    dynamic:
-      datasource:
-        master:
-          driver-class-name: com.mysql.cj.jdbc.Driver
-#          username: adm
-#          password: adm
-#          url: jdbc:mysql://192.168.0.11/adm?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT
-          username: root
-          password: Bdtp@1qaz@WSX
-          url: jdbc:mysql://10.0.0.5:3306/adm-poc?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT
-  rabbitmq:
-#    host: 192.168.100.93
-#    port: 9936
-#    username: pbsage
-#    password: pbsage123
-#    virtualHost: /test
-    host: 82.156.204.212
-    port: 9936
-    username: admin
-    password: bdtp123456
-    virtualHost: /test
-persagy:
-  common:
-#    file:
-#      storage: 0
-#      url: http://192.168.100.102:31335/
-#      accessKey: persagy
-#      secretKey: persagy@2021
-    token:
-      enabled: false
-  adm:
-    oldPlatformUrl: http://39.102.40.239
-  bdtp:
-    rwd:
-#      service: http://develop.persagy.com/dmp-rwd
-      service: http://82.157.151.123/dmp-rwd
-    file:
-#      service: http://develop.persagy.com/dmp-file
-      service: http://82.157.151.123/dmp-file
-    dic:
-#      service: http://develop.persagy.com/dmp-dic
-      service: http://82.157.151.123/dmp-dic
-mybatis-plus:
-  type-handlers-package: com.persagy.**.typehandler
-#  configuration:
-#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    allow-bean-definition-overriding: true