ghj 1 жил өмнө
parent
commit
e457d3cfd6

+ 2 - 2
server/src/main/resources/application-local.yml

@@ -27,7 +27,6 @@ redis:
     type: manual
   host: 127.0.0.1
   port: 6379
-  password: 1234567
   maxIdle: 500
   maxTotal: 500
   maxWaitMillis: -1
@@ -48,4 +47,5 @@ xxl:
       port: 6998
       logpath:  /opt/erp/xxl-serverlogs
       logretentiondays: -1
-    accessToken:
+    accessToken:
+

+ 3 - 3
server/src/main/resources/application-test.yml

@@ -14,10 +14,10 @@ spring:
 
   #rabbitmq
   rabbitmq:
-    host: 127.0.0.1
+    host: 60.204.236.53
     port: 5672
-    username: guest
-    password: guest
+    username: userroot
+    password: user123456
     virtual-host: /
 
 #redis 配置

+ 11 - 1
server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: erp-server
   profiles:
-    active: test
+    active: local
   jackson:
     property-naming-strategy: SNAKE_CASE
   servlet:
@@ -44,6 +44,16 @@ erp:
     captchaTimout:  120       #验证码失效时间 单位秒
     smscodeTimout: 120        #短信验证码失效时间 单位秒
 
+
+
 shop-tnt:
   http-address: https://q26970737o.yicp.fun
   sign-secret: AT5W8XCsvGnxMY1RVguB
+
+kuaidianiao:
+  id: 1663339
+  key: 0b15b75c-94b4-482b-a462-fd21e45a50f5
+  apiUrl: http://183.62.170.46:38092/tcpapi/orderdist
+
+
+