Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-clickhouse
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
提交
打开侧边栏
com.pica.cloud.clickhouse
pica-cloud-clickhouse
提交
bb90980b
提交
bb90980b
编写于
12月 23, 2019
作者:
hujun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
upgrade redis client to 1.3.2 version
上级
aa21050c
变更
6
隐藏空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
24 行增加
和
85 行删除
+24
-85
pom.xml
server/pom.xml
+19
-2
PropertiesConfiguration.java
...ckhouse/server/configuration/PropertiesConfiguration.java
+0
-39
RedisClientConfiguration.java
...khouse/server/configuration/RedisClientConfiguration.java
+0
-23
SpringContextAware.java
...e/clickhouse/server/configuration/SpringContextAware.java
+0
-20
bootstrap-dev.properties
server/src/main/resources/bootstrap-dev.properties
+4
-0
bootstrap.properties
server/src/main/resources/bootstrap.properties
+1
-1
未找到文件。
server/pom.xml
浏览文件 @
bb90980b
...
@@ -88,13 +88,13 @@
...
@@ -88,13 +88,13 @@
<dependency>
<dependency>
<groupId>
com.pica.cloud.foundation
</groupId>
<groupId>
com.pica.cloud.foundation
</groupId>
<artifactId>
pica-cloud-entity
</artifactId>
<artifactId>
pica-cloud-entity
</artifactId>
<version>
1.
2.0
</version>
<version>
1.
3.2
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.pica.cloud.foundation
</groupId>
<groupId>
com.pica.cloud.foundation
</groupId>
<artifactId>
pica-cloud-redis
</artifactId>
<artifactId>
pica-cloud-redis
</artifactId>
<version>
1.
2.2-SNAPSHOT
</version>
<version>
1.
3.2
</version>
</dependency>
</dependency>
<dependency>
<dependency>
...
@@ -133,14 +133,31 @@
...
@@ -133,14 +133,31 @@
<groupId>
com.pica.cloud.foundation
</groupId>
<groupId>
com.pica.cloud.foundation
</groupId>
<artifactId>
pica-cloud-clickhouse-spring-boot-starter
</artifactId>
<artifactId>
pica-cloud-clickhouse-spring-boot-starter
</artifactId>
<version>
1.0.0-SNAPSHOT
</version>
<version>
1.0.0-SNAPSHOT
</version>
<exclusions>
<exclusion>
<artifactId>
pica-cloud-entity
</artifactId>
<groupId>
com.pica.cloud.foundation
</groupId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.pica.cloud.clickhouse
</groupId>
<groupId>
com.pica.cloud.clickhouse
</groupId>
<artifactId>
pica-cloud-clickhouse-common
</artifactId>
<artifactId>
pica-cloud-clickhouse-common
</artifactId>
<version>
1.0.0-SNAPSHOT
</version>
<version>
1.0.0-SNAPSHOT
</version>
<exclusions>
<exclusion>
<artifactId>
pica-cloud-utils
</artifactId>
<groupId>
com.pica.cloud.foundation
</groupId>
</exclusion>
</exclusions>
</dependency>
</dependency>
<dependency>
<groupId>
com.pica.cloud.foundation
</groupId>
<artifactId>
pica-cloud-utils
</artifactId>
<version>
1.3.2-OLD
</version>
</dependency>
</dependencies>
</dependencies>
<dependencyManagement>
<dependencyManagement>
...
...
server/src/main/java/com/pica/cloud/clickhouse/clickhouse/server/configuration/PropertiesConfiguration.java
已删除
100644 → 0
浏览文件 @
aa21050c
package
com
.
pica
.
cloud
.
clickhouse
.
clickhouse
.
server
.
configuration
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.cloud.context.config.annotation.RefreshScope
;
import
org.springframework.context.annotation.Configuration
;
@Configuration
@RefreshScope
public
class
PropertiesConfiguration
{
@Value
(
"${app.foundation.token.user.expire}"
)
private
String
userExpire
;
@Value
(
"${app.foundation.token.guest.expire}"
)
private
String
guestExpire
;
public
String
getUserExpire
()
{
return
userExpire
;
}
public
void
setUserExpire
(
String
userExpire
)
{
this
.
userExpire
=
userExpire
;
}
public
String
getGuestExpire
()
{
return
guestExpire
;
}
public
void
setGuestExpire
(
String
guestExpire
)
{
this
.
guestExpire
=
guestExpire
;
}
@Override
public
String
toString
()
{
return
"PropertiesConfiguration{"
+
"userExpire='"
+
userExpire
+
'\''
+
", guestExpire='"
+
guestExpire
+
'\''
+
'}'
;
}
}
server/src/main/java/com/pica/cloud/clickhouse/clickhouse/server/configuration/RedisClientConfiguration.java
已删除
100644 → 0
浏览文件 @
aa21050c
package
com
.
pica
.
cloud
.
clickhouse
.
clickhouse
.
server
.
configuration
;
import
com.pica.cloud.foundation.redis.CacheMigrateClient
;
import
com.pica.cloud.foundation.redis.ICacheClient
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.context.config.annotation.RefreshScope
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
@Configuration
@RefreshScope
public
class
RedisClientConfiguration
{
@Autowired
private
SpringContextAware
springContextAware
;
@Bean
@ConditionalOnMissingBean
public
ICacheClient
cacheClient
()
{
return
new
CacheMigrateClient
(
springContextAware
.
getActiveProfile
());
}
}
server/src/main/java/com/pica/cloud/clickhouse/clickhouse/server/configuration/SpringContextAware.java
已删除
100644 → 0
浏览文件 @
aa21050c
package
com
.
pica
.
cloud
.
clickhouse
.
clickhouse
.
server
.
configuration
;
import
org.springframework.beans.BeansException
;
import
org.springframework.context.ApplicationContext
;
import
org.springframework.context.ApplicationContextAware
;
import
org.springframework.stereotype.Component
;
@Component
public
class
SpringContextAware
implements
ApplicationContextAware
{
private
ApplicationContext
context
=
null
;
@Override
public
void
setApplicationContext
(
ApplicationContext
applicationContext
)
throws
BeansException
{
this
.
context
=
applicationContext
;
}
public
String
getActiveProfile
()
{
return
context
.
getEnvironment
().
getActiveProfiles
()[
0
];
}
}
server/src/main/resources/bootstrap-dev.properties
浏览文件 @
bb90980b
...
@@ -31,3 +31,7 @@ spring.zipkin.base-url=http://192.168.110.124:7895
...
@@ -31,3 +31,7 @@ spring.zipkin.base-url=http://192.168.110.124:7895
spring.sleuth.sampler.percentage
=
1.0
spring.sleuth.sampler.percentage
=
1.0
logging.config
=
classpath:log4j2-dev.xml
logging.config
=
classpath:log4j2-dev.xml
management.security.enabled
=
false
management.endpoints.web.exposure.include
=
*
management.endpoints.jmx.exposure.include
=
*
server/src/main/resources/bootstrap.properties
浏览文件 @
bb90980b
spring.profiles.active
=
dev
spring.profiles.active
=
test1
server.context-path
=
/clickhouse
server.context-path
=
/clickhouse
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录