Commit ceef3804 by baochunxin

#G:修改服务器文件上传大小

parent 43aaf790
...@@ -82,9 +82,9 @@ spring: ...@@ -82,9 +82,9 @@ spring:
servlet: servlet:
multipart: multipart:
# 单个文件大小 # 单个文件大小
max-file-size: 10MB max-file-size: 50MB
# 设置总上传的文件大小 # 设置总上传的文件大小
max-request-size: 20MB max-request-size: 100MB
# 服务模块 # 服务模块
devtools: devtools:
restart: restart:
...@@ -212,15 +212,15 @@ wx: ...@@ -212,15 +212,15 @@ wx:
# redirect-uri: y32025c600.goho.co:10087 # redirect-uri: y32025c600.goho.co:10087
dd: dd:
# 本地配置 # # 本地配置
appKey: dingclpf8qoxvinhksyh # appKey: dingclpf8qoxvinhksyh
appSecret: CrlRmzkaFMH00cbipSf3g0nc_xpFGCitTAPA_cphUXg1e-DSX1hFcyVpqgos29r9 # appSecret: CrlRmzkaFMH00cbipSf3g0nc_xpFGCitTAPA_cphUXg1e-DSX1hFcyVpqgos29r9
# 钉钉接口 获取钉钉access_token 的uri # # 钉钉接口 获取钉钉access_token 的uri
access-token-uri: https://oapi.dingtalk.com/gettoken?appkey=${dd.appKey}&appsecret=${dd.appSecret} # access-token-uri: https://oapi.dingtalk.com/gettoken?appkey=${dd.appKey}&appsecret=${dd.appSecret}
#企业id # #企业id
corpId: dingaa3937ff8b7dd267f2c783f7214b6d69 # corpId: dingaa3937ff8b7dd267f2c783f7214b6d69
#应用id # #应用id
agentId: 2730043705 # agentId: 2730043705
# 测试服务器配置 # 测试服务器配置
# appKey: ding5cbf7qhd55zun5jg # appKey: ding5cbf7qhd55zun5jg
...@@ -233,14 +233,14 @@ dd: ...@@ -233,14 +233,14 @@ dd:
# agentId: 2760774127 # agentId: 2760774127
# 正式配置 # 正式配置
# appKey: dingggqchzyvxm9e6e7v appKey: dingggqchzyvxm9e6e7v
# appSecret: ts5hRNjO_o3QNMfEu4pM2dn71YJzw7yalnuh5LztHuCGWqUNjM2lMB1eNCSOlxNN appSecret: ts5hRNjO_o3QNMfEu4pM2dn71YJzw7yalnuh5LztHuCGWqUNjM2lMB1eNCSOlxNN
# # 钉钉接口 获取钉钉access_token 的uri # 钉钉接口 获取钉钉access_token 的uri
# access-token-uri: https://oapi.dingtalk.com/gettoken?appkey=${dd.appKey}&appsecret=${dd.appSecret} access-token-uri: https://oapi.dingtalk.com/gettoken?appkey=${dd.appKey}&appsecret=${dd.appSecret}
# #企业id #企业id
# corpId: dingccea40788226c988f2c783f7214b6d69 corpId: dingccea40788226c988f2c783f7214b6d69
# #应用id #应用id
# agentId: 2765311628 agentId: 2765311628
#重定向地址 #重定向地址
redirect-uri: www.dyzmxx.com redirect-uri: www.dyzmxx.com
......
...@@ -154,8 +154,7 @@ public class TeacherFilesNoticeServiceImpl extends ServiceImpl<TeacherFilesNoti ...@@ -154,8 +154,7 @@ public class TeacherFilesNoticeServiceImpl extends ServiceImpl<TeacherFilesNoti
SchoolGrade schoolGrade = (SchoolGrade)params.get("grade"); SchoolGrade schoolGrade = (SchoolGrade)params.get("grade");
//获取级部 //获取级部
//查看当前老师是否在班级中当班主任 //查看当前老师是否在班级中当班主任
List<SchoolClass> yxyjList = schoolClasses.stream().filter(p -> p.getTeacherId().equals(user.getUserId()) ).collect(Collectors.toList()); List<SchoolClass> yxyjList = schoolClasses.stream().filter(p -> p.getTeacherId() !=null && p.getTeacherId().equals(user.getUserId())).collect(Collectors.toList());
String teahClassName = null; String teahClassName = null;
String className = null; String className = null;
//只取第一个 //只取第一个
...@@ -188,6 +187,7 @@ public class TeacherFilesNoticeServiceImpl extends ServiceImpl<TeacherFilesNoti ...@@ -188,6 +187,7 @@ public class TeacherFilesNoticeServiceImpl extends ServiceImpl<TeacherFilesNoti
} }
TeacherFiles teacherFilesAddXx(TeacherFiles teacherFiles, List<SchoolTeacher> schoolTeachers){ TeacherFiles teacherFilesAddXx(TeacherFiles teacherFiles, List<SchoolTeacher> schoolTeachers){
System.err.println(teacherFiles.toString());
List<SchoolTeacher> collect = schoolTeachers.stream().filter(t -> t.getId().equals(teacherFiles.getTeacherId())).collect(Collectors.toList()); List<SchoolTeacher> collect = schoolTeachers.stream().filter(t -> t.getId().equals(teacherFiles.getTeacherId())).collect(Collectors.toList());
SchoolTeacher schoolTeacher = collect.get(0); SchoolTeacher schoolTeacher = collect.get(0);
teacherFiles.setTeacherName(schoolTeacher.getTeacherName()); teacherFiles.setTeacherName(schoolTeacher.getTeacherName());
......
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