Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart_gov_platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart_gov_platform
Commits
35ec20d0
Commit
35ec20d0
authored
Sep 23, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加返回http code 500错误
parent
eecfa776
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
420 deletions
+35
-420
base-manager/src/main/java/com/mortals/xhx/base/framework/config/ConverterConfig.java
...om/mortals/xhx/base/framework/config/ConverterConfig.java
+5
-0
base-manager/src/main/java/com/mortals/xhx/base/framework/config/FilterConfig.java
...a/com/mortals/xhx/base/framework/config/FilterConfig.java
+3
-2
base-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
...mortals/xhx/base/framework/exception/ExceptionHandle.java
+23
-1
base-manager/src/main/resources/bootstrap.yml
base-manager/src/main/resources/bootstrap.yml
+1
-0
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
...c/test/java/com/mortals/httpclient/app/AppController.http
+1
-1
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
...test/java/com/mortals/httpclient/site/SiteController.http
+1
-1
base-manager/src/test/java/com/mortals/httpclient/system/system.http
...r/src/test/java/com/mortals/httpclient/system/system.http
+1
-3
portal-manager/pom.xml.bak
portal-manager/pom.xml.bak
+0
-407
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java
...om/mortals/xhx/base/framework/filter/AccessLogFilter.java
+0
-5
No files found.
base-manager/src/main/java/com/mortals/xhx/base/framework/config/ConverterConfig.java
View file @
35ec20d0
package
com.mortals.xhx.base.framework.config
;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.mortals.xhx.base.framework.DateJacksonConverter
;
import
org.springframework.context.annotation.Bean
;
...
...
@@ -24,8 +25,12 @@ public class ConverterConfig {
@Bean
public
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
(
ObjectMapper
objectMapper
)
{
objectMapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
true
);
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
=
new
MappingJackson2HttpMessageConverter
();
mappingJackson2HttpMessageConverter
.
setObjectMapper
(
objectMapper
);
return
mappingJackson2HttpMessageConverter
;
}
}
base-manager/src/main/java/com/mortals/xhx/base/framework/config/FilterConfig.java
View file @
35ec20d0
package
com.mortals.xhx.base.framework.config
;
import
com.mortals.framework.filter.RepeatableFilter
;
import
com.mortals.framework.filter.XssFilter
;
import
com.mortals.framework.util.StringUtils
;
import
com.mortals.xhx.base.framework.filter.RepeatReadHttpRequest
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
...
...
@@ -21,6 +21,7 @@ import java.util.Map;
* @author zxfei
*/
@Configuration
@Slf4j
public
class
FilterConfig
{
@Value
(
"${xss.enabled}"
)
private
String
enabled
;
...
...
@@ -60,7 +61,6 @@ public class FilterConfig {
public
static
class
RequestReplaceFilter
implements
Filter
{
@Override
public
void
init
(
javax
.
servlet
.
FilterConfig
filterConfig
)
throws
ServletException
{
}
@Override
...
...
@@ -70,6 +70,7 @@ public class FilterConfig {
@Override
public
void
doFilter
(
ServletRequest
servletRequest
,
ServletResponse
servletResponse
,
FilterChain
filterChain
)
throws
IOException
,
ServletException
{
log
.
info
(
"RequestReplaceFilter~~~~~~~~~~~~~~~~~"
);
filterChain
.
doFilter
(
new
RepeatReadHttpRequest
((
HttpServletRequest
)
servletRequest
),
servletResponse
);
}
}
...
...
base-manager/src/main/java/com/mortals/xhx/base/framework/exception/ExceptionHandle.java
View file @
35ec20d0
package
com.mortals.xhx.base.framework.exception
;
import
cn.hutool.core.util.StrUtil
;
import
cn.hutool.http.HttpStatus
;
import
lombok.extern.slf4j.Slf4j
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.converter.HttpMessageNotReadableException
;
import
org.springframework.web.bind.annotation.ControllerAdvice
;
import
org.springframework.web.bind.annotation.ExceptionHandler
;
import
org.springframework.web.bind.annotation.ResponseBody
;
...
...
@@ -10,6 +14,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.exception.AppException
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
/**
* 统一异常处理
*/
...
...
@@ -17,6 +24,12 @@ import com.mortals.framework.exception.AppException;
@Slf4j
public
class
ExceptionHandle
{
@Autowired
private
HttpServletRequest
request
;
@Autowired
private
HttpServletResponse
response
;
public
static
final
String
KEY_RESULT_CODE
=
"code"
;
public
static
final
String
KEY_RESULT_MSG
=
"msg"
;
public
static
final
String
KEY_RESULT_DATA
=
"data"
;
...
...
@@ -25,6 +38,9 @@ public class ExceptionHandle {
@ExceptionHandler
(
value
=
Exception
.
class
)
@ResponseBody
public
String
handle
(
Exception
e
)
{
log
.
info
(
"[request url]========{}"
,
request
.
getRequestURL
());
response
.
getStatus
();
JSONObject
ret
=
new
JSONObject
();
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
if
(
e
instanceof
AppException
)
{
...
...
@@ -33,9 +49,15 @@ public class ExceptionHandle {
stack
.
getClassName
(),
stack
.
getMethodName
(),
stack
.
getLineNumber
(),
e
.
getClass
().
getName
());
AppException
ex
=
(
AppException
)
e
;
ret
.
put
(
KEY_RESULT_MSG
,
ex
.
getMessage
());
}
if
(
e
instanceof
HttpMessageNotReadableException
)
{
log
.
error
(
"[system error]"
,
e
);
response
.
setStatus
(
HttpStatus
.
HTTP_BAD_REQUEST
);
ret
.
put
(
KEY_RESULT_MSG
,
"参数错误,"
+
StrUtil
.
subBefore
(
e
.
getMessage
(),
";"
,
false
));
}
else
{
log
.
error
(
"[system error]"
,
e
);
ret
.
put
(
KEY_RESULT_MSG
,
"未知错误!"
);
response
.
setStatus
(
HttpStatus
.
HTTP_INTERNAL_ERROR
);
ret
.
put
(
KEY_RESULT_MSG
,
"未知错误!"
+
e
.
getMessage
());
}
return
ret
.
toJSONString
();
}
...
...
base-manager/src/main/resources/bootstrap.yml
View file @
35ec20d0
...
...
@@ -13,6 +13,7 @@ spring:
jackson
:
serialization
:
WRITE_DATES_AS_TIMESTAMPS
:
true
fail_on_empty_beans
:
true
default-property-inclusion
:
NON_NULL
# time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss
...
...
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @
35ec20d0
...
...
@@ -26,7 +26,7 @@ Content-Type: application/json
{
"siteId": 1,
"appTypeNotList": [4],
"page": 1,
"page": 1
23123123213123212312231231231
,
"size": -1
}
###自助终端应用列表
...
...
base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http
View file @
35ec20d0
...
...
@@ -158,4 +158,4 @@ Content-Type: application/json
POST {{baseUrl}}/site/getSitesGroupByAreaLevel
Content-Type: application/json
{"areaLevel":3}
{"areaLevel":3
,"siteName": "%翠屏区%"
}
base-manager/src/test/java/com/mortals/httpclient/system/system.http
View file @
35ec20d0
...
...
@@ -208,13 +208,11 @@ Content-Type: application/x-www-form-urlencoded
businessid=125&matter=125&devicenum=C0-FB-F9-CD-3B-5D&peopleid=13
### 参数列表组合查询
POST {{baseUrl}}/param/list
POST {{baseUrl}}/param/
inter
list
Content-Type: application/json
{
"page":1,
"size": -1,
"firstOrganize": "Window",
"secondOrganize": "hongqi"
}
...
...
portal-manager/pom.xml.bak
deleted
100644 → 0
View file @
eecfa776
This diff is collapsed.
Click to expand it.
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AccessLogFilter.java
View file @
35ec20d0
...
...
@@ -181,7 +181,6 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
}
private
void
writeAccessLog
(
AccessLogPdu
accessLogPdu
)
{
// log.info("accessLog:{}",JSON.toJSONString(accessLogPdu));
messageProducer
.
syncAccessSend
(
accessLogPdu
);
}
...
...
@@ -211,8 +210,6 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
if
(
contentLength
>
0
)
{
httpHeaders
.
setContentLength
(
contentLength
);
}
else
{
// TODO: this causes a 'HTTP/1.1 411 Length Required' // on
// httpbin.org
httpHeaders
.
set
(
HttpHeaders
.
TRANSFER_ENCODING
,
"chunked"
);
}
return
httpHeaders
;
...
...
@@ -220,8 +217,6 @@ public class AccessLogFilter implements GlobalFilter, Ordered {
@Override
public
Flux
<
DataBuffer
>
getBody
()
{
// log.info("outputMessage.getBody() contentLength:");
return
outputMessage
.
getBody
();
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment