Merge branch 'uat' into 'sim'

Uat

See merge request eshop/biz_service_ebtp_extend!59

src/main/resources/application-dev.yml

@@ -172,9 +172,14 @@ mconfig:
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
       usercenter: core-service-usercenter-public #用户中心
+  file:
+    font-address: /storage/fonts/
+    upload-address: /storage/reviewReport/
 document:
   clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 
+
+
 # 用户暴露给 prometheus 的健康数据  
 management:
   endpoints:

src/main/resources/application-local.yml

@@ -3,18 +3,18 @@ server:
   servlet:
     context-path: /
 
-# 对应 apollo 配置中心的应用名
-app:
-  id: biz-service-ebtp-extend
-
-# Apollo 配置信息
-apollo:
-  meta: http://10.242.37.148:6001/
-  bootstrap:
-    namespace: application
-    enabled: true
-    eagerLoad:
-      enabled: true
+## 对应 apollo 配置中心的应用名
+#app:
+#  id: biz-service-ebtp-extend
+#
+## Apollo 配置信息
+#apollo:
+#  meta: http://10.242.37.148:6001/
+#  bootstrap:
+#    namespace: application
+#    enabled: true
+#    eagerLoad:
+#      enabled: true
       
 seata:
   service:
@@ -164,7 +164,9 @@ mconfig:
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
       usercenter: core-service-usercenter-public #用户中心
-
+  file:
+    font-address: /storage/fonts/
+    upload-address: /storage/reviewReport/
 
 document:
   clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749

src/main/resources/application-mster.yml

@@ -167,6 +167,9 @@ mconfig:
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
       usercenter: core-service-usercenter-public #用户中心
+  file:
+    font-address: /storage/fonts/
+    upload-address: /storage/reviewReport/
 document:
   clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 

src/main/resources/application-uat.yml

@@ -167,6 +167,9 @@ mconfig:
       tender: biz-service-ebtp-tender #投标服务
       documentcenter: core-service-document-center #文档中心
       usercenter: core-service-usercenter-public #用户中心
+  file:
+    font-address: /storage/fonts/
+    upload-address: /storage/reviewReport/
 document:
   clientHttpUrl: http://10.242.31.158:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
 

src/main/resources/license/aspose-license.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<License>
+    <Data>
+        <Products>
+            <Product>Aspose.Total for Java</Product>
+            <Product>Aspose.Words for Java</Product>
+        </Products>
+        <EditionType>Enterprise</EditionType>
+        <SubscriptionExpiry>20991231</SubscriptionExpiry>
+        <LicenseExpiry>20991231</LicenseExpiry>
+        <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
+    </Data>
+    <Signature>
+        sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
+    </Signature>
+</License>