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

src/main/java/com/archser/aserver/controller/AppConfigController.java

+package com.archser.aserver.controller;
+
+import com.archser.aserver.common.config.MainConfig;
+import com.archser.aserver.interceptor.JwtInterceptor;
+import com.jfinal.aop.Clear;
+import com.jfinal.core.Controller;
+import com.jfinal.kit.Ret;
+
+/**
+ * 获取系统配置
+ * @Auther: huwenbin
+ * @Date: 2021/1/6 16:54
+ */
+public class AppConfigController extends Controller {
+
+
+  /**
+   * 获取系统配置
+   * @auther: huwenbin
+   * @date: 2021.1.8
+   */
+  @Clear(JwtInterceptor.class)
+  public void index() {
+    this.renderJson(Ret.ok("config", MainConfig.getAppConfig().getProperties()));
+  }
+}

src/main/resources/config-pro.properties

-
-dbType=DM
-jdbcUrl=jdbc:dm://39.104.62.15:5236
-jdbc.driver=dm.jdbc.driver.DmDriver
-user=archser_hywd
-password=archser_hywd
-basic.url=http://39.104.62.15:11028
-
-devMode =true
-engineDevMode=true
-
-
-## 是否同步Redis中的数据
-updateRedis=true
-
-redis.url=39.104.62.15
-redis.password=archser_redis
-
-# --- 消息中心websocket配置 ---
-##  定时发送消息的周期   单位毫秒
-messageWsDelay=50000
-##  延期，第二次发送消息的延期时间，第一次发送在开始连接时就会发送 单位毫秒
-messageWsPeriod=50000
-## 消息发送成功后，等待客户端反馈时间，超出此时间表示连接已经断开，会关闭连接 单位毫秒
-messageWsTimeout=30000
-## 是否开启消息中心的websocket
-openMessageWebSocket=true
-
-MyIpAddress=127.0.0.1,39.104.28.145,39.104.62.15
\ No newline at end of file
+
+dbType=DM
+jdbc.url=jdbc:dm://39.104.21.218:5236
+jdbc.driver=dm.jdbc.driver.DmDriver
+jdbc.username=ARCHSER_TEST
+jdbc.password=archser_test
+
+devMode =true
+
+## \u662F\u5426\u540C\u6B65Redis\u4E2D\u7684\u6570\u636E
+updateRedis=true
+
+redis.url=39.104.21.218
+redis.password=archser_redis
+
+# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
+##  \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F   \u5355\u4F4D\u6BEB\u79D2
+messageWsDelay=50000
+##  \u5EF6\u671F\uFF0C\u7B2C\u4E8C\u6B21\u53D1\u9001\u6D88\u606F\u7684\u5EF6\u671F\u65F6\u95F4\uFF0C\u7B2C\u4E00\u6B21\u53D1\u9001\u5728\u5F00\u59CB\u8FDE\u63A5\u65F6\u5C31\u4F1A\u53D1\u9001 \u5355\u4F4D\u6BEB\u79D2
+messageWsPeriod=50000
+## \u6D88\u606F\u53D1\u9001\u6210\u529F\u540E\uFF0C\u7B49\u5F85\u5BA2\u6237\u7AEF\u53CD\u9988\u65F6\u95F4\uFF0C\u8D85\u51FA\u6B64\u65F6\u95F4\u8868\u793A\u8FDE\u63A5\u5DF2\u7ECF\u65AD\u5F00\uFF0C\u4F1A\u5173\u95ED\u8FDE\u63A5 \u5355\u4F4D\u6BEB\u79D2
+messageWsTimeout=30000
+## \u662F\u5426\u5F00\u542F\u6D88\u606F\u4E2D\u5FC3\u7684websocket
+openMessageWebSocket=true
+
+MyIpAddress=127.0.0.1,39.104.28.145,39.104.62.15

src/main/resources/config.properties

-# ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
-
-dbType=DM
-
-jdbcUrl=jdbc:dm://39.104.28.145:5236
-jdbc.driver=dm.jdbc.driver.DmDriver
-user=archser_yz
-password=archser_yz
-basic.url=http://39.104.28.145:11028
-
-
-redis.url=39.104.28.145
-redis.password=archser_redis
-
-devMode =true
-engineDevMode=true
-
-
-authUrl=http://125.77.26.133:7001/auth/token
-userInfoUrl=http://125.77.26.133:7001/api/info/user_info
-redirect_uri=http://192.168.31.17:8080/
-
-# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
-##  \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F   \u5355\u4F4D\u6BEB\u79D2
-messageWsDelay=5000
-##  \u5EF6\u671F\uFF0C\u7B2C\u4E8C\u6B21\u53D1\u9001\u6D88\u606F\u7684\u5EF6\u671F\u65F6\u95F4\uFF0C\u7B2C\u4E00\u6B21\u53D1\u9001\u5728\u5F00\u59CB\u8FDE\u63A5\u65F6\u5C31\u4F1A\u53D1\u9001 \u5355\u4F4D\u6BEB\u79D2
-messageWsPeriod=5000
-## \u6D88\u606F\u53D1\u9001\u6210\u529F\u540E\uFF0C\u7B49\u5F85\u5BA2\u6237\u7AEF\u53CD\u9988\u65F6\u95F4\uFF0C\u8D85\u51FA\u6B64\u65F6\u95F4\u8868\u793A\u8FDE\u63A5\u5DF2\u7ECF\u65AD\u5F00\uFF0C\u4F1A\u5173\u95ED\u8FDE\u63A5 \u5355\u4F4D\u6BEB\u79D2
-messageWsTimeout=30000
-## \u662F\u5426\u5F00\u542F\u6D88\u606F\u4E2D\u5FC3\u7684websocket
-## 是否开启消息中心的websocket
-openMessageWebSocket=true
-
-MyIpAddress=127.0.0.1,39.104.28.145,39.104.90.66
+# ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
+
+# \u6570\u636E\u5E93
+dbType=DM
+# \u662F\u5426\u4E3A\u5F00\u53D1\u6A21\u5F0F
+devMode=true
+# \u6570\u636E\u5E93\u914D\u7F6E
+jdbc.url=jdbc:dm://39.104.21.218:5236
+jdbc.driver=dm.jdbc.driver.DmDriver
+jdbc.username=ARCHSER_TEST
+jdbc.password=archser_test
+
+# redis\u914D\u7F6E
+redis.url=39.104.21.218
+redis.password=archser_redis
+
+#\u5355\u70B9\u767B\u9646\u5730\u5740
+basic.url=http://39.104.21.218:11038
+
+
+#ip\u767D\u540D\u5355\uFF0C\u914D\u7F6E\u672C\u673A\u5730\u5740
+MyIpAddress=127.0.0.1,39.104.28.145,39.104.90.66
+
+#activemq
+activemq.brokerURL=tcp://39.104.21.218:61616
+
+authUrl=http://125.77.26.133:7001/auth/token
+userInfoUrl=http://125.77.26.133:7001/api/info/user_info
+redirect_uri=http://192.168.31.17:8080/
+
+# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
+##  \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F   \u5355\u4F4D\u6BEB\u79D2
+messageWsDelay=5000
+##  \u5EF6\u671F\uFF0C\u7B2C\u4E8C\u6B21\u53D1\u9001\u6D88\u606F\u7684\u5EF6\u671F\u65F6\u95F4\uFF0C\u7B2C\u4E00\u6B21\u53D1\u9001\u5728\u5F00\u59CB\u8FDE\u63A5\u65F6\u5C31\u4F1A\u53D1\u9001 \u5355\u4F4D\u6BEB\u79D2
+messageWsPeriod=5000
+## \u6D88\u606F\u53D1\u9001\u6210\u529F\u540E\uFF0C\u7B49\u5F85\u5BA2\u6237\u7AEF\u53CD\u9988\u65F6\u95F4\uFF0C\u8D85\u51FA\u6B64\u65F6\u95F4\u8868\u793A\u8FDE\u63A5\u5DF2\u7ECF\u65AD\u5F00\uFF0C\u4F1A\u5173\u95ED\u8FDE\u63A5 \u5355\u4F4D\u6BEB\u79D2
+messageWsTimeout=30000
+## \u662F\u5426\u5F00\u542F\u6D88\u606F\u4E2D\u5FC3\u7684websocket
+openMessageWebSocket=true
+
+
+#=============================fserver========================
+
+#66\u7684docker\u5185\u90E8\u8BBE\u7F6E\u7684\u7F51\u8DEF\u5730\u5740
+ofdUrl=http://172.22.0.1:8888/upload
+uploadBasePath=F:/test
+convertBasePath=D:/workspace/fserver_folder/convert
+ofdFilePath=D:/workspace/fserver_folder/ofdFile
+imagePdfFilePath=D:/workspace/fserver_folder/imagePdfFile
+m3u8FolderPath=D:/workspace/fserver_folder/m3u8FolderPath
+
+
+#2G
+uploadMaxSize=2147483647
+
+
+#openOffice\u6587\u4EF6\u8F6C\u6362\u914D\u7F6E
+#\u662F\u5426\u5F00\u542FopenOffice \u8BBE\u7F6E\u4E3Atrue\u6587\u4EF6\u8F6C\u6362\u5C06\u4F7F\u7528openOffice\u4E0D\u4F1A\u6839\u636E\u64CD\u4F5C\u7CFB\u7EDF\u6765\u533A\u5206\u4F7F\u7528\u54EA\u79CD\u8F6C\u6362\u65B9\u5F0F
+openOffice=false
+#openOffice\u7684\u8DEF\u5F84
+officePortNumbers=8100
+#officeHome=/opt/openoffice4
+
+officeHome=D:/OpenOffic
+
+#===================\u7BA1\u7406\u7AEF=========
+
+
+## excel\u5907\u4EFD\u4F4D\u7F6E
+backupPath=/home/archser/gitServices/folder
+## excel\u6062\u590D\u4F4D\u7F6E
+importPath=/home/archser/gitSRecordSearchServiceImplervices/folder
+
+
+fserver=fserver
+defaultStageName=\u6587\u4EF6\u6536\u96C6
+
+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
+
+regEx = _.`~@#$%^@#&|\n|\r|\t
+
+
+#\u4E8C\u7EF4\u7801\u6253\u5370\u7EB8\u5F20\u5927\u5C0F(\u6BEB\u7C73)
+pdf417Height=25
+pdf417Width=75
+
+fserverType=fserver
+
+pserverName=pserver\u009E\u008B
+pserverType=pserver
+
+
+
+#========================userver============
+redFileLibName=\u6587\u4E66\u6863\u6848
+redFileColumn=\u516C\u5F00\u7C7B\u578B
+redFileData=\u4E3B\u52A8\u516C\u5F00
+archName=archser
+archType=archser
+
+gisTable=28
+
+
+userver.username=dagly
+userver.password=Admin@123456
+
+# aserver\u670D\u52A1\u5668\u7684\u540D\u79F0\uFF0C\u53D1\u9001\u6D88\u606F\u4F1A\u7528\u5230
+aserver=aserver
+
+#\u6863\u6848\u6240\u5C5E\u673A\u6784\u7684\u5B57\u6BB5\u82F1\u6587\u540D\u79F0
+archiveOrgConfigName=\u6863\u6848\u6240\u5C5E\u673A\u6784\u7684\u5B57\u6BB5\u82F1\u6587\u540D\u79F0
+
+#============Accession========================
+#\u6587\u4EF6\u670D\u52A1\u540D\u79F0
+FserverName=fserver
+#=======================================
+
+
+#===================\u56DB\u6027\u68C0\u6D4B========================
+## \u6682\u65E0\u7279\u6B8A\u914D\u7F6E
+#=====================================================
+
+
+#================sserver=================================
+
+#Elasticsearch\u670D\u52A1\u5668\u8BBE\u7F6E
+es.host=39.104.21.218
+es.port=9200
+es.user=es
+es.password=Admin@123456
+
+sserver.username=dagly
+sserver.password=Admin@123456
+indexFilterfield=COMPILATION
+
+#========================================================
+
+#===================filing===============================
+loginuser=dagly
+loginpwd=Admin@123456
+
+#activemq
+activemq.brokerIp=39.104.21.218
+#=====================================================
+
+
+
+#==============appraisal===================
+#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
+#==================================================
+
+#===========compilation=====================
+#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
+#==================================================
+
+#======================pserver================
+#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
+#===================================================
+
+#===============storage==================
+#\u7EB8\u5F20\u5C3A\u5BF8\uFF08\u5355\u4F4D\u6BEB\u7C73\uFF09
+barCodeHeight=10
+barCodeWidth=70
+#=========================================
+
+
+#===================rserver================
+#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
+#====================
\ No newline at end of file