Merge remote-tracking branch 'origin/SZDAS_V2.0' into SZDAS_V2.0

# Conflicts: # src/main/resources/DBUpdate/KingBase_UpdateSQL.xml

Merge remote-tracking branch 'origin/SZDAS_V2.0' into SZDAS_V2.0
ad5649cf · 成亚卿 · 71687d11 · 423f9c33 · ad5649cf · ad5649cf
Commit ad5649cf authored Feb 23, 2021 by 成亚卿
6 changed files
--- a/src/main/resources/AppConfig-pro.properties
+++ b/src/main/resources/AppConfig-pro.properties
@@ -109,10 +109,12 @@ username=dagly
 password=Admin@123456
-#oracle\u8DEF\u5F84
+## \u91D1\u4ED3\u6570\u636E\u5E93\u914D\u7F6E\u5230sys_dump.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
-oraclePath=D:/ORACLE/base/product/11.2.0/dbhome_1/bin
+jcPath=/home/database/jc/tools/bin
-#dm\u8DEF\u5F84
+## \u795E\u901A\u6570\u636E\u5E93\u914D\u7F6E\u5230oraexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
-dmPath=/home/dmdba/dmdbms/bin
+stPath=/home/database/st/bin
+## \u8FBE\u68A6\u6570\u636E\u5E93\u914D\u7F6E\u5230dexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
+dmPath=/home/database/dm/bin
 regEx = _.`~@#$%^@#&|\n|\r|\t

--- a/src/main/resources/AppConfig.properties
+++ b/src/main/resources/AppConfig.properties
@@ -101,10 +101,12 @@ username=dagly
 password=Admin@123456
-#oracle\u8DEF\u5F84
+## \u91D1\u4ED3\u6570\u636E\u5E93\u914D\u7F6E\u5230sys_dump.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
-oraclePath=D:/ORACLE/base/product/11.2.0/dbhome_1/bin
+jcPath=/home/database/jc/tools/bin
-#dm\u8DEF\u5F84
+## \u795E\u901A\u6570\u636E\u5E93\u914D\u7F6E\u5230oraexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
-dmPath=/home/dmdba/dmdbms/bin
+stPath=/home/database/st/bin
+## \u8FBE\u68A6\u6570\u636E\u5E93\u914D\u7F6E\u5230dexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
+dmPath=/home/database/dm/bin
 regEx = _.`~@#$%^@#&|\n|\r|\t

--- a/src/main/resources/DBUpdate/DM_UpdateSQL.xml
+++ b/src/main/resources/DBUpdate/DM_UpdateSQL.xml
--- a/src/main/resources/DBUpdate/KingBase_UpdateSQL.xml
+++ b/src/main/resources/DBUpdate/KingBase_UpdateSQL.xml
--- a/src/main/resources/DBUpdate/ST_UpdateSQL.xml
+++ b/src/main/resources/DBUpdate/ST_UpdateSQL.xml
--- a/src/main/resources/SN.properties
+++ b/src/main/resources/SN.properties
+## must be used UTF-8 encoding , Note the conversion encoding !!!!
+## 本文件部署时必须使用UTF-8编码，请注意转换
\ No newline at end of file