Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev #7

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
10 changes: 5 additions & 5 deletions application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spring:
max-active: 100
test-on-borrow: true
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
min-evictable-idle-time-millis: 3000
web-stat-filter:
exclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
stat-view-servlet:
Expand All @@ -40,8 +40,8 @@ spring:
login-password: admin
mail:
host: smtp.163.com
username: paascloudTest@163.com
password: a123456
username: lishi_tech@163.com
password: 123iop
port: 465
protocol: smtp
test-connection: false
Expand Down Expand Up @@ -69,7 +69,7 @@ spring:
queue: zipkin
sleuth:
sampler:
percentage: 0.2
percentage: 1

feign:
hystrix:
Expand Down Expand Up @@ -136,4 +136,4 @@ paascloud:
pcPath: /data/file/qrCode/alipay
qiniuPath: alipay/QRCode/
zk:
zkAddressList: paascloud-provider-zk:2181
zkAddressList: paascloud-provider-zk:2181
4 changes: 2 additions & 2 deletions paascloud-gateway-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

proxy:
auth:
Expand All @@ -120,4 +120,4 @@ swagger.butler:
# 指定要生成的范围
generate-routes: omc-route,mdc-route,opc-route,tpc-route,uac-route
# 忽略某些路由生成
# ignore-routes:
# ignore-routes:
6 changes: 3 additions & 3 deletions paascloud-monitor-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ spring:
enabled: true
notify:
mail:
to: [email protected]
from: paascloudTest@163.com
to: [email protected]
from: lishi_tech@163.com
turbine:
clusters: default
location: paascloud-monitor
Expand All @@ -30,4 +30,4 @@ security:
turbine:
app-config: paascloud-gateway #收集监控信息的服务名
combine-host-port: true
cluster-name-expression: new String('default') #集群名称
cluster-name-expression: new String('default') #集群名称
4 changes: 2 additions & 2 deletions paascloud-provider-mdc-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

paascloud:
enableSqlLogInterceptor: false
Expand Down Expand Up @@ -73,4 +73,4 @@ paascloud:
clientId: ${security.oauth2.client.clientId}
clientSecret: ${security.oauth2.client.clientSecret}
clientAuthenticationScheme: header
tokenStore: jwt
tokenStore: jwt
6 changes: 3 additions & 3 deletions paascloud-provider-omc-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

paascloud:
enableSqlLogInterceptor: false
Expand Down Expand Up @@ -71,5 +71,5 @@ paascloud:
callback:
url: http://api.paascloud.net/omc/pay/alipayCallback
qrCode:
pcPath: E:/File/alipay/QRCode
qiniuPath: alipay/QRCode/
pcPath: /data/file/qrCode/alipay
qiniuPath: alipay/QRCode/
4 changes: 2 additions & 2 deletions paascloud-provider-opc-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

paascloud:
enableSqlLogInterceptor: false
Expand Down Expand Up @@ -94,4 +94,4 @@ paascloud:
endpoint:
endpointName: cn-beijing
product: Dysmsapi
domain: dysmsapi.aliyuncs.com
domain: dysmsapi.aliyuncs.com
4 changes: 2 additions & 2 deletions paascloud-provider-tpc-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

paascloud:
enableSqlLogInterceptor: false
Expand Down Expand Up @@ -90,4 +90,4 @@ paascloud:
dataflowJob:
cron: 0 */20 * * * ?
shardingTotalCount: 1
shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
2 changes: 1 addition & 1 deletion paascloud-zipkin-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ security:
user-info-uri: http://paascloud-gateway:7979/uac/user
prefer-token-info: false
jwt:
key-uri: http://paascloud-provider-uac:8000/oauth/token_key
key-uri: http://paascloud-provider-uac:8040/oauth/token_key

paascloud:
oauth2:
Expand Down