Skip to content

A
aserver
Commit ad5649cf authored by 成亚卿's avatar 成亚卿
Browse files
Options

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

# Conflicts: # src/main/resources/DBUpdate/KingBase_UpdateSQL.xml
parents 71687d11 423f9c33
Expand all Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 8 deletions
src/main/resources/AppConfig-pro.properties
View file @ ad5649cf
......@@ -109,10 +109,12 @@ username=dagly
password=Admin@123456
#oracle\u8DEF\u5F84
oraclePath=D:/ORACLE/base/product/11.2.0/dbhome_1/bin
#dm\u8DEF\u5F84
dmPath=/home/dmdba/dmdbms/bin
## \u91D1\u4ED3\u6570\u636E\u5E93\u914D\u7F6E\u5230sys_dump.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
jcPath=/home/database/jc/tools/bin
## \u795E\u901A\u6570\u636E\u5E93\u914D\u7F6E\u5230oraexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
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
......
src/main/resources/AppConfig.properties
View file @ ad5649cf
......@@ -101,10 +101,12 @@ username=dagly
password=Admin@123456
#oracle\u8DEF\u5F84
oraclePath=D:/ORACLE/base/product/11.2.0/dbhome_1/bin
#dm\u8DEF\u5F84
dmPath=/home/dmdba/dmdbms/bin
## \u91D1\u4ED3\u6570\u636E\u5E93\u914D\u7F6E\u5230sys_dump.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
jcPath=/home/database/jc/tools/bin
## \u795E\u901A\u6570\u636E\u5E93\u914D\u7F6E\u5230oraexp.exe\u6587\u4EF6\u7684\u7236\u8DEF\u5F84
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
......
src/main/resources/SN.properties
View file @ ad5649cf
## must be used UTF-8 encoding , Note the conversion encoding !!!!
## 本文件部署时必须使用UTF-8编码，请注意转换
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment