Skip to content

A
aserver
Commit 20c5cf38 authored by 李德才's avatar 李德才
Browse files
Options

去除无效配置

parent 989855d2
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 78 deletions
src/main/java/com/archser/aserver/common/config/MainConfig.java
View file @ 20c5cf38
......@@ -4,6 +4,7 @@ import com.alibaba.druid.filter.stat.StatFilter;
import com.archser.aserver.common.config.plugins.DBUpgrade;
import com.archser.aserver.controller.*;
import com.archser.aserver.interceptor.JwtInterceptor;
import com.archser.aserver.itask.GoodSync;
import com.archser.aserver.model._MappingKit;
import com.archser.aserver.util.SharedDisk;
import com.archser.aserver.websocket.MessageWebSocket;
......@@ -220,7 +221,7 @@ public class MainConfig extends JFinalConfig {
@Override
public void onStart() {
AppStartConfig.onStart("aserver");
// new GoodSync().run();
new GoodSync().run();
}
/**
......
src/main/resources/AppConfig-pro.properties
View file @ 20c5cf38
......@@ -24,10 +24,10 @@ devMode=true
#\u8FBE\u68A6\u6570\u636E\u5E93
dbType=DM
jdbc.url=jdbc:dm://39.104.21.218:5236
jdbc.url=jdbc:dm://39.104.174.12:5236
jdbc.driver=dm.jdbc.driver.DmDriver
jdbc.username=ARCHSER_HYWDTEST
jdbc.password=archser_hywdtest
jdbc.username=archser
jdbc.password=archser_szdasys
#\u795E\u901A\u6570\u636E\u5E93
#dbType=ST
......@@ -39,15 +39,14 @@ jdbc.password=archser_hywdtest
#\u4E2D\u95F4\u4EF6\u7C7B\u578B \u6C49\u8BED\u62FC\u97F3 zhongchaung\u3001dongfangtong\u3001baolande\u3001jindie\u3001dev
MiddlewareType=dev
### don't open redis and redisSentinel At the same time
### \u4E0D\u8981\u540C\u65F6\u6253\u5F00 redis \u5355\u5B9E\u4F8B \u548C redisSentinel \u54E8\u5175\u96C6\u7FA4
# redis \u5355\u5B9E\u4F8B
#redis.url=192.168.31.151:26379,192.168.31.154:26379,192.168.31.157:26379
redis.url=39.104.21.218
redis.port=6380
redis.password=archser_redis218_6380
redis.url=192.168.31.100
redis.port=6379
redis.password=archser_redis
redisSentinel.CacheName=redisSentinel
redisSentinel.masterName=mymaster
......@@ -64,11 +63,7 @@ MyIpAddress=127.0.0.1,0:0:0:0:0:0:0:1
#activemq
#activemq.brokerURL=failover://(tcp://192.168.31.151:61616,tcp://192.168.31.154:61616,tcp://192.168.31.157:61616)
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/
activemq.brokerURL=tcp://39.104.21.218:61616
# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
## \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F \u5355\u4F4D\u6BEB\u79D2
......@@ -80,7 +75,6 @@ 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
......@@ -91,11 +85,9 @@ ofdFilePath=/home/data/serverFile/fserver_file/ofdFile
imagePdfFilePath=/home/data/serverFile/fserver_file/imagePdfFile
m3u8FolderPath=/home/data/serverFile/fserver_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
......@@ -107,20 +99,17 @@ 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
fserver=fserver
defaultStageName=\u6587\u4EF6\u6536\u96C6
username=dagly
password=Admin@123456
## \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
......@@ -130,7 +119,6 @@ dmPath=/home/database/dm/bin
regEx = _.`~@#$%^@#&|\n|\r|\t
#\u4E8C\u7EF4\u7801\u6253\u5370\u7EB8\u5F20\u5927\u5C0F(\u6BEB\u7C73)
pdf417Height=25
pdf417Width=75
......@@ -140,8 +128,6 @@ fserverType=fserver
pserverName=pserver
pserverType=pserver
#========================userver============
redFileLibName=\u6587\u4E66\u6863\u6848
redFileColumn=\u516C\u5F00\u7C7B\u578B
......@@ -151,10 +137,6 @@ 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
......@@ -166,12 +148,10 @@ archiveOrgConfigName=archiveOrgConfigName
FserverName=fserver
#=======================================
#===================\u56DB\u6027\u68C0\u6D4B========================
## \u6682\u65E0\u7279\u6B8A\u914D\u7F6E
#=====================================================
#================sserver=================================
#Elasticsearch\u670D\u52A1\u5668\u8BBE\u7F6E
......@@ -182,9 +162,6 @@ es.http=http
es.user=es
es.password=Admin@123456
sserver.username=dagly
sserver.password=Admin@123456
indexFilterfield=COMPILATION
#========================================================
......@@ -197,8 +174,6 @@ loginpwd=Admin@123456
activemq.brokerIp=39.104.21.218
#=====================================================
#==============appraisal===================
#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
#==================================================
......@@ -217,7 +192,6 @@ barCodeHeight=10
barCodeWidth=70
#=========================================
#===================rserver================
#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
#====================
src/main/resources/AppConfig.properties
View file @ 20c5cf38
# ---\u5F00\u53D1\u73AF\u5883\u914D\u7F6E\u6587\u4EF6---
# \u6570\u636E\u5E93
serverType=aserver
#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
# \u8FBE\u68A6\u6570\u636E\u5E93
#\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.url=jdbc:dm://39.104.174.12:5236
jdbc.driver=dm.jdbc.driver.DmDriver
jdbc.username=ARCHSER_TEST
jdbc.password=archser_test
jdbc.username=archser
jdbc.password=archser_szdasys
#\u795E\u901A\u6570\u636E\u5E93
#dbType=ST
......@@ -20,35 +36,34 @@ jdbc.password=archser_test
#jdbc.username=archser
#jdbc.password=archser
#\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
#\u4E2D\u95F4\u4EF6\u7C7B\u578B \u6C49\u8BED\u62FC\u97F3 zhongchaung\u3001dongfangtong\u3001baolande\u3001jindie\u3001dev
MiddlewareType=dev
# redis\u914D\u7F6E
redis.url=39.104.21.218
### don't open redis and redisSentinel At the same time
### \u4E0D\u8981\u540C\u65F6\u6253\u5F00 redis \u5355\u5B9E\u4F8B \u548C redisSentinel \u54E8\u5175\u96C6\u7FA4
# redis \u5355\u5B9E\u4F8B
#redis.url=192.168.31.151:26379,192.168.31.154:26379,192.168.31.157:26379
redis.url=192.168.31.100
redis.port=6379
redis.password=archser_redis
redisSentinel.CacheName=redisSentinel
redisSentinel.masterName=mymaster
#\u5355\u70B9\u767B\u9646\u5730\u5740
basic.url=http://39.104.21.218:11038
## \u662F\u5426\u540C\u6B65Redis\u4E2D\u7684\u6570\u636E
updateRedis=true
## \u4E34\u65F6\u6587\u4EF6\u5171\u4EAB\u78C1\u76D8\u8DEF\u5F84
SharedDisk=D:\\workspace\\fserver_folder\\SharedDisk
#ip\u767D\u540D\u5355\uFF0C\u914D\u7F6E\u672C\u673A\u5730\u5740
MyIpAddress=127.0.0.1,0:0:0:0:0:0:0:1
#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/
#activemq.brokerURL=failover://(tcp://192.168.31.151:61616,tcp://192.168.31.154:61616,tcp://192.168.31.157:61616)
activemq.brokerURL=tcp://39.104.21.218:61616
# --- \u6D88\u606F\u4E2D\u5FC3websocket\u914D\u7F6E ---
## \u5B9A\u65F6\u53D1\u9001\u6D88\u606F\u7684\u5468\u671F \u5355\u4F4D\u6BEB\u79D2
......@@ -60,7 +75,6 @@ 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
......@@ -71,11 +85,9 @@ ofdFilePath=/home/data/serverFile/fserver_file/ofdFile
imagePdfFilePath=/home/data/serverFile/fserver_file/imagePdfFile
m3u8FolderPath=/home/data/serverFile/fserver_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
......@@ -87,20 +99,17 @@ 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
fserver=fserver
defaultStageName=\u6587\u4EF6\u6536\u96C6
username=dagly
password=Admin@123456
## \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
......@@ -110,7 +119,6 @@ dmPath=/home/database/dm/bin
regEx = _.`~@#$%^@#&|\n|\r|\t
#\u4E8C\u7EF4\u7801\u6253\u5370\u7EB8\u5F20\u5927\u5C0F(\u6BEB\u7C73)
pdf417Height=25
pdf417Width=75
......@@ -120,8 +128,6 @@ fserverType=fserver
pserverName=pserver
pserverType=pserver
#========================userver============
redFileLibName=\u6587\u4E66\u6863\u6848
redFileColumn=\u516C\u5F00\u7C7B\u578B
......@@ -131,38 +137,31 @@ 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
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=192.168.31.151:9200,192.168.31.154:9200,192.168.31.157:9200
es.host=39.104.21.218
es.port=9200
es.http=http
es.user=es
es.password=Admin@123456
sserver.username=dagly
sserver.password=Admin@123456
indexFilterfield=COMPILATION
#========================================================
......@@ -175,8 +174,6 @@ loginpwd=Admin@123456
activemq.brokerIp=39.104.21.218
#=====================================================
#==============appraisal===================
#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
#==================================================
......@@ -195,7 +192,6 @@ barCodeHeight=10
barCodeWidth=70
#=========================================
#===================rserver================
#\u6682\u65E0\u7279\u6B8A\u914D\u7F6E
#====================
\ 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