From 1ef91b55923980f5f8a0fc21f71c8cc14306e427 Mon Sep 17 00:00:00 2001 From: renkaige Date: Tue, 9 Oct 2018 10:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E7=B1=BB=E9=85=8D=E7=BD=AE=E5=B0=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E5=88=B0redis=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++--- .../com/nis/web/service/restful/ConfigJedisServiceimpl.java | 2 +- .../resources/commonSources/applicationConfig-parser.xml | 1 + src/main/resources/jdbc.properties | 6 ++++-- src/main/resources/maatXml/applicationConfig-maatRedis.xml | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6eb02c3..10f28ba 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 war - galaxy - com.nis.springmvc - galaxy + galaxy-service + com.nis.galaxy + galaxy-service 0.0.1-SNAPSHOT diff --git a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java index 0d88606..be6fa1f 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java +++ b/src/main/java/com/nis/web/service/restful/ConfigJedisServiceimpl.java @@ -90,7 +90,7 @@ public class ConfigJedisServiceimpl implements ConfigRedisService { } StringBuffer valBF = new StringBuffer(); String[] valSplit = maatXmlExpr.getValueExpression().split(";"); - List urlList = new ArrayList(); +// List urlList = new ArrayList(); for (String valStr : valSplit) { if (!StringUtils.isEmpty(valStr) && valStr.trim().startsWith("[")) { valStr = valStr.trim().replace("[", "").replace("]", ""); diff --git a/src/main/resources/commonSources/applicationConfig-parser.xml b/src/main/resources/commonSources/applicationConfig-parser.xml index c2b5947..cda88fe 100644 --- a/src/main/resources/commonSources/applicationConfig-parser.xml +++ b/src/main/resources/commonSources/applicationConfig-parser.xml @@ -161,6 +161,7 @@ + diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index 21bf214..67984b0 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -77,7 +77,7 @@ jdbc.clickhouse.driver=ru.yandex.clickhouse.ClickHouseDriver #域名测试环境 #jdbc.clickhouse.url=jdbc:clickhouse://clickhouse.baifendian.com:80/k18_ods #亦庄演示环境 -jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods +jdbc.clickhouse.url=jdbc:clickhouse://10.3.45.5:8123/k18_ods?socket_timeout=90000 jdbc.clickhouse.username= jdbc.clickhouse.key= jdbc.clickhouse.password= @@ -123,7 +123,9 @@ druid.log.filters=stat ######################################################################### ##minio地址 ######################################################################### -##minio的地址,注意前面的http://不要忘记写 +##华严minio的地址,注意前面的http://不要忘记写 +#minio_url=http://192.168.10.61:9000 +##元辰鑫外网minio的地址,注意前面的http://不要忘记写 minio_url=http://192.168.10.205:9000 ##minio的accessKey minio_accessKey=minio diff --git a/src/main/resources/maatXml/applicationConfig-maatRedis.xml b/src/main/resources/maatXml/applicationConfig-maatRedis.xml index 54853f9..060d35c 100644 --- a/src/main/resources/maatXml/applicationConfig-maatRedis.xml +++ b/src/main/resources/maatXml/applicationConfig-maatRedis.xml @@ -159,7 +159,7 @@ EFFECTIVE_RULE;:;{un_maat_table_name};,;[cfg_id] - [cfg_id];\t;[service];\t;[file_desc];\t;[content_type];\t;[content_length];\t;[file_path];\t;[is_valid];\t;[op_time]; 0;\n + [cfg_id];\t;[service];\t;[file_desc];\t;[content_type];\t;[content_length];\t;[file_path];\t;[is_valid];\t;[redisFile_file_path];\t;[op_time]; 0;\n 1