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
ceb304d6
Commit
ceb304d6
authored
Oct 21, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交配置校验
parent
b035c181
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
8 deletions
+7
-8
base-manager/src/main/java/com/mortals/xhx/common/utils/AreaMatchCodeUtil.java
.../java/com/mortals/xhx/common/utils/AreaMatchCodeUtil.java
+2
-2
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
...nager/src/main/resources/config/mybatis-sqlmap-config.xml
+1
-1
base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http
.../java/com/mortals/httpclient/base/BaseAreaController.http
+1
-1
portal-manager/src/main/java/com/mortals/xhx/base/framework/config/CorsConfig.java
...ava/com/mortals/xhx/base/framework/config/CorsConfig.java
+3
-4
No files found.
base-manager/src/main/java/com/mortals/xhx/common/utils/AreaMatchCodeUtil.java
View file @
ceb304d6
...
...
@@ -20,8 +20,8 @@ public class AreaMatchCodeUtil {
if
(
AreaLevelEnum
.
地市州
.
getValue
()
==
areaLevel
)
{
matchCode
=
StrUtil
.
sub
(
matchCode
,
0
,
3
);
return
StrUtil
.
padAfter
(
matchCode
,
3
,
"0"
);
matchCode
=
StrUtil
.
sub
(
matchCode
,
0
,
4
);
return
StrUtil
.
padAfter
(
matchCode
,
4
,
"0"
);
}
else
if
(
AreaLevelEnum
.
区县
.
getValue
()
==
areaLevel
)
{
//510921174000
matchCode
=
StrUtil
.
sub
(
matchCode
,
0
,
6
);
...
...
base-manager/src/main/resources/config/mybatis-sqlmap-config.xml
View file @
ceb304d6
...
...
@@ -18,7 +18,7 @@
<property
name=
"showSql"
value=
"MySql"
/>
</plugin>
<plugin
interceptor=
"com.mortals.framework.thirty.mybatis.LogInterceptor"
>
<property
name=
"enableExecutorTime"
value=
"
tru
e"
/>
<property
name=
"enableExecutorTime"
value=
"
fals
e"
/>
<property
name=
"showSql"
value=
"false"
/>
</plugin>
...
...
base-manager/src/test/java/com/mortals/httpclient/base/BaseAreaController.http
View file @
ceb304d6
...
...
@@ -54,7 +54,7 @@ POST {{baseUrl}}/base/area/genSubAreaByAreaName
Content-Type: application/json
{
"areaCode": "51
0714
000000"
"areaCode": "51
1900
000000"
}
...
...
portal-manager/src/main/java/com/mortals/xhx/base/framework/config/CorsConfig.java
View file @
ceb304d6
...
...
@@ -22,10 +22,9 @@ public class CorsConfig implements WebMvcConfigurer {
//初始化配置对象
CorsConfiguration
configuration
=
new
CorsConfiguration
();
//允许跨域访问的域名
//configuration.addAllowedOrigin("*");
// configuration.addAllowedOrigin("http://192.168.0.98");
configuration
.
addAllowedOrigin
(
"*"
);
configuration
.
setAllowCredentials
(
true
);
//运行携带cookie
//
configuration.addAllowedMethod("*"); //代表所有请求方法
configuration
.
addAllowedMethod
(
"*"
);
//代表所有请求方法
configuration
.
addAllowedHeader
(
"*"
);
//允许携带任何头信息
//初始化cors配置源对象
...
...
@@ -40,7 +39,7 @@ public class CorsConfig implements WebMvcConfigurer {
public
void
addCorsMappings
(
CorsRegistry
registry
)
{
registry
.
addMapping
(
"/**"
)
.
allowCredentials
(
true
)
//
.allowedOrigins("*")
.
allowedOrigins
(
"*"
)
.
allowedMethods
(
new
String
[]
{
"GET"
,
"POST"
,
"PUT"
,
"DELETE"
})
.
allowedHeaders
(
"*"
)
.
exposedHeaders
(
"*"
);
...
...
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