Browse Source

tall test

master
zhizhi wu 5 years ago
parent
commit
355530f0eb
  1. 4
      cloudutil/src/main/resources/application-util-test.yml
  2. 1
      pom.xml
  3. 23
      tall/src/main/resources/application-test.yml
  4. 4
      tall/src/main/resources/application.yml
  5. 8
      tall/src/main/resources/druid-test.yml

4
cloudutil/src/main/resources/application-util-test.yml

@ -20,8 +20,8 @@ eureka:
service-url: service-url:
# 指定eureka server通信地址,注意/eureka/小尾巴不能少 # 指定eureka server通信地址,注意/eureka/小尾巴不能少
#defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/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@192.168.0.99:7010/eureka/
defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/
instance: instance:
# 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server
prefer-ip-address: true prefer-ip-address: true

1
pom.xml

@ -31,6 +31,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<skipTests>true</skipTests>
</properties> </properties>
<dependencies> <dependencies>

23
tall/src/main/resources/application-test.yml

@ -11,8 +11,8 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
rabbitmq: rabbitmq:
# host: 127.0.0.1 host: 127.0.0.1
host: api.ccsens.com # host: api.ccsens.com
password: 111111 password: 111111
port: 5672 port: 5672
username: admin username: admin
@ -32,14 +32,17 @@ swagger:
enable: true enable: true
eureka: eureka:
instance: instance:
# ip-address: 192.168.0.99 ip-address: 192.168.0.99
ip-address: 49.233.89.188 # ip-address: 49.233.89.188
#gatewayUrl: http://192.168.0.99/gateway/ gatewayUrl: http://192.168.0.99/gateway/
#notGatewayUrl: http://192.168.0.99/ notGatewayUrl: http://192.168.0.99/
gatewayUrl: https://test.tall.wiki/gateway/ #gatewayUrl: https://test.tall.wiki/gateway/
notGatewayUrl: https://test.tall.wiki/ #notGatewayUrl: https://test.tall.wiki/
wx: wx:
prefixUrl: https://www.tall.wiki/wxconfigurer-api/ 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: file:
domain: https://test.tall.wiki/gateway/tall/v1.0/ domain: http://192.168.0.99/gateway/tall/v1.0/
imgDomain: https://test.tall.wiki/gateway/tall/v1.0/uploads imgDomain: http://192.168.0.99/gateway/tall/v1.0/uploads

4
tall/src/main/resources/application.yml

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: dev active: test
include: util-dev,common include: util-test,common

8
tall/src/main/resources/druid-test.yml

@ -15,8 +15,8 @@ spring:
maxWait: 60000 maxWait: 60000
minEvictableIdleTimeMillis: 300000 minEvictableIdleTimeMillis: 300000
minIdle: 5 minIdle: 5
password: # password:
# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
poolPreparedStatements: true poolPreparedStatements: true
servletLogSlowSql: true servletLogSlowSql: true
servletLoginPassword: 111111 servletLoginPassword: 111111
@ -28,8 +28,8 @@ spring:
testOnReturn: false testOnReturn: false
testWhileIdle: true testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000 timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://127.0.0.1/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 url: jdbc:mysql://test.tall.wiki/tall?useUnicode=true&characterEncoding=UTF-8
username: root username: root
validationQuery: SELECT 1 FROM DUAL validationQuery: SELECT 1 FROM DUAL
env: CCSENS_TALL env: CCSENS_TALL
Loading…
Cancel
Save