diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml
index a52717f4..929fc03c 100644
--- a/cloudutil/src/main/resources/application-util-test.yml
+++ b/cloudutil/src/main/resources/application-util-test.yml
@@ -20,8 +20,8 @@ eureka:
service-url:
# 指定eureka server通信地址,注意/eureka/小尾巴不能少
#defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/
-# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
- defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
+ defaultZone: http://admin:admin@192.168.0.99:7010/eureka/
+# defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
instance:
# 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server
prefer-ip-address: true
diff --git a/pom.xml b/pom.xml
index 93a7517a..6fcbf0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,7 @@
UTF-8
1.8
+ true
diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml
index c2646761..81423ad4 100644
--- a/tall/src/main/resources/application-test.yml
+++ b/tall/src/main/resources/application-test.yml
@@ -11,8 +11,8 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
rabbitmq:
-# host: 127.0.0.1
- host: api.ccsens.com
+ host: 127.0.0.1
+# host: api.ccsens.com
password: 111111
port: 5672
username: admin
@@ -32,14 +32,17 @@ swagger:
enable: true
eureka:
instance:
-# ip-address: 192.168.0.99
- ip-address: 49.233.89.188
-#gatewayUrl: http://192.168.0.99/gateway/
-#notGatewayUrl: http://192.168.0.99/
-gatewayUrl: https://test.tall.wiki/gateway/
-notGatewayUrl: https://test.tall.wiki/
+ ip-address: 192.168.0.99
+# ip-address: 49.233.89.188
+gatewayUrl: http://192.168.0.99/gateway/
+notGatewayUrl: http://192.168.0.99/
+#gatewayUrl: https://test.tall.wiki/gateway/
+#notGatewayUrl: https://test.tall.wiki/
wx:
prefixUrl: https://www.tall.wiki/wxconfigurer-api/
+#file:
+# domain: https://test.tall.wiki/gateway/tall/v1.0/
+# imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads
file:
- domain: https://test.tall.wiki/gateway/tall/v1.0/
- imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads
\ No newline at end of file
+ domain: http://192.168.0.99/gateway/tall/v1.0/
+ imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads
\ No newline at end of file
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b2acd365..c88e995d 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,4 +1,4 @@
spring:
profiles:
- active: dev
- include: util-dev,common
+ active: test
+ include: util-test,common
diff --git a/tall/src/main/resources/druid-test.yml b/tall/src/main/resources/druid-test.yml
index 11227332..b52b019f 100644
--- a/tall/src/main/resources/druid-test.yml
+++ b/tall/src/main/resources/druid-test.yml
@@ -15,8 +15,8 @@ spring:
maxWait: 60000
minEvictableIdleTimeMillis: 300000
minIdle: 5
- password:
-# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
+# password:
+ password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true
servletLogSlowSql: true
servletLoginPassword: 111111
@@ -28,8 +28,8 @@ spring:
testOnReturn: false
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
- url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
-# url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
+# url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8
+ url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
username: root
validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL
\ No newline at end of file