Merge branch 'dev' into 'pro'

因天眼不支持中划线服务名,因此将其改为下划线

See merge request eshop/biz_service_ebtp_extend!21
This commit is contained in:
万宸舜
2021-03-29 17:59:08 +08:00
2 changed files with 2 additions and 4 deletions

View File

@ -75,7 +75,7 @@ spec:
memory: 6Gi memory: 6Gi
env: env:
- name: APP_NAME - name: APP_NAME
value: biz-ebtp-extend value: biz_ebtp_extend
- name: AGENT_LICENCE - name: AGENT_LICENCE
value: 527BFA7B28577578 value: 527BFA7B28577578
- name: APOLLO_CONFIGSERVICE - name: APOLLO_CONFIGSERVICE

View File

@ -121,7 +121,6 @@ mybatis-plus:
logic-delete-value: deleted # 逻辑已删除值 logic-delete-value: deleted # 逻辑已删除值
logic-not-delete-value: normal # 逻辑未删除值 logic-not-delete-value: normal # 逻辑未删除值
# --------------feign ------------ # --------------feign ------------
feign: feign:
httpclient: httpclient:
@ -168,9 +167,8 @@ mconfig:
tender: biz-service-ebtp-tender #投标服务 tender: biz-service-ebtp-tender #投标服务
documentcenter: core-service-document-center #文档中心 documentcenter: core-service-document-center #文档中心
document: document:
clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749 clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
# 用户暴露给 prometheus 的健康数据 # 用户暴露给 prometheus 的健康数据
management: management: