Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
education
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
李丛阳
education
Commits
a80ba8f7
Commit
a80ba8f7
authored
Oct 16, 2019
by
luzhuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1014
parent
fc1e4622
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
17 deletions
+18
-17
BLessonController.java
...cisoft/business/blesson/controller/BLessonController.java
+10
-10
application-dev.yml
src/main/resources/application-dev.yml
+6
-5
application.yml
src/main/resources/application.yml
+2
-2
No files found.
src/main/java/org/rcisoft/business/blesson/controller/BLessonController.java
View file @
a80ba8f7
...
@@ -442,15 +442,15 @@ public class BLessonController extends PaginationController<BLesson> {
...
@@ -442,15 +442,15 @@ public class BLessonController extends PaginationController<BLesson> {
// MessageConstant.MESSAGE_ALERT_ERROR,
// MessageConstant.MESSAGE_ALERT_ERROR,
// appointLessonDTO);
// appointLessonDTO);
// }
// }
//
//
@ApiOperation(value="625 添加我学习的课程", notes="添加我学习的课程")
@ApiOperation
(
value
=
"625 添加我学习的课程"
,
notes
=
"添加我学习的课程"
)
//
@PostMapping(value = "/addMyLearnLesson")
@PostMapping
(
value
=
"/addMyLearnLesson"
)
//
public Result addMyLearnLesson(CurUser curUser,@Valid AddMyLearnLessonDTO addMyLearnLessonDTO,BindingResult bindingResult) {
public
Result
addMyLearnLesson
(
CurUser
curUser
,
@Valid
AddMyLearnLessonDTO
addMyLearnLessonDTO
,
BindingResult
bindingResult
)
{
//
PersistModel data = bLessonPersonService.addMyLearnLesson(addMyLearnLessonDTO);
PersistModel
data
=
bLessonPersonService
.
addMyLearnLesson
(
addMyLearnLessonDTO
);
//
return Result.builder(data,
return
Result
.
builder
(
data
,
//
MessageConstant.MESSAGE_ALERT_SUCCESS,
MessageConstant
.
MESSAGE_ALERT_SUCCESS
,
//
MessageConstant.MESSAGE_ALERT_ERROR,
MessageConstant
.
MESSAGE_ALERT_ERROR
,
//
addMyLearnLessonDTO);
addMyLearnLessonDTO
);
//
}
}
}
}
src/main/resources/application-dev.yml
View file @
a80ba8f7
...
@@ -5,7 +5,7 @@ server:
...
@@ -5,7 +5,7 @@ server:
servlet
:
servlet
:
context-path
:
/
context-path
:
/
#uri-encoding: UTF-8
#uri-encoding: UTF-8
type
:
dev
1
type
:
dev
maxHttpHeaderSize
:
102400
maxHttpHeaderSize
:
102400
#logging:
#logging:
...
@@ -14,22 +14,20 @@ server:
...
@@ -14,22 +14,20 @@ server:
# org.springframework.web: DEBUG
# org.springframework.web: DEBUG
druid
:
druid
:
url
:
jdbc:mysql://127.0.0.1:330
7/edu_db2
?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
url
:
jdbc:mysql://127.0.0.1:330
6/mt
?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
# url: jdbc:mysql://10.96.131.16:55558/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
# url: jdbc:mysql://10.96.131.16:55558/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
#url: jdbc:mysql://120.52.179.75:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
#url: jdbc:mysql://120.52.179.75:13318/edu_db?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
username
:
root
username
:
root
# password: 91isoft
# password: 91isoft
password
:
123456
password
:
root
initial-size
:
1
initial-size
:
1
min-idle
:
1
min-idle
:
1
max-active
:
20
max-active
:
20
test-on-borrow
:
true
test-on-borrow
:
true
mybatis
:
mybatis
:
mapper-locations
:
classpath:mapper/**/**/*.xml
mapper-locations
:
classpath:mapper/**/**/*.xml
mapper
:
mapper
:
mappers
:
mappers
:
-
org.rcisoft.core.base.BaseMapper
-
org.rcisoft.core.base.BaseMapper
...
@@ -60,6 +58,8 @@ spring:
...
@@ -60,6 +58,8 @@ spring:
multipart
:
multipart
:
max-file-size
:
100MB
max-file-size
:
100MB
max-request-size
:
100MB
max-request-size
:
100MB
application
:
name
:
zx-education
global
:
global
:
lk
:
lk
:
...
@@ -91,6 +91,7 @@ libreoffice:
...
@@ -91,6 +91,7 @@ libreoffice:
ip
:
192.168.1.125
ip
:
192.168.1.125
port
:
10188
port
:
10188
mt
:
mt
:
# api: http://192.168.5.41/api/
api
:
http://221.239.114.20:6789/api/
api
:
http://221.239.114.20:6789/api/
...
...
src/main/resources/application.yml
View file @
a80ba8f7
spring
:
spring
:
profiles
:
profiles
:
active
:
dev
#
active: dev
#
active: prod
active
:
prod
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