Merge branch 'master' into feature/payment-apply-bfi-sync
# Conflicts: # blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java
This commit is contained in:
@@ -156,6 +156,15 @@ baidu:
|
||||
request-timeout: 30s
|
||||
token-refresh-advance: 1m
|
||||
|
||||
# 对象存储(blade-file 分片上传 + blade-transport 凭证读写共用)
|
||||
# endpoint:强烈建议内网 MinIO(http://IP:19000);若只能走网关可填 https://tms-prod.xinghy56.com/oss(代码会自动处理 /oss)
|
||||
# transform-endpoint:浏览器预签名外网地址
|
||||
file:
|
||||
storage:
|
||||
minio:
|
||||
# endpoint: http://内网MinIO地址:端口
|
||||
transform-endpoint: https://tms-prod.xinghy56.com/oss
|
||||
|
||||
powerjob:
|
||||
worker:
|
||||
server-address: 172.16.203.228:7700
|
||||
|
||||
@@ -49,6 +49,28 @@
|
||||
],
|
||||
"uri": "lb://blade-system"
|
||||
},
|
||||
{
|
||||
"id": "resource-route",
|
||||
"order": 0,
|
||||
"predicates": [
|
||||
{
|
||||
"name": "Path",
|
||||
"args": {
|
||||
"pattern": "/blade-resource/**"
|
||||
}
|
||||
}
|
||||
],
|
||||
"filters": [
|
||||
{
|
||||
"name": "RewritePath",
|
||||
"args": {
|
||||
"regexp": "/blade-resource/(?<segment>.*)",
|
||||
"replacement": "/$\\{segment}"
|
||||
}
|
||||
}
|
||||
],
|
||||
"uri": "http://127.0.0.1:8010"
|
||||
},
|
||||
{
|
||||
"id": "example-route",
|
||||
"order": 0,
|
||||
|
||||
Reference in New Issue
Block a user