Merge branch 'dev' into 'pro'

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

See merge request eshop/biz_service_ebtp_extend!21

pro.yaml

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

src/main/resources/application-pro.yml

@@ -121,7 +121,6 @@ mybatis-plus:
       logic-delete-value: deleted # 逻辑已删除值
       logic-not-delete-value: normal # 逻辑未删除值
 
-
 # --------------feign ------------
 feign:
   httpclient:
@@ -168,9 +167,8 @@ mconfig:
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
 
-
 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 的健康数据
 management: