fjy8018/cms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

增加文件前缀和后缀的设置，修缮部分代码规范

Browse Source
This commit is contained in:
F嘉阳
2018-04-25 21:09:10 +08:00
parent ea9aa04a20
commit 53989d5502
18 changed files with 251 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>com.fjy</groupId> <groupId>com.fjy</groupId>
<artifactId>spring</artifactId> <artifactId>spring</artifactId>
<version>V2.6.8</version> <version>V2.7</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>spring</name> <name>spring</name>

89
src/main/java/com/fjy/spring/controller/DataController.java
View File

@@ -56,82 +56,83 @@ public class DataController {
private HttpServletRequest httpServletRequest; private HttpServletRequest httpServletRequest;
@GetMapping("/home/findAllHomework") @GetMapping("/home/findAllHomework")
public List<VWorkDetail> findAllHomework(){ public List<VWorkDetail> findAllHomework() {
List<VWorkDetail> homeworks = workDetailService.findAll(); List<VWorkDetail> homeworks = workDetailService.findAll();
if (homeworks!=null){ if (homeworks != null) {
return homeworks; return homeworks;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/findvlog") @GetMapping("/home/findvlog")
public List<VLog> findlog(){ public List<VLog> findlog() {
List<VLog> vlogs = logService.findvlog(); List<VLog> vlogs = logService.findvlog();
if (vlogs!=null){ if (vlogs != null) {
return vlogs; return vlogs;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/admin/findvfeedback") @GetMapping("/home/admin/findvfeedback")
public List<VFeedBack> findAllVFeedback(){ public List<VFeedBack> findAllVFeedback() {
List<VFeedBack> feedBacks = feedBackService.findAllVFeedback(); List<VFeedBack> feedBacks = feedBackService.findAllVFeedback();
if (feedBacks!=null){ if (feedBacks != null) {
return feedBacks; return feedBacks;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/findvcourse") @GetMapping("/home/findvcourse")
public List<VCourse> findVCourse(){ public List<VCourse> findVCourse() {
List<VCourse> vCourses = courseService.findAllVCourse(); List<VCourse> vCourses = courseService.findAllVCourse();
if (vCourses!=null){ if (vCourses != null) {
return vCourses; return vCourses;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/admin/findalluser") @GetMapping("/home/admin/findalluser")
public List<TbUser> findAllUser(){ public List<TbUser> findAllUser() {
List<TbUser> users = userService.findAllUser(); List<TbUser> users = userService.findAllUser();
if (users!=null){ if (users != null) {
return users; return users;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/findallvhomework") @GetMapping("/home/findallvhomework")
public List<VHomework> findAllVHomework(){ public List<VHomework> findAllVHomework() {
List<VHomework> vHomeworks = homeworkService.findAllVHomework(); List<VHomework> vHomeworks = homeworkService.findAllVHomework();
if (vHomeworks!=null){ if (vHomeworks != null) {
return vHomeworks; return vHomeworks;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/admin/findStudentInCourseFile") @GetMapping("/home/admin/findStudentInCourseFile")
public List<TbStudentlist> findStudentInCourseFile( public List<TbStudentlist> findStudentInCourseFile(
@RequestParam(value = "Folder") String Folder,@RequestParam(value = "CourseName") String CourseName){ @RequestParam(value = "Folder") String Folder, @RequestParam(value = "CourseName") String CourseName) {
List<TbStudentlist> files = vUserfileService.findStudentNoByWorkFolderAndCourseName(Folder,CourseName); List<TbStudentlist> files = vUserfileService.findStudentNoByWorkFolderAndCourseName(Folder, CourseName);
if (files!=null){ if (files != null) {
return files; return files;
} }
throw new UserException(ResultEnum.EMPTY_DATA); throw new UserException(ResultEnum.EMPTY_DATA);
} }
@GetMapping("/home/userinfo") @GetMapping("/home/userinfo")
public VUserinfo findUserInfo(){ public VUserinfo findUserInfo() {
TbUser user= (TbUser)httpServletRequest.getSession().getAttribute(USER_SESSION_KEY); TbUser user = (TbUser) httpServletRequest.getSession().getAttribute(USER_SESSION_KEY);
return userService.findUserInfo(user.getColuserid()); return userService.findUserInfo(user.getColuserid());
} }
/** /**
* 存储密保问题 * 存储密保问题
*
* @param userque * @param userque
* @return * @return
*/ */
@PostMapping("/home/adduserque") @PostMapping("/home/adduserque")
public boolean adduserque(TbUserque userque)throws Exception{ public boolean adduserque(TbUserque userque) throws Exception {
//对密保问题加密存储 //对密保问题加密存储
userque.setAnswer(new BigInteger(CodingUtil.encryptSHA(userque.getAnswer().getBytes())).toString(32)); userque.setAnswer(new BigInteger(CodingUtil.encryptSHA(userque.getAnswer().getBytes())).toString(32));
return userService.addUserQue(userque); return userService.addUserQue(userque);
@@ -139,6 +140,7 @@ public class DataController {
/** /**
* 判断密保问题是否正确，正确返回true，错误返回false，其余反馈异常对象 * 判断密保问题是否正确，正确返回true，错误返回false，其余反馈异常对象
*
* @param name * @param name
* @param question * @param question
* @param answer * @param answer
@@ -146,18 +148,19 @@ public class DataController {
* @throws Exception * @throws Exception
*/ */
@GetMapping("/finduserque") @GetMapping("/finduserque")
public boolean findUserQue(@RequestParam(value = "name")String name public boolean findUserQue(@RequestParam(value = "name") String name
,@RequestParam(value = "question")String question , @RequestParam(value = "question") String question
,@RequestParam(value = "answer")String answer)throws Exception{ , @RequestParam(value = "answer") String answer) throws Exception {
Optional<VUserque> userque = userService.findUserQueByName(name); Optional<VUserque> userque = userService.findUserQueByName(name);
if (!userque.isPresent()){ if (!userque.isPresent()) {
throw new UserException(ResultEnum.EMPTY_QUESTION); throw new UserException(ResultEnum.EMPTY_QUESTION);
}else if(question.equals(userque.get().getQuestion())){ } else if (question.equals(userque.get().getQuestion())) {
if(new BigInteger(CodingUtil.encryptSHA(answer.getBytes())).toString(32).equals(userque.get().getAnswer())) if (new BigInteger(CodingUtil.encryptSHA(answer.getBytes())).toString(32).equals(userque.get().getAnswer())) {
return true; return true;
else } else {
return false; return false;
}else{ }
} else {
throw new UserException(ResultEnum.QUESTION_ERROR); throw new UserException(ResultEnum.QUESTION_ERROR);
} }
} }
@@ -165,53 +168,53 @@ public class DataController {
@PostMapping("/resetPass") @PostMapping("/resetPass")
public boolean resetPass(@RequestParam(value = "name") String name public boolean resetPass(@RequestParam(value = "name") String name
, @RequestParam(value = "password") String password, , @RequestParam(value = "password") String password,
@RequestParam(value = "question") String question @RequestParam(value = "question") String question
, @RequestParam(value = "answer") String answer) throws Exception { , @RequestParam(value = "answer") String answer) throws Exception {
//log.info("name:{}, password:{}, question:{}, answer:{}",name,password,question,answer); //log.info("name:{}, password:{}, question:{}, answer:{}",name,password,question,answer);
if (findUserQue(name,question,answer)){ if (findUserQue(name, question, answer)) {
//service方法内含有对密码加密的操作 //service方法内含有对密码加密的操作
return userService.updateColpasswordByColname(password,name); return userService.updateColpasswordByColname(password, name);
}else { } else {
throw new UserException(ResultEnum.ILLEGAL_ACCESS); throw new UserException(ResultEnum.ILLEGAL_ACCESS);
} }
} }
@GetMapping("/home/findAllNotice") @GetMapping("/home/findAllNotice")
public List<TbNotice> findAllNotice(){ public List<TbNotice> findAllNotice() {
return noticeService.findAll(); return noticeService.findAll();
} }
@PostMapping("/home/admin/addNotice") @PostMapping("/home/admin/addNotice")
public boolean addNotice(String content){ public boolean addNotice(String content) {
TbUser user= (TbUser)httpServletRequest.getSession().getAttribute(USER_SESSION_KEY); TbUser user = (TbUser) httpServletRequest.getSession().getAttribute(USER_SESSION_KEY);
TbNotice notice = new TbNotice(); TbNotice notice = new TbNotice();
Date date = new Date(); Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateNowStr = sdf.format(date); String dateNowStr = sdf.format(date);
Optional<VAdmin> vAdmin = adminService.findAdminByUserId(user.getColuserid()); Optional<VAdmin> vAdmin = adminService.findAdminByUserId(user.getColuserid());
if (vAdmin.isPresent()){ if (vAdmin.isPresent()) {
VAdmin admin = vAdmin.get(); VAdmin admin = vAdmin.get();
notice.setAdminid(admin.getAdminid()); notice.setAdminid(admin.getAdminid());
notice.setIssueTime(dateNowStr); notice.setIssueTime(dateNowStr);
notice.setNoticeContent(content); notice.setNoticeContent(content);
return noticeService.addOne(notice)!=null; return noticeService.addOne(notice) != null;
}else } else {
return false; return false;
}
} }
@PostMapping("/home/admin/addoneversion") @PostMapping("/home/admin/addoneversion")
public boolean addOneVersion(TbVersion version){ public boolean addOneVersion(TbVersion version) {
return versionService.addOneVersion(version)!=null; return versionService.addOneVersion(version) != null;
} }
@PostMapping("/home/admin/addversion") @PostMapping("/home/admin/addversion")
public boolean addVersion(@RequestBody List<TbVersion> versions){ public boolean addVersion(@RequestBody List<TbVersion> versions) {
return versionService.addAllVersion(versions)!=null; return versionService.addAllVersion(versions) != null;
} }
@GetMapping("/home/findallversion") @GetMapping("/home/findallversion")
public List<TbVersion> findAllVersion(){ public List<TbVersion> findAllVersion() {
return versionService.findAll(); return versionService.findAll();
} }
} }

30
src/main/java/com/fjy/spring/controller/DownLoadController.java
View File

@@ -46,8 +46,9 @@ public class DownLoadController {
@ResponseBody @ResponseBody
public List<TbFile> toDownloadAll() { public List<TbFile> toDownloadAll() {
List<TbFile> files = fileService.findAllFile();//此处做空指针判断并抛出错误 List<TbFile> files = fileService.findAllFile();//此处做空指针判断并抛出错误
if (files != null) if (files != null) {
return files; return files;
}
new UserException(ResultEnum.EMPTY_DATA); new UserException(ResultEnum.EMPTY_DATA);
return null; return null;
} }
@@ -59,8 +60,9 @@ public class DownLoadController {
//log.info(user.toString()); //log.info(user.toString());
List<TbFile> files = fileService.findByColuserid(user.getColuserid()); List<TbFile> files = fileService.findByColuserid(user.getColuserid());
//此处做空指针判断并抛出错误 //此处做空指针判断并抛出错误
if (files != null) if (files != null) {
return files; return files;
}
new UserException(ResultEnum.EMPTY_DATA); new UserException(ResultEnum.EMPTY_DATA);
return null; return null;
} }
@@ -103,20 +105,22 @@ public class DownLoadController {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
if (bis != null) if (bis != null) {
try { try {
bis.close(); bis.close();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
if (bos != null) }
if (bos != null) {
try { try {
bos.close(); bos.close();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
}
} }
return null; return null;
@@ -184,9 +188,15 @@ public class DownLoadController {
} finally { } finally {
//关闭流 //关闭流
try { try {
if (null != bufferStream) bufferStream.close(); if (null != bufferStream) {
if (null != zipStream) zipStream.close(); bufferStream.close();
if (null != zipSource) zipSource.close(); }
if (null != zipStream) {
zipStream.close();
}
if (null != zipSource) {
zipSource.close();
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -209,20 +219,22 @@ public class DownLoadController {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
if (bis != null) if (bis != null) {
try { try {
bis.close(); bis.close();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
if (bos != null) }
if (bos != null) {
try { try {
bos.close(); bos.close();
} catch (IOException e) { } catch (IOException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
}
} }
} }

9
src/main/java/com/fjy/spring/controller/RegisterController.java
View File

@@ -63,8 +63,9 @@ public class RegisterController {
@ResponseBody @ResponseBody
public boolean doCheckStudentNo(@RequestParam(value = "studentno") String studentno){ public boolean doCheckStudentNo(@RequestParam(value = "studentno") String studentno){
TbStudentlist studentlist = studentService.findStudentByNo(studentno); TbStudentlist studentlist = studentService.findStudentByNo(studentno);
if (studentlist!=null) if (studentlist!=null) {
return true; return true;
}
return false; return false;
} }
@@ -73,8 +74,9 @@ public class RegisterController {
public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno, public boolean doCheckStudent(@RequestParam(value = "studentno") String studentno,
@RequestParam(value = "realname") String realname){ @RequestParam(value = "realname") String realname){
TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname); TbStudentlist studentlist = studentService.findByColstudentnoAndColrealname(studentno,realname);
if (studentlist!=null&&studentlist.getRegistered()!= RegisteredEnum.REGISTERED.getCode()) if (studentlist!=null&&studentlist.getRegistered()!= RegisteredEnum.REGISTERED.getCode()) {
return true; return true;
}
return false; return false;
} }
@@ -87,8 +89,9 @@ public class RegisterController {
@ResponseBody @ResponseBody
public boolean doUserName(@RequestParam(value = "name") String name){ public boolean doUserName(@RequestParam(value = "name") String name){
Optional<TbUser> user = userService.findByColname(name); Optional<TbUser> user = userService.findByColname(name);
if (user.isPresent()) if (user.isPresent()) {
return false; return false;
}
return true; return true;
} }

75
src/main/java/com/fjy/spring/controller/UpLoadController.java
View File

@@ -1,11 +1,13 @@
package com.fjy.spring.controller; package com.fjy.spring.controller;
import com.fjy.spring.constant.GlobalConstant; import com.fjy.spring.constant.GlobalConstant;
import com.fjy.spring.domain.Homework;
import com.fjy.spring.domain.TbFile; import com.fjy.spring.domain.TbFile;
import com.fjy.spring.domain.TbLog; import com.fjy.spring.domain.TbLog;
import com.fjy.spring.domain.TbUser; import com.fjy.spring.domain.TbUser;
import com.fjy.spring.properties.ServerProperties; import com.fjy.spring.properties.ServerProperties;
import com.fjy.spring.service.FileService; import com.fjy.spring.service.FileService;
import com.fjy.spring.service.HomeworkService;
import com.fjy.spring.service.LogService; import com.fjy.spring.service.LogService;
import com.fjy.spring.untils.FormatFileSizeUtil; import com.fjy.spring.untils.FormatFileSizeUtil;
import com.fjy.spring.untils.GetIPAddrUtil; import com.fjy.spring.untils.GetIPAddrUtil;
@@ -31,11 +33,20 @@ import java.util.Map;
@Slf4j @Slf4j
public class UpLoadController { public class UpLoadController {
/**
* 服务器配置信息
*/
@Autowired @Autowired
private ServerProperties serverProperties;//服务器配置信息 private ServerProperties serverProperties;
/**
* 文件相关数据库操作
*/
@Autowired
private FileService fileService;
@Autowired @Autowired
private FileService fileService;//文件相关数据库操作 private HomeworkService homeworkService;
@Autowired @Autowired
private LogService logService; private LogService logService;
@@ -79,20 +90,22 @@ public class UpLoadController {
* 存储文件信息 * 存储文件信息
*/ */
TbFile file = new TbFile(); TbFile file = new TbFile();
file.setColfilesize(new FormatFileSizeUtil().GetFileSize(imageFile.getSize())); file.setColfilesize(FormatFileSizeUtil.GetFileSize(imageFile.getSize()));
file.setColfilename(filename); file.setColfilename(filename);
file.setColfilepath(uploadUrl + filename); file.setColfilepath(uploadUrl + filename);
file.setColip(request.getRemoteAddr()); file.setColip(request.getRemoteAddr());
file.setColuserid(user.getColuserid()); file.setColuserid(user.getColuserid());
if (fileService.addFile(file)) if (fileService.addFile(file)) {
log.info("记录写入数据库成功"); log.info("记录写入数据库成功");
//System.out.println("记录写入数据库成功"); }
else //System.out.println("记录写入数据库成功");
else {
log.error("记录写入数据库失败"); log.error("记录写入数据库失败");
}
//System.out.println("记录写入数据库失败"); //System.out.println("记录写入数据库失败");
log.info("文件上传到: " + uploadUrl + filename); log.info("文件上传到: " + uploadUrl + filename);
log.info("文件大小: " + new FormatFileSizeUtil().GetFileSize(imageFile.getSize())); log.info("文件大小: " + FormatFileSizeUtil.GetFileSize(imageFile.getSize()));
log.info("文件名: " + filename); log.info("文件名: " + filename);
File targetFile = new File(uploadUrl + filename); File targetFile = new File(uploadUrl + filename);
@@ -130,6 +143,7 @@ public class UpLoadController {
public void moreUpload(HttpServletRequest request, public void moreUpload(HttpServletRequest request,
@RequestParam(value = "courseName", required = false) String courseName, @RequestParam(value = "courseName", required = false) String courseName,
@RequestParam(value = "folder", required = false) String folder, @RequestParam(value = "folder", required = false) String folder,
@RequestParam(value = "workid") Integer workId,
@RequestParam(value = "rename", required = true) boolean rename) { @RequestParam(value = "rename", required = true) boolean rename) {
MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request;
@@ -158,13 +172,21 @@ public class UpLoadController {
List<String> fileList = new ArrayList<String>(); List<String> fileList = new ArrayList<String>();
for (MultipartFile file : files.values()) { for (MultipartFile file : files.values()) {
Homework homework = homeworkService.findById(workId);
String filePrefix = homework.getFilePrefix();
String fileSuffix = homework.getFileSuffix();
String filename = file.getOriginalFilename(); String filename = file.getOriginalFilename();
String suffix = "." + filename.substring(filename.lastIndexOf(".") + 1);//获取文件后缀
//获取文件后缀
String suffix = "." + filename.substring(filename.lastIndexOf(".") + 1);
TbFile tbFile = new TbFile(); TbFile tbFile = new TbFile();
String pathname; String pathname;
//文件重命名
if (rename) { if (rename) {
pathname = uploadUrl + user.getColstudentno() + user.getColrealname() + suffix; pathname = uploadUrl + filePrefix + user.getColstudentno() + user.getColrealname() + fileSuffix + suffix;
tbFile.setColfilename(user.getColstudentno() + user.getColrealname() + suffix); tbFile.setColfilename(filePrefix + user.getColstudentno() + user.getColrealname() + fileSuffix + suffix);
} else { } else {
pathname = uploadUrl + filename; pathname = uploadUrl + filename;
tbFile.setColfilename(filename); tbFile.setColfilename(filename);
@@ -172,39 +194,41 @@ public class UpLoadController {
File targetFile = new File(pathname); File targetFile = new File(pathname);
//若文件已存在则自动重命名 //若文件已存在则自动重命名
if (targetFile.exists()){ if (targetFile.exists()) {
String bakpathname; String bakpathname;
if (rename) { if (rename) {
bakpathname = uploadUrl + "bak/" +user.getColstudentno() + user.getColrealname() + suffix; bakpathname = uploadUrl + "bak/" + user.getColstudentno() + user.getColrealname() + suffix;
} else { } else {
bakpathname = uploadUrl +"bak/"+ filename; bakpathname = uploadUrl + "bak/" + filename;
} }
log.info("源文件路径:"+pathname); log.info("源文件路径:" + pathname);
TbFile file1 = fileService.findByFilepath(pathname); TbFile file1 = fileService.findByFilepath(pathname);
file1.setColfilepath(bakpathname+"."+dateNowStr2+".bak"); file1.setColfilepath(bakpathname + "." + dateNowStr2 + ".bak");
file1.setColfilename(file1.getColfilename()+"."+dateNowStr2+".bak"); file1.setColfilename(file1.getColfilename() + "." + dateNowStr2 + ".bak");
if (fileService.addFile(file1)) if (fileService.addFile(file1)) {
log.info("重命名文件数据库更新成功"); log.info("重命名文件数据库更新成功");
else } else {
log.error("重命名文件数据库更新失败"); log.error("重命名文件数据库更新失败");
File mvfile = new File(bakpathname+"."+dateNowStr2+".bak"); }
File mvfile = new File(bakpathname + "." + dateNowStr2 + ".bak");
try { try {
FileUtils.moveFile(targetFile, mvfile); FileUtils.moveFile(targetFile, mvfile);
log.info("源文件："+targetFile.getName()+"已重命名为："+ mvfile.getName()); log.info("源文件：" + targetFile.getName() + "已重命名为：" + mvfile.getName());
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
log.info("文件上传到: " + uploadUrl + filename); log.info("文件上传到: " + uploadUrl + filename);
log.info("文件大小: " + new FormatFileSizeUtil().GetFileSize(file.getSize())); log.info("文件大小: " + FormatFileSizeUtil.GetFileSize(file.getSize()));
log.info("文件名: " + filename); log.info("文件名: " + filename);
tbFile.setColfilesize(new FormatFileSizeUtil().GetFileSize(file.getSize())); tbFile.setColfilesize(FormatFileSizeUtil.GetFileSize(file.getSize()));
tbFile.setColtime(dateNowStr); tbFile.setColtime(dateNowStr);
tbFile.setColrealname(filename); tbFile.setColrealname(filename);
tbFile.setColfilepath(pathname);//文件自动学号+姓名命名 //文件自动学号+姓名命名
tbFile.setColfilepath(pathname);
tbFile.setColip(request.getRemoteAddr()); tbFile.setColip(request.getRemoteAddr());
tbFile.setColuserid(user.getColuserid()); tbFile.setColuserid(user.getColuserid());
tbFile.setCourseName(courseName); tbFile.setCourseName(courseName);
@@ -217,10 +241,11 @@ public class UpLoadController {
logs.setColheader(user.getColname() + "上传了'" + filename + "'文件"); logs.setColheader(user.getColname() + "上传了'" + filename + "'文件");
logService.addLogRec(logs); logService.addLogRec(logs);
if (fileService.addFile(tbFile)) if (fileService.addFile(tbFile)) {
log.info("记录写入数据库成功"); log.info("记录写入数据库成功");
else } else {
log.error("记录写入数据库失败"); log.error("记录写入数据库失败");
}
if (!targetFile.exists()) { if (!targetFile.exists()) {
try { try {

6
src/main/java/com/fjy/spring/domain/Homework.java
View File

@@ -30,4 +30,10 @@ public class Homework {
@Column(name = "workremark") @Column(name = "workremark")
private String Remark; private String Remark;
@Column(name = "pre")
private String filePrefix;
@Column(name = "suf")
private String fileSuffix;
} }

6
src/main/java/com/fjy/spring/interceptor/AdminInterceptor.java
View File

@@ -24,7 +24,8 @@ public class AdminInterceptor implements HandlerInterceptor {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
TbUser user = (TbUser)request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY); TbUser user = (TbUser)request.getSession().getAttribute(GlobalConstant.USER_SESSION_KEY);
//log.info(user.getColuserid()+""); //log.info(user.getColuserid()+"");
if (adminService == null) {//解决service为null无法注入问题 //解决service为null无法注入问题
if (adminService == null) {
BeanFactory factory = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext()); BeanFactory factory = WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
adminService = (AdminService) factory.getBean("adminService"); adminService = (AdminService) factory.getBean("adminService");
} }
@@ -33,8 +34,9 @@ public class AdminInterceptor implements HandlerInterceptor {
if (!admin.isPresent()){ if (!admin.isPresent()){
response.sendRedirect("/cms/home"); response.sendRedirect("/cms/home");
return false; return false;
}else }else {
return true; return true;
}
} }
} }

6
src/main/java/com/fjy/spring/service/FileService.java
View File

@@ -15,15 +15,17 @@ public class FileService {
public boolean addFile(TbFile tbFile) { public boolean addFile(TbFile tbFile) {
TbFile file = tbFileRepository.save(tbFile); TbFile file = tbFileRepository.save(tbFile);
if (file != null) if (file != null) {
return true; return true;
}
return false; return false;
} }
public List<TbFile> findFile(TbFile tbFile){ public List<TbFile> findFile(TbFile tbFile){
List<TbFile> files = tbFileRepository.findByColfilename(tbFile.getColfilename()); List<TbFile> files = tbFileRepository.findByColfilename(tbFile.getColfilename());
if (files!=null) if (files!=null) {
return files; return files;
}
return null; return null;
} }

10
src/main/java/com/fjy/spring/service/HomeworkService.java
View File

@@ -2,13 +2,13 @@ package com.fjy.spring.service;
import com.fjy.spring.domain.Homework; import com.fjy.spring.domain.Homework;
import com.fjy.spring.domain.VHomework; import com.fjy.spring.domain.VHomework;
import com.fjy.spring.domain.VWorkDetail;
import com.fjy.spring.repository.HomeworkRepository; import com.fjy.spring.repository.HomeworkRepository;
import com.fjy.spring.repository.VHomeworkRepository; import com.fjy.spring.repository.VHomeworkRepository;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Optional;
@Service @Service
public class HomeworkService { public class HomeworkService {
@@ -25,4 +25,12 @@ public class HomeworkService {
public List<VHomework> findAllVHomework(){ public List<VHomework> findAllVHomework(){
return vHomeworkRepository.findAll(); return vHomeworkRepository.findAll();
} }
public Homework findById(Integer id){
Optional<Homework> homework = homeworkRepository.findById(id);
if (homework.isPresent()){
return (Homework)homework.get();
}
return null;
}
} }

3
src/main/java/com/fjy/spring/service/UserService.java
View File

@@ -81,8 +81,9 @@ public class UserService {
public boolean addUserQue(TbUserque userque) { public boolean addUserQue(TbUserque userque) {
TbUserque tbUserque = userqueRepository.save(userque); TbUserque tbUserque = userqueRepository.save(userque);
if (tbUserque != null) if (tbUserque != null) {
return true; return true;
}
return false; return false;
} }

2
src/main/resources/application.yml
View File

@@ -1,4 +1,4 @@
#控制配置文件调用 #控制配置文件调用
spring: spring:
profiles: profiles:
active: prod active: dev

8
src/main/resources/logback-spring.xml
View File

@@ -25,8 +25,8 @@
<!--滚动策略--> <!--滚动策略-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--路径文件名，文件名包含时间--> <!--路径文件名，文件名包含时间-->
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>--> <fileNamePattern>F:\JAVA Workspace\Temp\log\%d\info.%d.log</fileNamePattern>
<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern> <!--<fileNamePattern>/www/cmsfile/%d/info.%d.log</fileNamePattern>-->
</rollingPolicy> </rollingPolicy>
</appender> </appender>
@@ -44,8 +44,8 @@
<!--滚动策略--> <!--滚动策略-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--路径文件名，文件名包含时间--> <!--路径文件名，文件名包含时间-->
<!--<fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>--> <fileNamePattern>F:\JAVA Workspace\Temp\log\error.%d.log</fileNamePattern>
<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern> <!--<fileNamePattern>/www/cmsfile/%d/error.%d.log</fileNamePattern>-->
</rollingPolicy> </rollingPolicy>
</appender> </appender>

103
src/main/resources/static/js/homepage.js
View File

@@ -3,6 +3,7 @@ var month = dt.getMonth() + 1;
var day = dt.getDate(); var day = dt.getDate();
var year = dt.getFullYear(); var year = dt.getFullYear();
var cur = year + '-' + month + '-' + day; var cur = year + '-' + month + '-' + day;
function DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式 function DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
var aDate, oDate1, oDate2, iDays var aDate, oDate1, oDate2, iDays
aDate = sDate1.split("-") aDate = sDate1.split("-")
@@ -12,9 +13,11 @@ function DateDiff(sDate1, sDate2) { //sDate1和sDate2是2002-12-18格式
iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24) //把相差的毫秒数转换为天数 iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24) //把相差的毫秒数转换为天数
return iDays return iDays
} }
function displayStyle(id,type) {
document.getElementById(id).style.display=type; function displayStyle(id, type) {
document.getElementById(id).style.display = type;
} }
var Main = { var Main = {
data() { data() {
var checkName = (rule, value, callback) => { var checkName = (rule, value, callback) => {
@@ -66,7 +69,7 @@ var Main = {
colrealname: '', colrealname: '',
colemail: '' colemail: ''
}, },
iShow:true, iShow: true,
rules2: { rules2: {
colpassword: [ colpassword: [
{required: true, validator: validatePass, trigger: 'blur'} {required: true, validator: validatePass, trigger: 'blur'}
@@ -95,7 +98,7 @@ var Main = {
activeName: 'login', activeName: 'login',
fileList: [], fileList: [],
DownloadList: [], DownloadList: [],
NoticeList:[ NoticeList: [
{ {
noticeid: 1, noticeid: 1,
adminid: 1, adminid: 1,
@@ -109,12 +112,12 @@ var Main = {
issueTime: "2018-2-26 11:13" issueTime: "2018-2-26 11:13"
} }
], ],
VersionList:[ VersionList: [
{ {
date:'2018-01-30', date: '2018-01-30',
content:'实现数据库查询用户，获取密码，编写了单元测试类', content: '实现数据库查询用户，获取密码，编写了单元测试类',
version:'V0.1', version: 'V0.1',
user:'F嘉阳' user: 'F嘉阳'
} }
], ],
tableHomeworkData: [ tableHomeworkData: [
@@ -170,7 +173,7 @@ var Main = {
that.getFileList(); that.getFileList();
},1000);*/ },1000);*/
this.getFileList(); this.getFileList();
axios.get(getRootPath_web()+'/home/findAllHomework') axios.get(getRootPath_web() + '/home/findAllHomework')
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
that.tableHomeworkData = response.data; that.tableHomeworkData = response.data;
@@ -179,7 +182,7 @@ var Main = {
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
axios.get(getRootPath_web()+'/home/findAllNotice') axios.get(getRootPath_web() + '/home/findAllNotice')
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
that.NoticeList = response.data; that.NoticeList = response.data;
@@ -188,7 +191,7 @@ var Main = {
.catch(function (error) { .catch(function (error) {
console.log(error); console.log(error);
}); });
axios.get(getRootPath_web()+'/home/findallversion') axios.get(getRootPath_web() + '/home/findallversion')
.then(function (response) { .then(function (response) {
console.log(response.data); console.log(response.data);
that.VersionList = response.data; that.VersionList = response.data;
@@ -200,9 +203,9 @@ var Main = {
}) })
}, },
methods: { methods: {
getFileList(){ getFileList() {
let that = this; let that = this;
axios.get(getRootPath_web()+'/home/download/findone') axios.get(getRootPath_web() + '/home/download/findone')
.then(function (response) { .then(function (response) {
//console.log(response.data); //console.log(response.data);
that.DownloadList = response.data; that.DownloadList = response.data;
@@ -232,7 +235,7 @@ var Main = {
}); });
}, },
uploadURL(row) { uploadURL(row) {
return getRootPath_web()+"/home/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder+"&rename=true"; return getRootPath_web() + "/home/moreUpload?courseName=" + row.coursename + "&folder=" + row.workfolder + "&workid=" + row.workid + "&rename=true";
}, },
limitTime(row) { limitTime(row) {
@@ -243,7 +246,7 @@ var Main = {
let that = this; let that = this;
if (valid) { if (valid) {
axios({ axios({
url: getRootPath_web()+'/' + url, url: getRootPath_web() + '/' + url,
method: 'post', method: 'post',
data: { data: {
content: this.$refs.content.value content: this.$refs.content.value
@@ -261,13 +264,13 @@ var Main = {
} }
}).then(function (response) { }).then(function (response) {
console.log(response.data); console.log(response.data);
if (response.data===true){ if (response.data === true) {
//that.$refs[formName].submit; //that.$refs[formName].submit;
//return true; //return true;
that.openNotiSuccess("成功", "反馈成功！") that.openNotiSuccess("成功", "反馈成功！")
}else if (response.data===false){ } else if (response.data === false) {
that.openNotiError("失败", "反馈失败！"); that.openNotiError("失败", "反馈失败！");
}else { } else {
that.openNotiError("错误", response.data.message); that.openNotiError("错误", response.data.message);
} }
}).catch(function (error) { }).catch(function (error) {
@@ -293,22 +296,24 @@ var Main = {
let that = this; let that = this;
this.$refs.upload.submit(); this.$refs.upload.submit();
this.openNotiSuccess("成功", "文件上传成功！"); this.openNotiSuccess("成功", "文件上传成功！");
setTimeout(function () {that.getFileList();},1000); setTimeout(function () {
that.getFileList();
}, 1000);
}, },
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log(file, fileList); console.log(file, fileList);
}, },
ClickToJump(targe) { ClickToJump(targe) {
window.location.href = getRootPath_web()+"/" + targe; window.location.href = getRootPath_web() + "/" + targe;
}, },
handleDownload(row) { handleDownload(row) {
/*var url = window.location.protocol+"://"+window.location.host+":"+window.location.port+"/"*/ /*var url = window.location.protocol+"://"+window.location.host+":"+window.location.port+"/"*/
window.open(getRootPath_web()+"/home/download/dodownload?fileId=" + row.colfileid); window.open(getRootPath_web() + "/home/download/dodownload?fileId=" + row.colfileid);
}, },
handleDelete(row) { handleDelete(row) {
let that = this; let that = this;
axios({ axios({
url: getRootPath_web()+'/home/filedelete', url: getRootPath_web() + '/home/filedelete',
method: 'post', method: 'post',
data: { data: {
fileid: row.colfileid fileid: row.colfileid
@@ -326,14 +331,14 @@ var Main = {
} }
}).then(function (response) { }).then(function (response) {
console.log(response.data); console.log(response.data);
if (response.data===true){ if (response.data === true) {
//that.$refs[formName].submit; //that.$refs[formName].submit;
//return true; //return true;
that.openNotiSuccess("成功", "删除成功！"); that.openNotiSuccess("成功", "删除成功！");
that.getFileList(); that.getFileList();
}else if (response.data===false){ } else if (response.data === false) {
that.openNotiError("失败", "删除失败!"); that.openNotiError("失败", "删除失败!");
}else { } else {
that.openNotiError("错误", response.data.message); that.openNotiError("错误", response.data.message);
} }
}).catch(function (error) { }).catch(function (error) {
@@ -341,17 +346,17 @@ var Main = {
that.openNotiError("错误", "服务器错误！"); that.openNotiError("错误", "服务器错误！");
}); });
}, },
isShow(row){ isShow(row) {
let that = this; let that = this;
console.log(row.worktime+"||"+row.workid); console.log(row.worktime + "||" + row.workid);
if (compareTime(cur,row.worktime)){ if (compareTime(cur, row.worktime)) {
console.log("true"); console.log("true");
return true; return true;
//提交时间合法 //提交时间合法
//document.getElementById("btn-group").style.display=""; //document.getElementById("btn-group").style.display="";
//displayStyle("btn-show"+row.workid,"none"); //displayStyle("btn-show"+row.workid,"none");
//displayStyle("btn-group"+row.workid,""); //displayStyle("btn-group"+row.workid,"");
}else { } else {
console.log("false"); console.log("false");
return false; return false;
//提交时间不合法 //提交时间不合法
@@ -363,25 +368,25 @@ var Main = {
}, },
handlePreview(row) { handlePreview(row) {
console.log(row); console.log(row);
/* let that = this; /* let that = this;
console.log(row.worktime+"||"+row.workid); console.log(row.worktime+"||"+row.workid);
if (compareTime(cur,row.worktime)){ if (compareTime(cur,row.worktime)){
that.isShow = true; that.isShow = true;
console.log("Show"+that.isShow); console.log("Show"+that.isShow);
//提交时间合法 //提交时间合法
//document.getElementById("btn-group").style.display=""; //document.getElementById("btn-group").style.display="";
//displayStyle("btn-show"+row.workid,"none"); //displayStyle("btn-show"+row.workid,"none");
//displayStyle("btn-group"+row.workid,""); //displayStyle("btn-group"+row.workid,"");
} }
if (!compareTime(cur,row.worktime)){ if (!compareTime(cur,row.worktime)){
that.isShow = false; that.isShow = false;
console.log("EShow"+that.isShow); console.log("EShow"+that.isShow);
//提交时间不合法 //提交时间不合法
//displayStyle("btn-show"+row.workid,""); //displayStyle("btn-show"+row.workid,"");
//displayStyle("btn-group"+row.workid,"none"); //displayStyle("btn-group"+row.workid,"none");
//displayStyle("btn-show"); //displayStyle("btn-show");
//document.getElementById("btn-show").style.display=""; //document.getElementById("btn-show").style.display="";
}*/ }*/
}, },
handleExceed(files, fileList) { handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);

4
src/test/java/com/fjy/spring/LoggerTest.java
View File

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
/*
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@Slf4j @Slf4j
@@ -22,4 +22,4 @@ public class LoggerTest {
log.error("error..."); log.error("error...");
} }
} }
*/

70
src/test/java/com/fjy/spring/controller/DataControllerTest.java
View File

@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import javax.transaction.Transactional; import javax.transaction.Transactional;
/*
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@@ -21,42 +21,42 @@ public class DataControllerTest {
@Autowired @Autowired
private MockMvc mvc; private MockMvc mvc;
*/
/** /**
* 使用此单元测试前要注销拦截器，否则测试不通过 * 使用此单元测试前要注销拦截器，否则测试不通过
* @throws Exception * @throws Exception
*//* */
@Test @Test
@Transactional @Transactional
public void adduserque() throws Exception{ public void adduserque() throws Exception {
mvc.perform(MockMvcRequestBuilders.post("/home/adduserque") mvc.perform(MockMvcRequestBuilders.post("/home/adduserque")
.param("coluserid","53") .param("coluserid", "53")
.param("question","您母亲的姓名是？") .param("question", "您母亲的姓名是？")
.param("answer","YHM")) .param("answer", "YHM"))
.andExpect(MockMvcResultMatchers.content().string("true")); .andExpect(MockMvcResultMatchers.content().string("true"));
} }
*/
/** /**
*测试找回密码 * 测试找回密码
* @throws Exception * @throws Exception
*//* */
@Test @Test
public void findUserQue() throws Exception{ public void findUserQue() throws Exception {
//测试问题和答案均正确 //测试问题和答案均正确
mvc.perform(MockMvcRequestBuilders.get("/finduserque") mvc.perform(MockMvcRequestBuilders.get("/finduserque")
.param("name","root") .param("name", "root")
.param("question","您配偶的姓名是？") .param("question", "您配偶的姓名是？")
.param("answer","abc")) .param("answer", "abc"))
.andExpect(MockMvcResultMatchers.content().string("true")); .andExpect(MockMvcResultMatchers.content().string("true"));
//测试问题错误 //测试问题错误
mvc.perform(MockMvcRequestBuilders.get("/finduserque") mvc.perform(MockMvcRequestBuilders.get("/finduserque")
.param("name","root") .param("name", "root")
.param("question","您配偶的姓名是") .param("question", "您配偶的姓名是")
.param("answer","abc")) .param("answer", "abc"))
.andExpect(MockMvcResultMatchers.content().json("{\n" + .andExpect(MockMvcResultMatchers.content().json("{\n" +
" \"code\": 611,\n" + " \"code\": 611,\n" +
" \"message\": \"问题与答案不匹配\",\n" + " \"message\": \"问题与答案不匹配\",\n" +
@@ -65,16 +65,16 @@ public class DataControllerTest {
//测试问题正确,答案错误 //测试问题正确,答案错误
mvc.perform(MockMvcRequestBuilders.get("/finduserque") mvc.perform(MockMvcRequestBuilders.get("/finduserque")
.param("name","root") .param("name", "root")
.param("question","您配偶的姓名是？") .param("question", "您配偶的姓名是？")
.param("answer","a")) .param("answer", "a"))
.andExpect(MockMvcResultMatchers.content().string("false")); .andExpect(MockMvcResultMatchers.content().string("false"));
//未设置问题 //未设置问题
mvc.perform(MockMvcRequestBuilders.get("/finduserque") mvc.perform(MockMvcRequestBuilders.get("/finduserque")
.param("name","roo") .param("name", "roo")
.param("question","您配偶的姓名是？") .param("question", "您配偶的姓名是？")
.param("answer","a")) .param("answer", "a"))
.andExpect(MockMvcResultMatchers.content().json("{\n" + .andExpect(MockMvcResultMatchers.content().json("{\n" +
" \"code\": 610,\n" + " \"code\": 610,\n" +
" \"message\": \"该用户未设置密保问题\",\n" + " \"message\": \"该用户未设置密保问题\",\n" +
@@ -82,20 +82,20 @@ public class DataControllerTest {
"}")); "}"));
} }
*/
/**
* 测试忘记密码操作 /* * 测试忘记密码操作
* @throws Exception * @throws Exception
*//* */
@Test @Test
@Transactional @Transactional
public void resetPass() throws Exception{ public void resetPass() throws Exception {
mvc.perform(MockMvcRequestBuilders.post("/resetPass") mvc.perform(MockMvcRequestBuilders.post("/resetPass")
.param("name","root") .param("name", "root")
.param("question","您配偶的姓名是？") .param("question", "您配偶的姓名是？")
.param("answer","abc") .param("answer", "abc")
.param("password","admin")) .param("password", "admin"))
.andExpect(MockMvcResultMatchers.content().string("true")); .andExpect(MockMvcResultMatchers.content().string("true"));
} }
}*/ }

4
src/test/java/com/fjy/spring/controller/LoginControllerTest.java
View File

@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/*
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@@ -40,4 +40,4 @@ public class LoginControllerTest {
" \"data\": null\n" + " \"data\": null\n" +
"}")); "}"));
} }
}*/ }

4
src/test/java/com/fjy/spring/controller/RegisterControllerTest.java
View File

@@ -12,7 +12,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/*
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@@ -74,4 +74,4 @@ public class RegisterControllerTest {
.param("name","root1")) .param("name","root1"))
.andExpect(MockMvcResultMatchers.content().string("true")); .andExpect(MockMvcResultMatchers.content().string("true"));
} }
}*/ }

4
src/test/java/com/fjy/spring/controller/TestControllerTest.java
View File

@@ -11,7 +11,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/*
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest @SpringBootTest
@AutoConfigureMockMvc @AutoConfigureMockMvc
@@ -39,4 +39,4 @@ public class TestControllerTest {
mvc.perform(MockMvcRequestBuilders.get("/test/id/1")) mvc.perform(MockMvcRequestBuilders.get("/test/id/1"))
.andExpect(MockMvcResultMatchers.status().isOk()); .andExpect(MockMvcResultMatchers.status().isOk());
} }
}*/ }