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
3f3c6e32
Commit
3f3c6e32
authored
Sep 25, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交配置校验
parent
c43898ba
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
17 deletions
+16
-17
base-manager/pom.xml
base-manager/pom.xml
+5
-16
base-manager/src/main/java/com/mortals/xhx/base/framework/config/ConverterConfig.java
...om/mortals/xhx/base/framework/config/ConverterConfig.java
+10
-1
base-manager/src/main/resources/bootstrap.yml
base-manager/src/main/resources/bootstrap.yml
+1
-0
No files found.
base-manager/pom.xml
View file @
3f3c6e32
...
@@ -24,6 +24,9 @@
...
@@ -24,6 +24,9 @@
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.req.json.check>
false
</profiles.req.json.check>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
<profiles>
<profiles>
...
@@ -44,10 +47,8 @@
...
@@ -44,10 +47,8 @@
<properties>
<properties>
<profiles.active>
test
</profiles.active>
<profiles.active>
test
</profiles.active>
<profiles.server.debug>
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5513
</profiles.server.debug>
<profiles.server.debug>
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5513
</profiles.server.debug>
<profiles.log.path>
/home/mortals/app/logs
</profiles.log.path>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.0.252:8848
</profiles.nacos.server-addr>
<package.environment>
test
</package.environment>
<profiles.req.json.check>
true
</profiles.req.json.check>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -56,8 +57,6 @@
...
@@ -56,8 +57,6 @@
<properties>
<properties>
<profiles.active>
product
</profiles.active>
<profiles.active>
product
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -67,7 +66,6 @@
...
@@ -67,7 +66,6 @@
<profiles.active>
yibin
</profiles.active>
<profiles.active>
yibin
</profiles.active>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.15.28.120:8848
</profiles.nacos.server-addr>
<package.environment>
yibin
</package.environment>
<package.environment>
yibin
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -77,7 +75,6 @@
...
@@ -77,7 +75,6 @@
<profiles.active>
regtest
</profiles.active>
<profiles.active>
regtest
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -86,7 +83,6 @@
...
@@ -86,7 +83,6 @@
<properties>
<properties>
<profiles.active>
qiling
</profiles.active>
<profiles.active>
qiling
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -95,8 +91,6 @@
...
@@ -95,8 +91,6 @@
<properties>
<properties>
<profiles.active>
reg
</profiles.active>
<profiles.active>
reg
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -105,8 +99,7 @@
...
@@ -105,8 +99,7 @@
<properties>
<properties>
<profiles.active>
yanyuan
</profiles.active>
<profiles.active>
yanyuan
</profiles.active>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
172.16.30.245:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<profiles.req.json.check>
true
</profiles.req.json.check>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -115,8 +108,6 @@
...
@@ -115,8 +108,6 @@
<properties>
<properties>
<profiles.active>
pengxi
</profiles.active>
<profiles.active>
pengxi
</profiles.active>
<profiles.nacos.server-addr>
192.168.106.6:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
192.168.106.6:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
@@ -125,8 +116,6 @@
...
@@ -125,8 +116,6 @@
<properties>
<properties>
<profiles.active>
bzjkq
</profiles.active>
<profiles.active>
bzjkq
</profiles.active>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<package.environment>
build
</package.environment>
<skipUi>
true
</skipUi>
</properties>
</properties>
</profile>
</profile>
...
...
base-manager/src/main/java/com/mortals/xhx/base/framework/config/ConverterConfig.java
View file @
3f3c6e32
...
@@ -4,6 +4,7 @@ package com.mortals.xhx.base.framework.config;
...
@@ -4,6 +4,7 @@ package com.mortals.xhx.base.framework.config;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.DeserializationFeature
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.mortals.xhx.base.framework.DateJacksonConverter
;
import
com.mortals.xhx.base.framework.DateJacksonConverter
;
import
org.springframework.beans.factory.annotation.Value
;
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.http.converter.json.Jackson2ObjectMapperFactoryBean
;
import
org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean
;
...
@@ -11,6 +12,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
...
@@ -11,6 +12,10 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert
@Configuration
@Configuration
public
class
ConverterConfig
{
public
class
ConverterConfig
{
@Value
(
"${jsonCheck:false}"
)
private
Boolean
jsonCheck
;
@Bean
@Bean
public
DateJacksonConverter
dateJacksonConverter
()
{
public
DateJacksonConverter
dateJacksonConverter
()
{
return
new
DateJacksonConverter
();
return
new
DateJacksonConverter
();
...
@@ -25,7 +30,11 @@ public class ConverterConfig {
...
@@ -25,7 +30,11 @@ public class ConverterConfig {
@Bean
@Bean
public
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
(
ObjectMapper
objectMapper
)
{
public
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
(
ObjectMapper
objectMapper
)
{
if
(
jsonCheck
!=
null
&&
jsonCheck
){
objectMapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
true
);
objectMapper
.
configure
(
DeserializationFeature
.
FAIL_ON_UNKNOWN_PROPERTIES
,
true
);
}
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
=
new
MappingJackson2HttpMessageConverter
();
MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter
=
new
MappingJackson2HttpMessageConverter
();
mappingJackson2HttpMessageConverter
.
setObjectMapper
(
objectMapper
);
mappingJackson2HttpMessageConverter
.
setObjectMapper
(
objectMapper
);
...
...
base-manager/src/main/resources/bootstrap.yml
View file @
3f3c6e32
...
@@ -48,3 +48,4 @@ application:
...
@@ -48,3 +48,4 @@ application:
uncheckUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/padsign/*,/terminal/*,/resource/list,/api/asset/*,/api/*,/flow/*,/uploads/*,/project/file/*,/file/*,/assessment/*
uncheckUrl
:
/refresh,/error,/login/login,/login/index,/login/logout,/securitycode/createCode,/file/common/*,/test*,/padsign/*,/terminal/*,/resource/list,/api/asset/*,/api/*,/flow/*,/uploads/*,/project/file/*,/file/*,/assessment/*
dm
:
dm
:
enable
:
true
enable
:
true
jsonCheck
:
@
profiles.req.json.check@
\ No newline at end of file
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