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 = "";