Commit 4151e076 by 李传峰

调整配置引入,统一BaseConfig

parent 3bf32214
call mvn clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
@pause @pause
\ No newline at end of file
call mvn clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
@pause @pause
\ No newline at end of file
call mvn clean install -Denforcer.skip=true -Dmaven.test.skip=true -U call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
call pause call pause
\ No newline at end of file
call mvn clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U call mvn -Ptest clean source:jar deploy -Denforcer.skip=true -Dmaven.test.skip=true -U
@pause @pause
\ No newline at end of file
call mvn clean install -Denforcer.skip=true -Dmaven.test.skip=true -U call mvn -Ptest clean install -Denforcer.skip=true -Dmaven.test.skip=true -U
call pause call pause
\ No newline at end of file
package com.pcloud.common.config;
import com.alibaba.nacos.spring.context.annotation.config.EnableNacosConfig;
import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
@Configuration
@Order(Ordered.HIGHEST_PRECEDENCE)
@EnableNacosConfig
@NacosPropertySource(dataId = "boot.yml", first = true)
@NacosPropertySource(dataId = "universe-monitor.yml")
@NacosPropertySource(dataId = "rabbitmq.yml")
@NacosPropertySource(dataId = "redis.properties")
public class BaseConfig {
}
package com.pcloud.common.utils.cache.redis; package com.pcloud.common.utils.cache.redis;
import java.util.HashSet; import com.pcloud.common.utils.string.StringUtil;
import java.util.Set;
import java.util.regex.Pattern;
import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -13,13 +9,13 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -13,13 +9,13 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
import com.pcloud.common.utils.string.StringUtil;
import redis.clients.jedis.HostAndPort; import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.JedisCluster; import redis.clients.jedis.JedisCluster;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
/** /**
* *
* @描述:redis集群初始化 * @描述:redis集群初始化
...@@ -29,7 +25,6 @@ import redis.clients.jedis.JedisCluster; ...@@ -29,7 +25,6 @@ import redis.clients.jedis.JedisCluster;
*/ */
@Configuration @Configuration
@EnableCaching @EnableCaching
@NacosPropertySource(dataId = "redis.properties")
public class JedisClusterConfig { public class JedisClusterConfig {
/** /**
......
...@@ -9,6 +9,8 @@ import java.net.URLDecoder; ...@@ -9,6 +9,8 @@ import java.net.URLDecoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -16,6 +18,8 @@ import com.pcloud.common.exceptions.BizException; ...@@ -16,6 +18,8 @@ import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.utils.NumberUtil; import com.pcloud.common.utils.NumberUtil;
import com.pcloud.common.utils.string.StringUtil; import com.pcloud.common.utils.string.StringUtil;
import javax.servlet.http.HttpServletRequest;
/** /**
* @描述:cooike内容解析工具类 * @描述:cooike内容解析工具类
* @作者:songx * @作者:songx
...@@ -118,6 +122,21 @@ public class Cookie { ...@@ -118,6 +122,21 @@ public class Cookie {
public static final String USER_LABEL = "userLabel"; public static final String USER_LABEL = "userLabel";
public static final String COOKIE_USER_INFO = "userInfo";
public static String getCookieUserInfo(HttpServletRequest request) {
javax.servlet.http.Cookie[] cc = request.getCookies();
if (ArrayUtils.isEmpty(cc)) {
return StringUtil.EMPTY;
}
for (javax.servlet.http.Cookie c : cc) {
if (StringUtils.equalsIgnoreCase(c.getName(), COOKIE_USER_INFO)) {
return c.getValue();
}
}
return StringUtil.EMPTY;
}
/** /**
* cookie 信息處理 * cookie 信息處理
* @param userInfo * @param userInfo
......
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