添加Redis端口号

src/main/java/com/archser/aserver/common/config/MainConfig.java

@@ -172,7 +172,7 @@ public class MainConfig extends JFinalConfig {
     me.add(arp);
 
 //   添加Redis 配置
-    RedisPlugin redis = new RedisPlugin("redis", PropKit.get("redis.url"),
+    RedisPlugin redis = new RedisPlugin("redis", PropKit.get("redis.url"),PropKit.getInt("redis.port"),
         PropKit.get("redis.password"));
     me.add(redis);
 

src/main/resources/AppConfig-pro.properties

 # ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
-
 # \u6570\u636E\u5E93
-
-
 #oracle\u6570\u636E\u5E93
 #dbType=ORACLE
 #mysql\u6570\u636E\u5E93
 #dbType=MYSQL
-
 # \u662F\u5426\u4E3A\u5F00\u53D1\u6A21\u5F0F
 devMode=true
 # \u6570\u636E\u5E93\u914D\u7F6E
 #\u91D1\u4ED3\u6570\u636E\u5E93
-#dbType=KingBase
-#jdbc.url=jdbc:kingbase8://192.168.31.161:54321/OSRDB
-#jdbc.driver=com.kingbase8.Driver
-#jdbc.username=ARCHSER
-#jdbc.password=archser
-
+dbType=KingBase
+jdbc.url=jdbc:kingbase8://192.168.31.161:54321/DB_BASE
+jdbc.driver=com.kingbase8.Driver
+jdbc.username=archser_hywd
+jdbc.password=archser_hywd
+basic.url=http://192.168.31.121:8088/aserver
 #\u914D\u7F6E\u6570\u636E\u5E93\u65B9\u8A00\uFF0C\u4E0D\u914D\u7F6E\u4F7F\u7528dbType\u6765\u521B\u5EFA\u6570\u636E\u5E93\u65B9\u8A00
 #jdbc.dialect=
-
 #\u8FBE\u68A6\u6570\u636E\u5E93
-dbType=DM
-jdbc.url=jdbc:dm://39.104.21.218:5236
-jdbc.driver=dm.jdbc.driver.DmDriver
-jdbc.username=ARCHSER_HYWDTEST
-jdbc.password=archser_hywdtest
 
+#dbType=ST
+#jdbc.url=jdbc:oscar://192.168.31.161:2003/OSRDB
+#jdbc.driver=com.oscar.Driver
+#jdbc.username=archser_dft
+#jdbc.password=archser_dft
+#basic.url=http://192.168.31.121:8088/aserver
 #\u795E\u901A\u6570\u636E\u5E93
 #dbType=ST
 #jdbc.url=jdbc:oscar://192.168.31.161:2003/OSRDB
 #jdbc.driver=com.oscar.Driver
 #jdbc.username=archser
 #jdbc.password=archser
-
 #\u4E2D\u95F4\u4EF6\u7C7B\u578B \u6C49\u8BED\u62FC\u97F3 zhongchaung\u3001dongfangtong\u3001baolande\u3001jindie\u3001dev
-MiddlewareType=dev
-
+MiddlewareType=dongfangtong
 # redis\u914D\u7F6E
-redis.url=127.0.0.2
-redis.password=archser_redis
+redis.url=192.168.31.121
+redis.port=6379
+redis.password=archser_redis_6379
 
 #\u5355\u70B9\u767B\u9646\u5730\u5740
-basic.url=http://39.104.21.218:11038
 ## \u662F\u5426\u540C\u6B65Redis\u4E2D\u7684\u6570\u636E
 updateRedis=true
-
 #ip\u767D\u540D\u5355\uFF0C\u914D\u7F6E\u672C\u673A\u5730\u5740
-MyIpAddress=127.0.0.1,0:0:0:0:0:0:0:1
-
+MyIpAddress=127.0.0.1,0:0:0:0:0:0:0:1,192.168.31.121,192.168.31.161
 #activemq
-activemq.brokerURL=tcp://39.104.21.218:61616
 
+activemq.brokerURL=tcp://192.168.31.121: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
@@ -67,140 +58,205 @@ 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://39.104.28.145:8888/upload
-uploadBasePath=/home/data/serverFile/fserver_file/upload
-convertBasePath=/home/data/serverFile/fserver_file/convert
-ofdFilePath=/home/data/serverFile/fserver_file/ofdFile
-imagePdfFilePath=/home/data/serverFile/fserver_file/imagePdfFile
-m3u8FolderPath=/home/data/serverFile/fserver_file/m3u8FolderPath
 
+uploadBasePath=/home/archiveService/file/upload
 
-#2G
-uploadMaxSize=2147483647
+convertBasePath=/home/archiveService/file/convert
 
+ofdFilePath=/home/archiveService/file/ofdFile
 
+imagePdfFilePath=/home/archiveService/file/imagePdfFile
+
+m3u8FolderPath=/home/archiveService/file/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=2002
 #officeHome=/opt/openoffice4
-
 officeHome=/opt/openoffice4
 
 #===================\u7BA1\u7406\u7AEF=========
 
-
 ## excel\u5907\u4EFD\u4F4D\u7F6E
+
 backupPath=/home/archser/gitServices/folder
+
 ## excel\u6062\u590D\u4F4D\u7F6E
-importPath=/home/archser/gitServices/folder
 
+importPath=/home/archser/gitServices/folder
 
 fserver=fserver
+
 defaultStageName=\u6587\u4EF6\u6536\u96C6
 
 username=dagly
-password=Admin@123456
 
+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
-pserverType=pserver
 
 
 
+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=archiveOrgConfigName
 
 #============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.host=192.168.31.121
+
 es.port=9200
-es.user=es
-es.password=Admin@123456
 
+es.user=elastic
+
+es.password=b87CQhCIRM5bECYDwCSw
 
 sserver.username=dagly
+
 sserver.password=Admin@123456
+
 indexFilterfield=COMPILATION
 
 #========================================================
 
 #===================filing===============================
+
 loginuser=dagly
+
 loginpwd=Admin@123456
 
+
 #activemq
-activemq.brokerIp=39.104.21.218
-#=====================================================
 
 
 
+activemq.brokerIp=192.168.31.121
+
+
+
+#=====================================================
+
 #==============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
+
+
+
 #====================