Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
程序猿小郑
microservices-platform
提交
c3584a31
microservices-platform
项目概览
程序猿小郑
/
microservices-platform
与 Fork 源项目一致
Fork自
zlt2000 / microservices-platform
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
microservices-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c3584a31
编写于
7月 11, 2020
作者:
zlt2000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级spring-cloud到H版本
上级
39cbcd2a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
pom.xml
pom.xml
+4
-4
zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
...java/com/central/admin/service/impl/IndexServiceImpl.java
+1
-1
zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java
...va/com/central/sentinel/config/SentinelAutoConfigure.java
+3
-3
zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java
...m/central/gateway/error/JsonErrorWebExceptionHandler.java
+2
-2
未找到文件。
pom.xml
浏览文件 @
c3584a31
...
...
@@ -13,9 +13,9 @@
<maven.compiler.target>
1.8
</maven.compiler.target>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<java.version>
8
</java.version>
<spring-cloud-alibaba-dependencies.version>
2.
1.2
.RELEASE
</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>
2.
1.14
.RELEASE
</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>
Greenwich
.SR6
</spring-cloud-dependencies.version>
<spring-cloud-alibaba-dependencies.version>
2.
2.1
.RELEASE
</spring-cloud-alibaba-dependencies.version>
<spring-boot-dependencies.version>
2.
2.8
.RELEASE
</spring-boot-dependencies.version>
<spring-cloud-dependencies.version>
Hoxton
.SR6
</spring-cloud-dependencies.version>
<commons-collections4.version>
4.4
</commons-collections4.version>
<fastjson.version>
1.2.70
</fastjson.version>
<swagger.version>
2.9.2
</swagger.version>
...
...
@@ -36,7 +36,7 @@
<qiniu-java-sdk>
7.2.28
</qiniu-java-sdk>
<easypoi.version>
4.1.3
</easypoi.version>
<poi.version>
4.1.1
</poi.version>
<spring-boot-admin.version>
2.
1.6
</spring-boot-admin.version>
<spring-boot-admin.version>
2.
2.3
</spring-boot-admin.version>
<velocity.version>
1.7
</velocity.version>
<commons-configuration2.version>
2.7
</commons-configuration2.version>
<txlcn.version>
5.0.2.RELEASE
</txlcn.version>
...
...
zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
浏览文件 @
c3584a31
...
...
@@ -81,7 +81,7 @@ public class IndexServiceImpl implements IIndexService {
List
<
Map
<
String
,
String
>>
listOfIndicesFromEs
=
null
;
if
(
response
!=
null
)
{
String
rawBody
=
EntityUtils
.
toString
(
response
.
getEntity
());
TypeReference
<
List
<
HashMap
<
String
,
String
>>>
typeRef
=
new
TypeReference
<
List
<
Hash
Map
<
String
,
String
>>>()
{};
TypeReference
<
List
<
Map
<
String
,
String
>>>
typeRef
=
new
TypeReference
<
List
<
Map
<
String
,
String
>>>()
{};
listOfIndicesFromEs
=
mapper
.
readValue
(
rawBody
,
typeRef
);
}
return
PageResult
.<
Map
<
String
,
String
>>
builder
().
data
(
listOfIndicesFromEs
).
code
(
0
).
build
();
...
...
zlt-commons/zlt-sentinel-spring-boot-starter/src/main/java/com/central/sentinel/config/SentinelAutoConfigure.java
浏览文件 @
c3584a31
...
...
@@ -31,7 +31,7 @@ public class SentinelAutoConfigure {
@ConditionalOnClass
(
HttpServletRequest
.
class
)
public
static
class
WebmvcHandler
{
@Bean
public
BlockExceptionHandler
b
lockExceptionHandler
()
{
public
BlockExceptionHandler
webmvcB
lockExceptionHandler
()
{
return
(
request
,
response
,
e
)
->
{
response
.
setStatus
(
429
);
Result
result
=
Result
.
failed
(
e
.
getMessage
());
...
...
@@ -48,11 +48,11 @@ public class SentinelAutoConfigure {
@ConditionalOnClass
(
ServerResponse
.
class
)
public
static
class
WebfluxHandler
{
@Bean
public
BlockRequestHandler
blockRequest
Handler
()
{
public
BlockRequestHandler
webfluxBlockException
Handler
()
{
return
(
exchange
,
t
)
->
ServerResponse
.
status
(
HttpStatus
.
TOO_MANY_REQUESTS
)
.
contentType
(
MediaType
.
APPLICATION_JSON
)
.
body
(
BodyInserters
.
from
Object
(
Result
.
failed
(
t
.
getMessage
())));
.
body
(
BodyInserters
.
from
Value
(
Result
.
failed
(
t
.
getMessage
())));
}
}
}
zlt-gateway/sc-gateway/src/main/java/com/central/gateway/error/JsonErrorWebExceptionHandler.java
浏览文件 @
c3584a31
...
...
@@ -49,8 +49,8 @@ public class JsonErrorWebExceptionHandler extends DefaultErrorWebExceptionHandle
* @param errorAttributes
*/
@Override
protected
HttpStatus
getHttpStatus
(
Map
<
String
,
Object
>
errorAttributes
)
{
return
HttpStatus
.
INTERNAL_SERVER_ERROR
;
protected
int
getHttpStatus
(
Map
<
String
,
Object
>
errorAttributes
)
{
return
HttpStatus
.
INTERNAL_SERVER_ERROR
.
value
()
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录