实现文件上传和数据库记录、Element+vue登录注册UI

src/main/java/com/fjy/spring/controller/DownLoadController.java

@@ -0,0 +1,94 @@
+package com.fjy.spring.controller;
+
+import com.fjy.spring.domain.TbFile;
+import com.fjy.spring.enums.ResultEnum;
+import com.fjy.spring.exception.UserException;
+import com.fjy.spring.service.FileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.List;
+
+@Controller
+public class DownLoadController {
+    @Autowired
+    private FileService fileService;
+
+    @GetMapping("/download")
+    public String toDownloadPage(){
+        return "download";
+    }
+
+    @GetMapping("/download/findall")
+    @ResponseBody
+    public List<TbFile> toDownloadAll(){
+        List<TbFile> files = fileService.findAllFile();//此处做空指针判断并抛出错误
+        if (files!=null)
+            return files;
+        new UserException(ResultEnum.EMPTY_DATA);
+        return null;
+    }
+
+    @RequestMapping("/download/dodownload")
+    public String download(@RequestParam String fileName , HttpServletRequest request, HttpServletResponse response){
+
+        response.setContentType("text/html;charset=utf-8");
+        try {
+            request.setCharacterEncoding("UTF-8");
+        } catch (UnsupportedEncodingException e1) {
+            e1.printStackTrace();
+        }
+        java.io.BufferedInputStream bis = null;
+        java.io.BufferedOutputStream bos = null;
+
+        TbFile file = new TbFile();
+        file.setColfilename(fileName);
+
+        TbFile tbFile = fileService.findFile(file);
+
+        System.out.println(tbFile.getColfilepath());
+
+        String ctxPath = tbFile.getColfilepath();
+        String downLoadPath = ctxPath + fileName;
+        System.out.println(downLoadPath);
+        try {
+            long fileLength = new File(downLoadPath).length();
+            response.setContentType("application/x-msdownload;");
+            response.setHeader("Content-disposition", "attachment; filename=" + new String(fileName.getBytes("utf-8"), "ISO8859-1"));
+            response.setHeader("Content-Length", String.valueOf(fileLength));
+            bis = new BufferedInputStream(new FileInputStream(downLoadPath));
+            bos = new BufferedOutputStream(response.getOutputStream());
+            byte[] buff = new byte[2048];
+            int bytesRead;
+            while (-1 != (bytesRead = bis.read(buff, 0, buff.length))) {
+                bos.write(buff, 0, bytesRead);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (bis != null)
+                try {
+                    bis.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            if (bos != null)
+                try {
+                    bos.close();
+                } catch (IOException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+        }
+        return null;
+
+    }
+}

src/main/java/com/fjy/spring/controller/LoginController.java

@@ -21,7 +21,7 @@ public class LoginController {
     @PostMapping("/login/dologin")
     public String doLogin(TbUser tbUser)throws Exception{
         if (userService.doLoginService(tbUser.getColname(),tbUser.getColpassword())){
-            return "home";
+            return "/home/home";
         }
         return "login";
     }

src/main/java/com/fjy/spring/controller/RegisterController.java

@@ -0,0 +1,34 @@
+package com.fjy.spring.controller;
+
+import com.fjy.spring.domain.TbUser;
+import com.fjy.spring.enums.ResultEnum;
+import com.fjy.spring.exception.UserException;
+import com.fjy.spring.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import javax.validation.Valid;
+
+@Controller
+public class RegisterController {
+
+    @Autowired
+    private UserService userService;
+
+    @PostMapping(value = "/register/doregister")
+    public String doRegister(@Valid TbUser tbUser, BindingResult bindingResult)throws Exception{
+        if (bindingResult.hasErrors()){
+            ResultEnum resultEnum = ResultEnum.WRONG_FORM;
+            resultEnum.setData(bindingResult.getFieldError().getDefaultMessage());
+            throw new UserException(resultEnum);
+        }
+        if (userService.doRegisterService(tbUser)){
+            return "login";
+        }
+        throw new UserException(ResultEnum.UNKOWN_ERROR);
+    }
+
+}

src/main/java/com/fjy/spring/controller/UpLoadController.java

@@ -0,0 +1,175 @@
+package com.fjy.spring.controller;
+
+import com.fjy.spring.domain.TbFile;
+import com.fjy.spring.properties.ServerProperties;
+import com.fjy.spring.service.FileService;
+import com.fjy.spring.untils.FormatFileSizeUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+public class UpLoadController {
+
+    @Autowired
+    private ServerProperties serverProperties;//服务器配置信息
+
+    @Autowired
+    private FileService fileService;//文件相关数据库操作
+
+    @GetMapping("/toOneUpload")
+    public String toOneUpload() {
+        return "oneUpload";
+    }
+
+    @GetMapping("/toMoreUpload")
+    public String toMoreUpload() {
+        return "moreUpload";
+    }
+
+    /**
+     * 测试文件上传路径地址
+     *
+     * @param imageFile
+     * @param request
+     * @return
+     */
+    @RequestMapping("/test")
+    @ResponseBody
+    public String testURL(@RequestParam("imageFile") MultipartFile imageFile, HttpServletRequest request) {
+        String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/";
+        return uploadUrl;
+    }
+
+    /**
+     * 单文件上传
+     *
+     * @param imageFile
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/oneUpload")
+    public String oneUpload(@RequestParam("imageFile") MultipartFile imageFile, HttpServletRequest request) {
+
+        String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/";
+        String filename = imageFile.getOriginalFilename();
+        File dir = new File(uploadUrl);
+        if (!dir.exists()) {//判断目录是否存在，否则自动创建
+            dir.mkdirs();
+        }
+        /**
+         * 存储文件信息
+         */
+        TbFile file = new TbFile();
+        file.setColfilesize(new FormatFileSizeUtil().GetFileSize(imageFile.getSize()));
+        file.setColfilename(filename);
+        file.setColfilepath(uploadUrl + filename);
+        file.setColip(request.getRemoteAddr());
+
+        if (fileService.addFile(file))
+            System.out.println("记录写入数据库成功");
+        else
+            System.out.println("记录写入数据库失败");
+
+        System.out.println("文件上传到: " + uploadUrl + filename);
+        System.out.println("文件大小: " + new FormatFileSizeUtil().GetFileSize(imageFile.getSize()));
+        System.out.println("文件名: " + filename);
+
+        File targetFile = new File(uploadUrl + filename);
+        if (!targetFile.exists()) {
+            try {
+                targetFile.createNewFile();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            imageFile.transferTo(targetFile);
+        } catch (IllegalStateException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return "redirect:" + request.getScheme() + "://" + request.getServerName() + ":"
+                + serverProperties.getPortNum() + request.getContextPath() + "/upload/" + filename;
+        //return "redirect:http://localhost:8080/cms/upload/" + filename;
+        // return "index";
+    }
+
+    /**
+     * 多文件上传
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/moreUpload")
+    public String moreUpload(HttpServletRequest request) {
+
+        MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> files = multipartHttpServletRequest.getFileMap();
+
+        String uploadUrl = request.getSession().getServletContext().getRealPath("/") + "upload/";
+
+
+        File dir = new File(uploadUrl);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        List<String> fileList = new ArrayList<String>();
+
+        for (MultipartFile file : files.values()) {
+            File targetFile = new File(uploadUrl + file.getOriginalFilename());
+
+
+            TbFile tbFile = new TbFile();
+            tbFile.setColfilesize(new FormatFileSizeUtil().GetFileSize(file.getSize()));
+            tbFile.setColfilename(file.getName());
+            tbFile.setColfilepath(uploadUrl + file.getName());
+            tbFile.setColip(request.getRemoteAddr());
+
+            if (fileService.addFile(tbFile))
+                System.out.println("记录写入数据库成功");
+            else
+                System.out.println("记录写入数据库失败");
+
+            if (!targetFile.exists()) {
+                try {
+                    targetFile.createNewFile();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
+                try {
+                    file.transferTo(targetFile);
+                    fileList.add(
+                            request.getScheme() + "://" + request.getServerName() + ":"
+                                    + serverProperties.getPortNum() + request.getContextPath() + "/upload/"
+                                    + file.getOriginalFilename());
+                } catch (IllegalStateException e) {
+                    e.printStackTrace();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }
+
+        request.setAttribute("files", fileList);
+
+        return "moreUploadResult";
+    }
+}

src/main/java/com/fjy/spring/domain/TbFile.java

@@ -0,0 +1,93 @@
+package com.fjy.spring.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+@Entity
+public class TbFile {
+    @Id
+    @GeneratedValue
+    private int colfileid;
+
+    private int coluserid;
+
+    //private String coltime;
+
+    private String colip;
+
+    private String colrealname;
+
+    private String colfilename;
+
+    private String colfilesize;
+
+    private String colfilepath;
+
+    @Override
+    public String toString() {
+        return "TbFile{" +
+                "colip='" + colip + '\'' +
+                ", colrealname='" + colrealname + '\'' +
+                ", colfilename='" + colfilename + '\'' +
+                ", colfilesize='" + colfilesize + '\'' +
+                ", colfilepath='" + colfilepath + '\'' +
+                '}';
+    }
+
+    public int getColfileid() {
+        return colfileid;
+    }
+
+    public void setColfileid(int colfileid) {
+        this.colfileid = colfileid;
+    }
+
+    public int getColuserid() {
+        return coluserid;
+    }
+
+    public void setColuserid(int coluserid) {
+        this.coluserid = coluserid;
+    }
+
+    public String getColip() {
+        return colip;
+    }
+
+    public void setColip(String colip) {
+        this.colip = colip;
+    }
+
+    public String getColrealname() {
+        return colrealname;
+    }
+
+    public void setColrealname(String colrealname) {
+        this.colrealname = colrealname;
+    }
+
+    public String getColfilename() {
+        return colfilename;
+    }
+
+    public void setColfilename(String colfilename) {
+        this.colfilename = colfilename;
+    }
+
+    public String getColfilesize() {
+        return colfilesize;
+    }
+
+    public void setColfilesize(String colfilesize) {
+        this.colfilesize = colfilesize;
+    }
+
+    public String getColfilepath() {
+        return colfilepath;
+    }
+
+    public void setColfilepath(String colfilepath) {
+        this.colfilepath = colfilepath;
+    }
+}

src/main/java/com/fjy/spring/domain/TbUser.java

@@ -2,17 +2,21 @@ package com.fjy.spring.domain;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.validation.constraints.NotNull;
 
 @Entity
 public class TbUser {
     @Id
     @GeneratedValue
     private Integer coluserid;
-
+    @NotNull(message = "用户名必填")
     private String colname;
+    @NotNull(message = "密码不能为空")
     private String colpassword;
     private String colemail;
+    @NotNull(message = "学号必填")
     private String colstudentno;
+    @NotNull(message = "真实姓名必填")
     private String colrealname;
 
     public Integer getColuserid() {

src/main/java/com/fjy/spring/enums/ResultEnum.java

@@ -8,10 +8,13 @@ public enum ResultEnum {
     DELETE_ERROR(103,"删除失败"),
     ADD_ERROR(104,"添加失败"),
     WRONGPASS(105,"用户名或密码错误"),
-    ILLEGAL_ACCESS(106,"非法访问")
+    ILLEGAL_ACCESS(106,"非法访问"),
+    WRONG_FORM(107,"表单错误"),
+    EMPTY_DATA(108,"无数据")
     ;
     private Integer code;
     private String msg;
+    private String data;
 
     public Integer getCode() {
         return code;
@@ -21,6 +24,15 @@ public enum ResultEnum {
         return msg;
     }
 
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public String getData() {
+        return data;
+
+    }
+
     ResultEnum(Integer code, String msg) {
         this.code = code;
         this.msg = msg;

src/main/java/com/fjy/spring/properties/ServerProperties.java

@@ -0,0 +1,18 @@
+package com.fjy.spring.properties;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "serverproperties")
+public class ServerProperties {
+    private String portNum;
+
+    public String getPortNum() {
+        return portNum;
+    }
+
+    public void setPortNum(String portNum) {
+        this.portNum = portNum;
+    }
+}

src/main/java/com/fjy/spring/repository/TbFileRepository.java

@@ -0,0 +1,10 @@
+package com.fjy.spring.repository;
+
+import com.fjy.spring.domain.TbFile;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface TbFileRepository extends JpaRepository<TbFile,Integer>{
+    public Optional<TbFile> findByColfilename(String name);
+}

src/main/java/com/fjy/spring/service/FileService.java

@@ -0,0 +1,35 @@
+package com.fjy.spring.service;
+
+import com.fjy.spring.domain.TbFile;
+import com.fjy.spring.repository.TbFileRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class FileService {
+    @Autowired
+    private TbFileRepository tbFileRepository;
+
+    public boolean addFile(TbFile tbFile) {
+        TbFile file = tbFileRepository.save(tbFile);
+        if (file != null)
+            return true;
+        return false;
+    }
+
+    public TbFile findFile(TbFile tbFile){
+        TbFile file = (TbFile) tbFileRepository.findByColfilename(tbFile.getColfilename()).get();
+        if (file!=null)
+            return file;
+        return null;
+    }
+
+    public List<TbFile> findAllFile(){
+        return tbFileRepository.findAll();
+    }
+
+
+
+}

src/main/java/com/fjy/spring/service/UserService.java

@@ -7,6 +7,7 @@ import com.fjy.spring.repository.TbUserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
 @Service
 public class UserService {
 
@@ -16,9 +17,23 @@ public class UserService {
 
     public boolean doLoginService(String name,String password){
         TbUser user = (TbUser)tbUserRepository.findByColname(name).get();
+        if (user!=null){
             if (password.equals(user.getColpassword())){
                 return true;
+            }else {
+                throw new UserException(ResultEnum.WRONGPASS);
             }
+        }else {
             throw new UserException(ResultEnum.USER_NOTEXIST);
         }
+    }
+
+    public boolean doRegisterService(TbUser tbUser){
+
+        TbUser user = tbUserRepository.save(tbUser);
+        if (user!=null){
+            throw new UserException(ResultEnum.SUCCESS);
+        }
+        return false;
+    }
 }

src/main/java/com/fjy/spring/untils/FormatFileSizeUtil.java

@@ -0,0 +1,25 @@
+package com.fjy.spring.untils;
+
+import java.text.DecimalFormat;
+
+public class FormatFileSizeUtil {
+    public static String GetFileSize(long sizes){
+        String size = "";
+        if(sizes!=0){
+            long fileS = sizes;
+            DecimalFormat df = new DecimalFormat("#.00");
+            if (fileS < 1024) {
+                size = df.format((double) fileS) + "BT";
+            } else if (fileS < 1048576) {
+                size = df.format((double) fileS / 1024) + "KB";
+            } else if (fileS < 1073741824) {
+                size = df.format((double) fileS / 1048576) + "MB";
+            } else {
+                size = df.format((double) fileS / 1073741824) +"GB";
+            }
+        }else{
+            size = "非法!";
+        }
+        return size;
+    }
+}

src/main/java/com/fjy/spring/untils/ResultUtil.java

@@ -9,4 +9,11 @@ public class ResultUtil {
         result.setMessage(msg);
         return result;
     }
+    public static Result error(Integer code,String msg,Object data){
+        Result result = new Result();
+        result.setCode(code);
+        result.setMessage(msg);
+        result.setData(data);
+        return result;
+    }
 }

src/main/resources/application-dev.yml

@@ -3,6 +3,8 @@ server:
   servlet:
     context-path: /cms
   port: 8080
+serverproperties:
+  port_num: 8080
 spring:
   thymeleaf:
     prefix: classpath:/templates/
@@ -16,4 +18,7 @@ spring:
     hibernate:
       ddl-auto: update
     show-sql: true
+  resources:
+    static-locations: classpath:/templates/
 debug: true
+

src/main/resources/templates/home.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>主页</title>
-</head>
-<body>
-<center>
-    <h1>欢迎访问主页</h1>
-</center>
-</body>
-</html>

src/main/resources/templates/home/home.html

@@ -0,0 +1,75 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>主页</title>
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="../dist/css/style.css">
+</head>
+<body>
+<!-- 先引入 Vue -->
+<script src="https://unpkg.com/vue/dist/vue.js"></script>
+<!-- 引入组件库 -->
+<script src="https://unpkg.com/element-ui/lib/index.js"></script>
+<div id="app">
+    <el-container>
+        <el-aside width="200px">
+            <el-row class="tac">
+                <el-col :span="24">
+                    <h5>默认颜色</h5>
+                    <el-menu default-active="2" class="el-menu-vertical-demo" @open="handleOpen" @close="handleClose">
+                        <el-submenu index="1">
+                            <template slot="title">
+                                <i class="el-icon-location"></i>
+                                <span>导航一</span>
+                            </template>
+                            <el-menu-item-group>
+                                <template slot="title">分组一</template>
+                                <el-menu-item index="1-1">选项1</el-menu-item>
+                                <el-menu-item index="1-2">选项2</el-menu-item>
+                            </el-menu-item-group>
+                            <el-menu-item-group title="分组2">
+                                <el-menu-item index="1-3">选项3</el-menu-item>
+                            </el-menu-item-group>
+                            <el-submenu index="1-4">
+                                <template slot="title">选项4</template>
+                                <el-menu-item index="1-4-1">选项1</el-menu-item>
+                            </el-submenu>
+                        </el-submenu>
+                        <el-menu-item index="2">
+                            <i class="el-icon-menu"></i>
+                            <span slot="title">导航二</span>
+                        </el-menu-item>
+                        <el-menu-item index="3">
+                            <i class="el-icon-setting"></i>
+                            <span slot="title">导航三</span>
+                        </el-menu-item>
+                    </el-menu>
+                </el-col>
+            </el-row>
+        </el-aside>
+        <el-container>
+            <el-header>
+                <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+                    <el-menu-item index="1">处理中心</el-menu-item>
+                    <el-submenu index="2">
+                        <template slot="title">我的工作台</template>
+                        <el-menu-item index="2-1">选项1</el-menu-item>
+                        <el-menu-item index="2-2">选项2</el-menu-item>
+                        <el-menu-item index="2-3">选项3</el-menu-item>
+                    </el-submenu>
+                    <el-menu-item index="3"><a href="index">登出</a></el-menu-item>
+                </el-menu>
+            </el-header>
+            <el-main>
+                <!-- <template>
+                     <el-button :plain="true" @click="open">成功</el-button>
+                 </template>-->
+            </el-main>
+        </el-container>
+    </el-container>
+</div>
+<script src="../dist/js/homePage.js"></script>
+<script src="../dist/js/msg.js"></script>
+</body>
+</html>

src/main/resources/templates/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>导航</title>
+</head>
+<body>
+<a href="toOneUpload">单文件上传</a><br><br>
+<a href="toMoreUpload">多文件上传</a><br><br>
+<a href="login">登录</a><br><br>
+<a href="register">注册</a><br><br>
+<!--<a href="download.html?fileName=1.jpg">文件下载 1.jpg (请确保文件存在)</a><br><br>-->
+</body>
+</html>

src/main/resources/templates/login.html

@@ -3,9 +3,102 @@
 <head>
     <meta charset="UTF-8">
     <title>登录</title>
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
+    <link rel="stylesheet" href="dist/css/style.css">
 </head>
+
 <body>
-<center>
+<!-- 先引入 Vue -->
+<script src="https://unpkg.com/vue/dist/vue.js"></script>
+<!-- 引入组件库 -->
+<script src="https://unpkg.com/element-ui/lib/index.js"></script>
+<div id="app">
+    <el-row type="flex" class="row-bg" justify="center">
+        <el-col
+                :md="12" :lg="12" :xl="12">
+            <div class="grid-content bg-purple">
+                <h2>登录系统</h2>
+            </div>
+        </el-col>
+    </el-row>
+    <el-row type="flex" class="row-bg" justify="center">
+        <el-col
+                :md="12" :lg="12" :xl="12">
+            <div class="grid-content bg-purple">
+                <template>
+                    <el-tabs v-model="activeName"
+                             @tab-click="handleClick">
+                        <el-tab-pane label="登录"
+                                     name="login">
+                            <el-form :model="ruleForm2" status-icon
+                                     :rules="rules2" ref="ruleForm2" label-width="100px"
+                                     class="demo-ruleForm"
+                                     action="/cms/login/dologin"
+                                     method="POST" name="loginTest">
+                                <el-form-item label="用户名"
+                                              prop="userName">
+                                    <el-input
+                                            v-model="ruleForm2.userName" name="colname"></el-input>
+                                </el-form-item>
+                                <el-form-item
+                                        label="密码" prop="pass">
+                                    <el-input type="password"
+                                              v-model="ruleForm2.pass" auto-complete="off" name="colpassword"></el-input>
+                                </el-form-item>
+                                <el-form-item>
+                                    <el-button type="primary"
+                                               native-type="submit">提交
+                                    </el-button>
+                                    <el-button @click="resetForm('ruleForm2')">重置</el-button>
+                                </el-form-item>
+                            </el-form>
+                        </el-tab-pane>
+                        <el-tab-pane
+                                label="注册" name="register">
+                            <el-form
+                                    :model="ruleForm2" status-icon :rules="rules2" ref="ruleForm2"
+                                    label-width="100px" class="demo-ruleForm"
+                                    action="/cms/register/doregister"
+                                    method="POST" name="loginTest">
+                                <el-form-item label="用户名"
+                                              prop="userName">
+                                    <el-input
+                                            v-model="ruleForm2.userName" name="userName"></el-input>
+                                </el-form-item>
+                                <el-form-item
+                                        label="密码" prop="pass">
+                                    <el-input type="password"
+                                              v-model="ruleForm2.pass" auto-complete="off" name="passWord"></el-input>
+                                </el-form-item>
+                                <el-form-item label="确认密码" prop="checkPass">
+                                    <el-input
+                                            type="password" v-model="ruleForm2.checkPass"
+                                            auto-complete="off"></el-input>
+                                </el-form-item>
+                                <el-form-item prop="email" label="邮箱"
+                                              :rules="[
+      { required: true, message: '请输入邮箱地址', trigger: 'blur' },
+      { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur,change' }
+    ]">
+                                    <el-input v-model="ruleForm2.email"></el-input>
+                                </el-form-item>
+                                <el-form-item>
+                                    <el-button type="primary"
+                                               native-type="submit">提交
+                                    </el-button>
+                                    <el-button @click="resetForm('ruleForm2')">重置</el-button>
+                                </el-form-item>
+                            </el-form>
+                        </el-tab-pane>
+                    </el-tabs>
+                </template>
+            </div>
+        </el-col>
+    </el-row>
+</div>
+<script src="./dist/js/LoginStyle.js"></script>
+<!--<body>
+&lt;!&ndash;<center>
     <h1>登录系统</h1>
     <form action="/cms/login/dologin" method="post">
         <p>用户名：
@@ -13,7 +106,7 @@
         <p>密码：
             <input type="password" name="colpassword"></p>
         <input type="submit" value="登录">
-</center>
+</center>&ndash;&gt;
-</form>
+</form>-->
 </body>
 </html>

src/main/resources/templates/moreUpload.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>多文件 上传 </title>
+</head>
+<body>
+<div style="margin: 0 auto;margin-top: 100px; ">
+
+    <form action="/cms/moreUpload.html" method="post" enctype="multipart/form-data">
+        <p>
+            <span>文件1：</span>
+            <input type="file" name="imageFile1">
+        </p>
+        <p>
+            <span>文件2：</span>
+            <input type="file" name="imageFile2">
+        </p>
+        <p>
+            <input type="submit">
+        </p>
+    </form>
+
+</div>
+</body>
+</html>

src/main/resources/templates/moreUploadResult.jsp

@@ -0,0 +1,28 @@
+<%@page import="java.util.List"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>多文件 上传结果 </title>
+</head>
+<body>
+
+	<div style="margin: 0 auto;margin-top: 100px; ">
+	
+		<%
+		List<String> fileList = (List)request.getAttribute("files");
+		for(String url : fileList){
+			%>
+			<a href="<%=url %>">
+				<img alt="" src="<%=url %>">
+			</a>
+			<%
+		}
+		%>
+	
+	</div>
+
+</body>
+</html>

src/main/resources/templates/oneUpload.html

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>单文件 上传 </title>
+</head>
+<body>
+<div style="margin: 0 auto;margin-top: 100px; ">
+    <form action="/cms/test" method="post" enctype="multipart/form-data">
+        <p>
+            <span>文件路径测试：</span>
+            <input type="file" name="imageFile">
+        </p>
+        <p>
+            <input type="submit">
+        </p>
+    </form>
+
+    <form action="/cms/oneUpload" method="post" enctype="multipart/form-data">
+        <p>
+            <span>文件：</span>
+            <input type="file" name="imageFile">
+        </p>
+        <p>
+            <input type="submit">
+        </p>
+    </form>
+
+</div>
+</body>
+</html>

src/test/java/com/fjy/spring/controller/LoginControllerTest.java

@@ -28,12 +28,14 @@ public class LoginControllerTest {
 
     @Test
     public void doLogin() throws Exception {
+        //测试正常登录
         mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "root"))
                 .andExpect(MockMvcResultMatchers.status().isOk());
+        //测试密码错误
         mvc.perform(MockMvcRequestBuilders.post("/login/dologin").param("colname", "root").param("colpassword", "123"))
                 .andExpect(MockMvcResultMatchers.content().json("{\n" +
-                        "    \"code\": 101,\n" +
+                        "    \"code\": 105,\n" +
-                        "    \"message\": \"用户不存在\",\n" +
+                        "    \"message\": \"用户名或密码错误\",\n" +
                         "    \"data\": null\n" +
                         "}"));
     }

src/test/java/com/fjy/spring/controller/RegisterControllerTest.java

@@ -0,0 +1,38 @@
+package com.fjy.spring.controller;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import static org.junit.Assert.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc
+public class RegisterControllerTest {
+
+    @Autowired
+    private MockMvc mvc;
+
+    @Test
+    public void doRegister()throws Exception {
+        //测试正常注册,abc每次调试必须改，因为唯一约束
+        mvc.perform(MockMvcRequestBuilders.post("/register/doregister")
+                .param("colname", "abc")
+                .param("colpassword", "123456")
+                .param("colemail","test@gmail.com")
+                .param("colstudentno","0003")
+                .param("colrealname","TestRegister"))
+                .andExpect(MockMvcResultMatchers.content().json("{\n" +
+                        "    \"code\": 0,\n" +
+                        "    \"message\": \"请求成功\",\n" +
+                        "    \"data\": null\n" +
+                        "}"));
+    }
+}