gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将fdfs的路径提取到配置文件中

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-07-18 10:26:42 +08:00
parent bdc807f8cb
commit 76877a0625
7 changed files with 14 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/util/Configurations.java
View File

@@ -2,7 +2,6 @@ package com.nis.util;
import java.io.File;
import java.util.Map;
import java.util.Properties;
import com.nis.util.StringUtil;
@@ -16,6 +15,7 @@ public final class Configurations {
prop.load(Configurations.class.getResourceAsStream("/applicationLog-hive.properties"));
prop.load(Configurations.class.getResourceAsStream("/applicationConfig-maatOracle.properties"));
prop.load(Configurations.class.getResourceAsStream("/applicationConfig-rule.properties"));
prop.load(Configurations.class.getResourceAsStream("/fastdfs-client.properties"));
} catch (Exception e) {
prop = null;

6
src/main/java/com/nis/util/JedisUtils.java
View File

@@ -1,15 +1,11 @@
package com.nis.util;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.nis.web.service.SpringContextHolder;
import redis.clients.jedis.Jedis;
@@ -18,7 +14,6 @@ import redis.clients.jedis.exceptions.JedisException;
public class JedisUtils {
private static Logger logger = LoggerFactory.getLogger(JedisUtils.class);
private static JedisPool jedisPool = SpringContextHolder.getBean(JedisPool.class);
/**
@@ -31,7 +26,6 @@ public class JedisUtils {
Jedis jedis = null;
try {
jedis = getResource(redisDb);
if (jedis.exists(key)) {
value = jedis.get(key);
value = StringUtils.isNotBlank(value) && !"nil".equalsIgnoreCase(value) ? value : null;

1422
src/main/java/com/nis/util/JedisUtils2.java
View File

File diff suppressed because it is too large Load Diff

6
src/main/java/com/nis/web/service/fdfs/FileManagerConfig.java
View File

@@ -2,6 +2,8 @@ package com.nis.web.service.fdfs;
import java.io.Serializable;
import com.nis.util.Configurations;
/**
* <p>Title: FileManagerConfig.java</p>
* <p>Description: </p>
@@ -21,7 +23,9 @@ public class FileManagerConfig implements Serializable {
public static final String SEPARATOR = "/";
// fdfs-tracker-nginx服务器
public static final String TRACKER_NGNIX_ADDR = "10.0.6.249";
public static final String TRACKER_NGNIX_ADDR = Configurations.getStringProperty("fastDfsHttpAddr",
"192.168.10.205");
// public static final String TRACKER_NGNIX_ADDR = "10.0.6.249";
public static final String TRACKER_NGNIX_PORT = "";

4
src/main/resources/fastdfs-client.properties
View File

@@ -12,3 +12,7 @@ fastdfs.http_tracker_http_port = 80
#fastdfs.tracker_servers = 10.0.11.201:22122,10.0.11.202:22122,10.0.11.203:22122
#fastdfs.tracker_servers = 10.0.6.192:22122
fastdfs.tracker_servers = 10.0.6.249:22122
#fastdfs.tracker_servers = 192.168.10.205:22122
fastDfsHttpAddr= 10.0.6.249
#fastDfsHttpAddr=192.168.10.205

1
src/main/resources/fdfs_client.conf
View File

@@ -6,5 +6,6 @@ http.anti_steal_token = no
http.secret_key = FastDFS1234567890
tracker_server = 10.0.6.249:22122
#tracker_server = 192.168.10.204:22122
#tracker_server = 10.0.11.248:22122
#tracker_server = 10.0.11.249:22122

4
src/main/resources/jdbc.properties
View File

@@ -2,6 +2,7 @@
#jdbc.driver=oracle.jdbc.driver.OracleDriver
jdbc.devlop.driver=com.mysql.jdbc.Driver
jdbc.devlop.url=jdbc:mysql://10.0.6.100:3306/web_frame?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
#jdbc.devlop.url=jdbc:mysql://192.168.10.204:3306/web_frame?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
jdbc.devlop.username=dfh
jdbc.devlop.key=xLtQB+Bp6joOYrVIfBdrRA==
jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg==
@@ -9,6 +10,7 @@ jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg==
#==========日志库 Mysql=======================
jdbc.log.driver=com.mysql.jdbc.Driver
jdbc.log.url=jdbc:mysql://10.0.6.249:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
#jdbc.log.url=jdbc:mysql://192.168.10.204:3306/galaxy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
jdbc.log.username=root
jdbc.log.key=9Pjh5K20Sho0lnWMClUXYA==
jdbc.log.password=D3ptWYX8vx/GoEXaSrJycQ==
@@ -60,8 +62,8 @@ bonecp.hive.statementsCacheSize=100
#####################################################################################################################################
##redis连接
#####################################################################################################################################
#redis.host=10.0.6.228
redis.host=10.0.6.249
#redis.host=192.168.10.205
redis.port=6379
redis.pass=
redis.maxIdle=5