Commit a80ba8f7 authored by luzhuang's avatar luzhuang

1014

parent fc1e4622
...@@ -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);
// } }
} }
...@@ -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: dev1 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:3307/edu_db2?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false url: jdbc:mysql://127.0.0.1:3306/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/
......
spring: spring:
profiles: profiles:
active: dev # active: dev
# active: prod active: prod
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment