Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
P
pica-cloud-analysis
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
Close sidebar
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
com.pica.cloud.online.exam
pica-cloud-analysis
提交
fcda4dad
提交
fcda4dad
编写于
4月 24, 2019
作者:
minghao.wu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: remove hystrix
上级
b3ceb58c
流水线
#8250
已通过 于阶段
in 10 second
变更
7
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
44 行增加
和
19 行删除
+44
-19
pom.xml
server/pom.xml
+4
-4
App.java
.../java/com/pica/cloud/online/exam/analysis/server/App.java
+1
-1
bootstrap-dev.properties
server/src/main/resources/bootstrap-dev.properties
+6
-1
bootstrap-prod.properties
server/src/main/resources/bootstrap-prod.properties
+9
-4
bootstrap-test1.properties
server/src/main/resources/bootstrap-test1.properties
+8
-3
bootstrap-test2.properties
server/src/main/resources/bootstrap-test2.properties
+8
-3
bootstrap-uat.properties
server/src/main/resources/bootstrap-uat.properties
+8
-3
未找到文件。
server/pom.xml
浏览文件 @
fcda4dad
...
...
@@ -62,10 +62,10 @@
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-feign
</artifactId>
</dependency>
<
dependency
>
<
groupId>
org.springframework.cloud
</groupId
>
<
artifactId>
spring-cloud-starter-hystrix
</artifactId
>
<
/dependency
>
<
!--<dependency>--
>
<
!--<groupId>org.springframework.cloud</groupId>--
>
<
!--<artifactId>spring-cloud-starter-hystrix</artifactId>--
>
<
!--</dependency>--
>
<dependency>
<groupId>
org.springframework.boot
</groupId>
...
...
server/src/main/java/com/pica/cloud/online/exam/analysis/server/App.java
浏览文件 @
fcda4dad
...
...
@@ -8,7 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import
org.springframework.cloud.netflix.feign.EnableFeignClients
;
import
springfox.documentation.swagger2.annotations.EnableSwagger2
;
@EnableCircuitBreaker
//
@EnableCircuitBreaker
@SpringBootApplication
(
scanBasePackages
=
"com.pica.cloud"
)
@EnableDiscoveryClient
@EnableSwagger2
...
...
server/src/main/resources/bootstrap-dev.properties
浏览文件 @
fcda4dad
...
...
@@ -25,9 +25,14 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password
=
AqLfvyWOvLQEUzdI
#local settings
feign.hystrix.enabled
=
true
#
feign.hystrix.enabled=true
management.security.enabled
=
false
ribbon.ReadTimeout
=
300000
ribbon.SocketTimeout
=
300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout
=
30000
#spring.zipkin.base-url=http://192.168.110.124:7895
#spring.sleuth.sampler.percentage=1.0
...
...
server/src/main/resources/bootstrap-prod.properties
浏览文件 @
fcda4dad
...
...
@@ -24,11 +24,16 @@ spring.rabbitmq.port=5672
spring.rabbitmq.username
=
appuser
spring.rabbitmq.password
=
AqLfvyWOvLQEUzdI
#local setting
feign.hystrix.enabled
=
true
#local setting
s
#
feign.hystrix.enabled=true
management.security.enabled
=
true
spring.zipkin.base-url
=
http://172.19.137.19:7895
spring.sleuth.sampler.percentage
=
1.0
ribbon.ReadTimeout
=
300000
ribbon.SocketTimeout
=
300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout
=
30000
#spring.zipkin.base-url=http://172.19.137.19:7895
#spring.sleuth.sampler.percentage=1.0
logging.config
=
classpath:log4j2-prod.xml
\ No newline at end of file
server/src/main/resources/bootstrap-test1.properties
浏览文件 @
fcda4dad
...
...
@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password
=
AqLfvyWOvLQEUzdI
#local settings
feign.hystrix.enabled
=
true
#
feign.hystrix.enabled=true
management.security.enabled
=
false
spring.zipkin.base-url
=
http://192.168.110.133:7895
spring.sleuth.sampler.percentage
=
1.0
ribbon.ReadTimeout
=
300000
ribbon.SocketTimeout
=
300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout
=
30000
#spring.zipkin.base-url=http://192.168.110.133:7895
#spring.sleuth.sampler.percentage=1.0
logging.config
=
classpath:log4j2-test1.xml
\ No newline at end of file
server/src/main/resources/bootstrap-test2.properties
浏览文件 @
fcda4dad
...
...
@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser
spring.rabbitmq.password
=
AqLfvyWOvLQEUzdI
#local settings
feign.hystrix.enabled
=
true
#
feign.hystrix.enabled=true
management.security.enabled
=
false
spring.zipkin.base-url
=
http://192.168.110.133:7895
spring.sleuth.sampler.percentage
=
1.0
ribbon.ReadTimeout
=
300000
ribbon.SocketTimeout
=
300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout
=
30000
#spring.zipkin.base-url=http://192.168.110.133:7895
#spring.sleuth.sampler.percentage=1.0
logging.config
=
classpath:log4j2-test1.xml
\ No newline at end of file
server/src/main/resources/bootstrap-uat.properties
浏览文件 @
fcda4dad
...
...
@@ -25,10 +25,15 @@ spring.rabbitmq.username=picacloud
spring.rabbitmq.password
=
123456
#local settings
feign.hystrix.enabled
=
true
#
feign.hystrix.enabled=true
management.security.enabled
=
false
spring.zipkin.base-url
=
http://192.168.110.141:7895
spring.sleuth.sampler.percentage
=
1.0
ribbon.ReadTimeout
=
300000
ribbon.SocketTimeout
=
300000
#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
ribbon.ConnectTimeout
=
30000
#spring.zipkin.base-url=http://192.168.110.141:7895
#spring.sleuth.sampler.percentage=1.0
logging.config
=
classpath:log4j2-uat.xml
\ No newline at end of file
写
预览
Markdown
格式
0%
请重试
or
附加一个文件
附加文件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录