Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
intel_promotion_api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyilin
intel_promotion_api
Commits
a728c99f
Commit
a728c99f
authored
Jul 08, 2024
by
刘帅阳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
f51eea70
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
Global.java
src/main/java/org/rcisoft/common/component/Global.java
+9
-2
application-conf-prod.yml
src/main/resources/application-conf-prod.yml
+1
-1
application-conf-test.yml
src/main/resources/application-conf-test.yml
+1
-2
No files found.
src/main/java/org/rcisoft/common/component/Global.java
View file @
a728c99f
...
@@ -92,7 +92,7 @@ public class Global {
...
@@ -92,7 +92,7 @@ public class Global {
@Value
(
"${global.path.pdf_location}"
)
@Value
(
"${global.path.pdf_location}"
)
private
String
PDF_LOCATION
;
private
String
PDF_LOCATION
;
// /*切割pdf路径*/
// /*切割pdf路径*/
// @Value("${global.path.cut_pdf_location}")
// @Value("${global.path.cut_pdf_location}")
// private String CUT_PDF_LOCATION;
// private String CUT_PDF_LOCATION;
//
//
...
@@ -120,7 +120,7 @@ public class Global {
...
@@ -120,7 +120,7 @@ public class Global {
@Value
(
"${global.path.images_location}"
)
@Value
(
"${global.path.images_location}"
)
private
String
IMAGES_LOCATION
;
private
String
IMAGES_LOCATION
;
// /*课程默认图片路径*/
// /*课程默认图片路径*/
// @Value("${global.default_location.course}")
// @Value("${global.default_location.course}")
// private String DEFAULT_COURSE_LOCATION;
// private String DEFAULT_COURSE_LOCATION;
//
//
...
@@ -229,6 +229,13 @@ public class Global {
...
@@ -229,6 +229,13 @@ public class Global {
@Value
(
"${spring.redis.timeout}"
)
@Value
(
"${spring.redis.timeout}"
)
private
Integer
REDIS_TIMEOUT
;
private
Integer
REDIS_TIMEOUT
;
/**
*
*/
//不允许上传的文件格式
@Value
(
"${cy.model.security.unsupportedFileFormat}"
)
private
String
unsupportedFileFormat
;
// @Value("${global.path.xml_location}")
// @Value("${global.path.xml_location}")
// private String XML_LOCATION;
// private String XML_LOCATION;
}
}
src/main/resources/application-conf-prod.yml
View file @
a728c99f
...
@@ -59,7 +59,7 @@ cy:
...
@@ -59,7 +59,7 @@ cy:
acAllowOrigin
:
'
*'
acAllowOrigin
:
'
*'
acAllowMethods
:
'
POST,
GET,
OPTIONS,
DELETE,PUT'
acAllowMethods
:
'
POST,
GET,
OPTIONS,
DELETE,PUT'
acAllowHeaders
:
'
*'
acAllowHeaders
:
'
*'
unsupportedFileFormat
:
"
"
unsupportedFileFormat
:
"
.exe,.php,.asp,.jsp,.aspx
"
permit-all
:
permit-all
:
permitUnStatic
:
permitUnStatic
:
-
"
/static/**"
-
"
/static/**"
...
...
src/main/resources/application-conf-test.yml
View file @
a728c99f
...
@@ -54,7 +54,7 @@ cy:
...
@@ -54,7 +54,7 @@ cy:
acAllowOrigin
:
'
*'
acAllowOrigin
:
'
*'
acAllowMethods
:
'
POST,
GET,
OPTIONS,
DELETE,PUT'
acAllowMethods
:
'
POST,
GET,
OPTIONS,
DELETE,PUT'
acAllowHeaders
:
'
*'
acAllowHeaders
:
'
*'
unsupportedFileFormat
:
"
"
unsupportedFileFormat
:
"
.exe,.php,.asp,.jsp,.aspx
"
permit-all
:
permit-all
:
permitUnStatic
:
permitUnStatic
:
-
"
/static/**"
-
"
/static/**"
...
@@ -69,7 +69,6 @@ cy:
...
@@ -69,7 +69,6 @@ cy:
-
"
/nlttest/add/**"
-
"
/nlttest/add/**"
-
"
/pc/sysuser/checkPhoneCode"
-
"
/pc/sysuser/checkPhoneCode"
-
"
/pc/sysuser/resetPassword"
-
"
/pc/sysuser/resetPassword"
-
"
/**/**"
-
"
/captcha/**"
-
"
/captcha/**"
#- "/cros/**"
#- "/cros/**"
permitStatic
:
[
"
/"
,
"
/*.html"
,
"
/favicon.ico"
,
"
/**/*.html"
,
"
/**/*.js"
,
"
/**/*.css"
]
permitStatic
:
[
"
/"
,
"
/*.html"
,
"
/favicon.ico"
,
"
/**/*.html"
,
"
/**/*.js"
,
"
/**/*.css"
]
...
...
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