1、完善反馈控制器逻辑；

2、添加Web文件服务映射配置；
3、添加日志模块和日志实现类；
4、添加服务IP追踪；
5、重新配置数据库用户名和密码；
6、变更打包方式为‘war’。

pom.xml

@@ -35,6 +35,7 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <!-- Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -67,7 +68,7 @@
             <version>1.5.7.RELEASE</version>
         </dependency>
 
-        <!-- websocket -->
+        <!-- WebSocket -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>

src/main/java/cn/minbb/evaluationsystemserver/EvaluationSystemServerApplication.java → src/main/java/cn/minbb/evaluation/EvaluationSystemServerApplication.java

@@ -1,7 +1,7 @@
-package cn.minbb.evaluationsystemserver;
+package cn.minbb.evaluation;
 
-import cn.minbb.evaluationsystemserver.stroage.StorageProperties;
-import cn.minbb.evaluationsystemserver.stroage.StorageService;
+import cn.minbb.evaluation.stroage.StorageProperties;
+import cn.minbb.evaluation.stroage.StorageService;
 import org.springframework.boot.Banner;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
@@ -15,17 +15,17 @@ import org.springframework.context.annotation.Bean;
 @EnableConfigurationProperties(StorageProperties.class)
 public class EvaluationSystemServerApplication extends SpringBootServletInitializer {
 
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        return builder.sources(EvaluationSystemServerApplication.class);
-    }
-
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(EvaluationSystemServerApplication.class);
         springApplication.setBannerMode(Banner.Mode.CONSOLE);
         springApplication.run(args);
     }
 
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(EvaluationSystemServerApplication.class);
+    }
+
     @Bean
     CommandLineRunner init(StorageService storageService) {
         return args -> storageService.init();

src/main/java/cn/minbb/evaluationsystemserver/controller/WebFileConfiguration.java → src/main/java/cn/minbb/evaluation/config/WebFileConfiguration.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.controller;
+package cn.minbb.evaluation.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;

src/main/java/cn/minbb/evaluationsystemserver/controller/FeedbackController.java → src/main/java/cn/minbb/evaluation/controller/FeedbackController.java

@@ -1,11 +1,11 @@
-package cn.minbb.evaluationsystemserver.controller;
+package cn.minbb.evaluation.controller;
 
-import cn.minbb.evaluationsystemserver.entity.Feedback;
-import cn.minbb.evaluationsystemserver.entity.User;
-import cn.minbb.evaluationsystemserver.service.FeedbackService;
-import cn.minbb.evaluationsystemserver.service.UserService;
-import cn.minbb.evaluationsystemserver.util.ResponseMap;
-import cn.minbb.evaluationsystemserver.util.Result;
+import cn.minbb.evaluation.entity.Feedback;
+import cn.minbb.evaluation.entity.User;
+import cn.minbb.evaluation.service.FeedbackService;
+import cn.minbb.evaluation.service.UserService;
+import cn.minbb.evaluation.util.ResponseMap;
+import cn.minbb.evaluation.util.Result;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/cn/minbb/evaluationsystemserver/controller/MainController.java → src/main/java/cn/minbb/evaluation/controller/MainController.java

@@ -1,7 +1,7 @@
-package cn.minbb.evaluationsystemserver.controller;
+package cn.minbb.evaluation.controller;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
-import cn.minbb.evaluationsystemserver.service.ClassificationService;
+import cn.minbb.evaluation.entity.Classification;
+import cn.minbb.evaluation.service.ClassificationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;

src/main/java/cn/minbb/evaluationsystemserver/controller/ServerController.java → src/main/java/cn/minbb/evaluation/controller/ServerController.java

@@ -1,9 +1,9 @@
-package cn.minbb.evaluationsystemserver.controller;
+package cn.minbb.evaluation.controller;
 
-import cn.minbb.evaluationsystemserver.entity.*;
-import cn.minbb.evaluationsystemserver.service.*;
-import cn.minbb.evaluationsystemserver.util.ResponseMap;
-import cn.minbb.evaluationsystemserver.util.Result;
+import cn.minbb.evaluation.entity.*;
+import cn.minbb.evaluation.service.*;
+import cn.minbb.evaluation.util.ResponseMap;
+import cn.minbb.evaluation.util.Result;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
@@ -95,8 +95,8 @@ public class ServerController {
         ResponseMap responseMap = new ResponseMap();
         responseMap.putResult(Result.SUCCESS);
         responseMap.putSummary("查找成功");
-        List<cn.minbb.evaluationsystemserver.entity.Classification> classificationList = classificationService.findEnabledClassification();
-        for (cn.minbb.evaluationsystemserver.entity.Classification classification : classificationList) {
+        List<cn.minbb.evaluation.entity.Classification> classificationList = classificationService.findEnabledClassification();
+        for (cn.minbb.evaluation.entity.Classification classification : classificationList) {
             classification.setQuestionList(null);
         }
         responseMap.putData(classificationList);

src/main/java/cn/minbb/evaluationsystemserver/controller/UserController.java → src/main/java/cn/minbb/evaluation/controller/UserController.java

@@ -1,13 +1,13 @@
-package cn.minbb.evaluationsystemserver.controller;
+package cn.minbb.evaluation.controller;
 
-import cn.minbb.evaluationsystemserver.entity.Logs;
-import cn.minbb.evaluationsystemserver.entity.User;
-import cn.minbb.evaluationsystemserver.service.LogsService;
-import cn.minbb.evaluationsystemserver.service.UserService;
-import cn.minbb.evaluationsystemserver.stroage.StorageService;
-import cn.minbb.evaluationsystemserver.util.IPUtils;
-import cn.minbb.evaluationsystemserver.util.ResponseMap;
-import cn.minbb.evaluationsystemserver.util.Result;
+import cn.minbb.evaluation.entity.Logs;
+import cn.minbb.evaluation.entity.User;
+import cn.minbb.evaluation.service.LogsService;
+import cn.minbb.evaluation.service.UserService;
+import cn.minbb.evaluation.stroage.StorageService;
+import cn.minbb.evaluation.util.IPUtils;
+import cn.minbb.evaluation.util.ResponseMap;
+import cn.minbb.evaluation.util.Result;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +39,7 @@ public class UserController {
     }
 
     @GetMapping(value = "/login")
-    @ResponseBody
+    // @ResponseBody
     public String loginIndex() {
         return "login";
     }
@@ -110,11 +110,6 @@ public class UserController {
                 responseMap.putSummary("身份验证通过");
                 // 加密密码
                 // user.setPassword("******");
-                // Avatar URL
-                String userAvatar = user.getAvatar();
-                if (userAvatar != null) {
-                    user.setAvatar(USER_AVATAR_URL + userAvatar);
-                }
                 responseMap.putData(user);
                 logsService.save(new Logs("用户登录", "登陆成功", user, IPUtils.getIPAddress(request)));
             } else {
@@ -248,13 +243,4 @@ public class UserController {
         System.out.println(s);
         return "ok";
     }
-
-    @PostMapping(value = "/add", produces = "text/plain; charset=UTF-8")
-    public String handleAddHeroPage(
-            @RequestParam("name") String name,
-            @RequestParam("category") String category,
-            @RequestParam("picture") MultipartFile picture) {
-        storageService.store(picture);
-        return "redirect:/";
-    }
 }

src/main/java/cn/minbb/evaluationsystemserver/entity/Answer.java → src/main/java/cn/minbb/evaluation/entity/Answer.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Classification.java → src/main/java/cn/minbb/evaluation/entity/Classification.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Feedback.java → src/main/java/cn/minbb/evaluation/entity/Feedback.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Logs.java → src/main/java/cn/minbb/evaluation/entity/Logs.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -22,12 +22,12 @@ public class Logs {
 
     @Getter
     @Setter
-    @Column(name = "action", nullable = false, columnDefinition = "VARCHAR(64) COMMENT '产生的动作'")
+    @Column(name = "action", nullable = false, columnDefinition = "VARCHAR(255) COMMENT '产生的动作'")
     private String action;
 
     @Getter
     @Setter
-    @Column(name = "data", nullable = false, columnDefinition = "VARCHAR(64) COMMENT '产生的数据'")
+    @Column(name = "data", nullable = false, columnDefinition = "VARCHAR(255) COMMENT '产生的数据'")
     private String data;
 
     @Getter
@@ -38,7 +38,7 @@ public class Logs {
 
     @Getter
     @Setter
-    @Column(name = "ip", nullable = false, columnDefinition = "VARCHAR(64) COMMENT '日志产生的IP'")
+    @Column(name = "ip", nullable = false, columnDefinition = "VARCHAR(16) COMMENT '日志产生的IP'")
     private String ip;
 
     @Getter

src/main/java/cn/minbb/evaluationsystemserver/entity/Message.java → src/main/java/cn/minbb/evaluation/entity/Message.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Paper.java → src/main/java/cn/minbb/evaluation/entity/Paper.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Question.java → src/main/java/cn/minbb/evaluation/entity/Question.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/Reply.java → src/main/java/cn/minbb/evaluation/entity/Reply.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/User.java → src/main/java/cn/minbb/evaluation/entity/User.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -115,7 +115,7 @@ public class User {
     @Getter
     @Setter
     @OneToMany(cascade = {CascadeType.REFRESH}, mappedBy = "user", fetch = FetchType.LAZY)
-    // 试卷（列表）
+    // 日志（列表）
     private List<Logs> logsList;
 
     @Getter

src/main/java/cn/minbb/evaluationsystemserver/entity/Version.java → src/main/java/cn/minbb/evaluation/entity/Version.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.entity;
+package cn.minbb.evaluation.entity;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/AnswerRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/AnswerRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Answer;
+import cn.minbb.evaluation.entity.Answer;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AnswerRepository extends JpaRepository<Answer, Long> {

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/ClassificationRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/ClassificationRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
+import cn.minbb.evaluation.entity.Classification;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/FeedbackRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/FeedbackRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Feedback;
+import cn.minbb.evaluation.entity.Feedback;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FeedbackRepository extends JpaRepository<Feedback, Long> {

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/LogsRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/LogsRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Logs;
+import cn.minbb.evaluation.entity.Logs;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface LogsRepository extends JpaRepository<Logs, Long> {

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/MessageRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/MessageRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Message;
+import cn.minbb.evaluation.entity.Message;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MessageRepository extends JpaRepository<Message, Long> {

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/PaperRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/PaperRepository.java

@@ -1,7 +1,7 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Paper;
-import cn.minbb.evaluationsystemserver.entity.User;
+import cn.minbb.evaluation.entity.Paper;
+import cn.minbb.evaluation.entity.User;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/QuestionRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/QuestionRepository.java

@@ -1,7 +1,7 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
-import cn.minbb.evaluationsystemserver.entity.Question;
+import cn.minbb.evaluation.entity.Classification;
+import cn.minbb.evaluation.entity.Question;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/UserRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/UserRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.User;
+import cn.minbb.evaluation.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserRepository extends JpaRepository<User, Long> {

src/main/java/cn/minbb/evaluationsystemserver/entity/repository/VersionRepository.java → src/main/java/cn/minbb/evaluation/entity/repository/VersionRepository.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.entity.repository;
+package cn.minbb.evaluation.entity.repository;
 
-import cn.minbb.evaluationsystemserver.entity.Version;
+import cn.minbb.evaluation.entity.Version;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 

src/main/java/cn/minbb/evaluation/service/AnswerService.java

@@ -0,0 +1,7 @@
+package cn.minbb.evaluation.service;
+
+import cn.minbb.evaluation.entity.Answer;
+
+public interface AnswerService {
+    Answer findAnswerByE_Id(Long e_id);
+}

src/main/java/cn/minbb/evaluationsystemserver/service/ClassificationService.java → src/main/java/cn/minbb/evaluation/service/ClassificationService.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.service;
+package cn.minbb.evaluation.service;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
+import cn.minbb.evaluation.entity.Classification;
 
 import java.util.List;
 

src/main/java/cn/minbb/evaluation/service/FeedbackService.java

@@ -0,0 +1,7 @@
+package cn.minbb.evaluation.service;
+
+import cn.minbb.evaluation.entity.Feedback;
+
+public interface FeedbackService {
+    Feedback save(Feedback feedback);
+}

src/main/java/cn/minbb/evaluation/service/LogsService.java

@@ -0,0 +1,7 @@
+package cn.minbb.evaluation.service;
+
+import cn.minbb.evaluation.entity.Logs;
+
+public interface LogsService {
+    Logs save(Logs logs);
+}

src/main/java/cn/minbb/evaluation/service/MessageService.java

@@ -0,0 +1,7 @@
+package cn.minbb.evaluation.service;
+
+import cn.minbb.evaluation.entity.Message;
+
+public interface MessageService {
+    Message save(Message message);
+}

src/main/java/cn/minbb/evaluationsystemserver/service/PaperService.java → src/main/java/cn/minbb/evaluation/service/PaperService.java

@@ -1,7 +1,7 @@
-package cn.minbb.evaluationsystemserver.service;
+package cn.minbb.evaluation.service;
 
-import cn.minbb.evaluationsystemserver.entity.Paper;
-import cn.minbb.evaluationsystemserver.entity.User;
+import cn.minbb.evaluation.entity.Paper;
+import cn.minbb.evaluation.entity.User;
 
 import java.util.List;
 

src/main/java/cn/minbb/evaluation/service/QuestionService.java

@@ -0,0 +1,10 @@
+package cn.minbb.evaluation.service;
+
+import cn.minbb.evaluation.entity.Classification;
+import cn.minbb.evaluation.entity.Question;
+
+import java.util.List;
+
+public interface QuestionService {
+    List<Question> randomSelection(List<Classification> classificationList, int count);
+}

src/main/java/cn/minbb/evaluationsystemserver/service/UserService.java → src/main/java/cn/minbb/evaluation/service/UserService.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.service;
+package cn.minbb.evaluation.service;
 
-import cn.minbb.evaluationsystemserver.entity.User;
+import cn.minbb.evaluation.entity.User;
 
 public interface UserService {
     User findUserByUsername(String username);

src/main/java/cn/minbb/evaluationsystemserver/service/VersionService.java → src/main/java/cn/minbb/evaluation/service/VersionService.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.service;
+package cn.minbb.evaluation.service;
 
-import cn.minbb.evaluationsystemserver.entity.Version;
+import cn.minbb.evaluation.entity.Version;
 
 public interface VersionService {
     Version getLatestVersion();

src/main/java/cn/minbb/evaluationsystemserver/service/impl/AnswerServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/AnswerServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Answer;
-import cn.minbb.evaluationsystemserver.entity.repository.AnswerRepository;
-import cn.minbb.evaluationsystemserver.service.AnswerService;
+import cn.minbb.evaluation.entity.Answer;
+import cn.minbb.evaluation.entity.repository.AnswerRepository;
+import cn.minbb.evaluation.service.AnswerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/ClassificationServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/ClassificationServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
-import cn.minbb.evaluationsystemserver.entity.repository.ClassificationRepository;
-import cn.minbb.evaluationsystemserver.service.ClassificationService;
+import cn.minbb.evaluation.entity.Classification;
+import cn.minbb.evaluation.entity.repository.ClassificationRepository;
+import cn.minbb.evaluation.service.ClassificationService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;

src/main/java/cn/minbb/evaluationsystemserver/service/impl/FeedbackServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/FeedbackServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Feedback;
-import cn.minbb.evaluationsystemserver.entity.repository.FeedbackRepository;
-import cn.minbb.evaluationsystemserver.service.FeedbackService;
+import cn.minbb.evaluation.entity.Feedback;
+import cn.minbb.evaluation.entity.repository.FeedbackRepository;
+import cn.minbb.evaluation.service.FeedbackService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/LogsServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/LogsServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Logs;
-import cn.minbb.evaluationsystemserver.entity.repository.LogsRepository;
-import cn.minbb.evaluationsystemserver.service.LogsService;
+import cn.minbb.evaluation.entity.Logs;
+import cn.minbb.evaluation.entity.repository.LogsRepository;
+import cn.minbb.evaluation.service.LogsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/MessageServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/MessageServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Message;
-import cn.minbb.evaluationsystemserver.entity.repository.MessageRepository;
-import cn.minbb.evaluationsystemserver.service.MessageService;
+import cn.minbb.evaluation.entity.Message;
+import cn.minbb.evaluation.entity.repository.MessageRepository;
+import cn.minbb.evaluation.service.MessageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/PaperServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/PaperServiceImpl.java

@@ -1,10 +1,10 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Paper;
-import cn.minbb.evaluationsystemserver.entity.User;
-import cn.minbb.evaluationsystemserver.entity.repository.PaperRepository;
-import cn.minbb.evaluationsystemserver.service.PaperService;
-import cn.minbb.evaluationsystemserver.util.App;
+import cn.minbb.evaluation.entity.Paper;
+import cn.minbb.evaluation.entity.User;
+import cn.minbb.evaluation.entity.repository.PaperRepository;
+import cn.minbb.evaluation.service.PaperService;
+import cn.minbb.evaluation.util.App;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;

src/main/java/cn/minbb/evaluationsystemserver/service/impl/QuestionServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/QuestionServiceImpl.java

@@ -1,9 +1,9 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Classification;
-import cn.minbb.evaluationsystemserver.entity.Question;
-import cn.minbb.evaluationsystemserver.entity.repository.QuestionRepository;
-import cn.minbb.evaluationsystemserver.service.QuestionService;
+import cn.minbb.evaluation.entity.Classification;
+import cn.minbb.evaluation.entity.Question;
+import cn.minbb.evaluation.entity.repository.QuestionRepository;
+import cn.minbb.evaluation.service.QuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/UserServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/UserServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.User;
-import cn.minbb.evaluationsystemserver.entity.repository.UserRepository;
-import cn.minbb.evaluationsystemserver.service.UserService;
+import cn.minbb.evaluation.entity.User;
+import cn.minbb.evaluation.entity.repository.UserRepository;
+import cn.minbb.evaluation.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/service/impl/VersionServiceImpl.java → src/main/java/cn/minbb/evaluation/service/impl/VersionServiceImpl.java

@@ -1,8 +1,8 @@
-package cn.minbb.evaluationsystemserver.service.impl;
+package cn.minbb.evaluation.service.impl;
 
-import cn.minbb.evaluationsystemserver.entity.Version;
-import cn.minbb.evaluationsystemserver.entity.repository.VersionRepository;
-import cn.minbb.evaluationsystemserver.service.VersionService;
+import cn.minbb.evaluation.entity.Version;
+import cn.minbb.evaluation.entity.repository.VersionRepository;
+import cn.minbb.evaluation.service.VersionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/cn/minbb/evaluationsystemserver/stroage/FileList.java → src/main/java/cn/minbb/evaluation/stroage/FileList.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 public class FileList {
 

src/main/java/cn/minbb/evaluationsystemserver/stroage/StorageException.java → src/main/java/cn/minbb/evaluation/stroage/StorageException.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 public class StorageException extends RuntimeException {
 

src/main/java/cn/minbb/evaluationsystemserver/stroage/StorageFileNotFoundException.java → src/main/java/cn/minbb/evaluation/stroage/StorageFileNotFoundException.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 public class StorageFileNotFoundException extends StorageException {
 

src/main/java/cn/minbb/evaluationsystemserver/stroage/StorageProperties.java → src/main/java/cn/minbb/evaluation/stroage/StorageProperties.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

src/main/java/cn/minbb/evaluationsystemserver/stroage/StorageService.java → src/main/java/cn/minbb/evaluation/stroage/StorageService.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;

src/main/java/cn/minbb/evaluationsystemserver/stroage/StorageServiceFileSystem.java → src/main/java/cn/minbb/evaluation/stroage/StorageServiceFileSystem.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.stroage;
+package cn.minbb.evaluation.stroage;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;

src/main/java/cn/minbb/evaluationsystemserver/util/App.java → src/main/java/cn/minbb/evaluation/util/App.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.util;
+package cn.minbb.evaluation.util;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

src/main/java/cn/minbb/evaluation/util/DesEncryptDecrypt.java

@@ -0,0 +1,60 @@
+package cn.minbb.evaluation.util;
+
+import javax.crypto.Cipher;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+
+public class DesEncryptDecrypt {
+
+    private static DesEncryptDecrypt ourInstance = new DesEncryptDecrypt();
+
+    public static DesEncryptDecrypt getInstance() {
+        return ourInstance;
+    }
+
+    private Cipher ecipher, dcipher;
+
+    private DesEncryptDecrypt() {
+        DESKeySpec dks;
+        try {
+            // Constants.EncryptDecryptKEY是我一个常量类中的字符串而已，它就是加密解密的密钥。请自行替换。
+            dks = new DESKeySpec("我是密钥".getBytes());
+            SecretKeyFactory skf = SecretKeyFactory.getInstance("DES");
+            SecretKey desKey = skf.generateSecret(dks);
+            ecipher = Cipher.getInstance("DES");
+            dcipher = Cipher.getInstance("DES");
+            ecipher.init(Cipher.ENCRYPT_MODE, desKey);
+            dcipher.init(Cipher.DECRYPT_MODE, desKey);
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (InvalidKeySpecException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String encrypt(String str) throws Exception {
+        // Encode the string into bytes using utf-8
+        byte[] utf8 = str.getBytes("UTF8");
+        // Encrypt
+        byte[] enc = ecipher.doFinal(utf8);
+        // Encode bytes to base64 to get a string
+        return new sun.misc.BASE64Encoder().encode(enc);
+    }
+
+    public String decrypt(String str) throws Exception {
+        // Decode base64 to get bytes
+        byte[] dec = new sun.misc.BASE64Decoder().decodeBuffer(str);
+        byte[] utf8 = dcipher.doFinal(dec);
+        // Decode using utf-8
+        return new String(utf8, "UTF8");
+    }
+}

src/main/java/cn/minbb/evaluationsystemserver/util/IPUtils.java → src/main/java/cn/minbb/evaluation/util/IPUtils.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.util;
+package cn.minbb.evaluation.util;
 
 import javax.servlet.http.HttpServletRequest;
 import java.net.InetAddress;

src/main/java/cn/minbb/evaluationsystemserver/util/ResponseMap.java → src/main/java/cn/minbb/evaluation/util/ResponseMap.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.util;
+package cn.minbb.evaluation.util;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/cn/minbb/evaluationsystemserver/util/Result.java → src/main/java/cn/minbb/evaluation/util/Result.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.util;
+package cn.minbb.evaluation.util;
 
 public class Result {
 

src/main/java/cn/minbb/evaluationsystemserver/websocket/WebSocketConfig.java → src/main/java/cn/minbb/evaluation/websocket/WebSocketConfig.java

@@ -1,6 +1,6 @@
-package cn.minbb.evaluationsystemserver.websocket;
+package cn.minbb.evaluation.websocket;
 
-import cn.minbb.evaluationsystemserver.service.UserService;
+import cn.minbb.evaluation.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;

src/main/java/cn/minbb/evaluationsystemserver/websocket/WebSocketController.java → src/main/java/cn/minbb/evaluation/websocket/WebSocketController.java

@@ -1,10 +1,10 @@
-package cn.minbb.evaluationsystemserver.websocket;
+package cn.minbb.evaluation.websocket;
 
-import cn.minbb.evaluationsystemserver.entity.Message;
-import cn.minbb.evaluationsystemserver.entity.User;
-import cn.minbb.evaluationsystemserver.service.MessageService;
-import cn.minbb.evaluationsystemserver.service.UserService;
-import cn.minbb.evaluationsystemserver.util.App;
+import cn.minbb.evaluation.entity.Message;
+import cn.minbb.evaluation.entity.User;
+import cn.minbb.evaluation.service.MessageService;
+import cn.minbb.evaluation.service.UserService;
+import cn.minbb.evaluation.util.App;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/cn/minbb/evaluationsystemserver/websocket/WebSocketHandshakeInterceptor.java → src/main/java/cn/minbb/evaluation/websocket/WebSocketHandshakeInterceptor.java

@@ -1,4 +1,4 @@
-package cn.minbb.evaluationsystemserver.websocket;
+package cn.minbb.evaluation.websocket;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

src/main/java/cn/minbb/evaluationsystemserver/service/AnswerService.java

@@ -1,7 +0,0 @@
-package cn.minbb.evaluationsystemserver.service;
-
-import cn.minbb.evaluationsystemserver.entity.Answer;
-
-public interface AnswerService {
-    Answer findAnswerByE_Id(Long e_id);
-}

src/main/java/cn/minbb/evaluationsystemserver/service/FeedbackService.java

@@ -1,7 +0,0 @@
-package cn.minbb.evaluationsystemserver.service;
-
-import cn.minbb.evaluationsystemserver.entity.Feedback;
-
-public interface FeedbackService {
-    Feedback save(Feedback feedback);
-}

src/main/java/cn/minbb/evaluationsystemserver/service/LogsService.java

@@ -1,7 +0,0 @@
-package cn.minbb.evaluationsystemserver.service;
-
-import cn.minbb.evaluationsystemserver.entity.Logs;
-
-public interface LogsService {
-    Logs save(Logs logs);
-}

src/main/java/cn/minbb/evaluationsystemserver/service/MessageService.java

@@ -1,7 +0,0 @@
-package cn.minbb.evaluationsystemserver.service;
-
-import cn.minbb.evaluationsystemserver.entity.Message;
-
-public interface MessageService {
-    Message save(Message message);
-}

src/main/java/cn/minbb/evaluationsystemserver/service/QuestionService.java

@@ -1,10 +0,0 @@
-package cn.minbb.evaluationsystemserver.service;
-
-import cn.minbb.evaluationsystemserver.entity.Classification;
-import cn.minbb.evaluationsystemserver.entity.Question;
-
-import java.util.List;
-
-public interface QuestionService {
-    List<Question> randomSelection(List<Classification> classificationList, int count);
-}

src/main/resources/application.properties

@@ -1,7 +1,5 @@
 server.port=80
-#server.context-path=/evaluation
-server.servlet.context-path=/evaluation_system
-#server.session.timeout=3600
+server.servlet.context-path=/
 spring.datasource.url=jdbc:mysql://localhost:3306/evaluation_system?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=Yumin
 spring.datasource.password=Wang19970305
@@ -14,4 +12,4 @@ spring.thymeleaf.mode=HTML
 spring.mvc.favicon.enabled=true
 spring.http.encoding.charset=UTF-8
 #spring.http.multipart.max-file-size=10MB
-USER_AVATAR_URL=http://minbb.cn/evaluation_system/user/avatars/
+USER_AVATAR_URL=http://www.minbb.cn/evaluation/user/avatars/

src/main/resources/templates/login.html

@@ -9,7 +9,7 @@
     <title>后台登录</title>
 
     <!-- Bootstrap -->
-    <link href="../static/css/bootstrap.min.css" th:href="@{css/bootstrap.min.css}" rel="stylesheet"/>
+    <link href="../static/css/bootstrap.min.css" th:href="@{../css/bootstrap.min.css}" rel="stylesheet"/>
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -20,9 +20,25 @@
 </head>
 <body>
 
+<div class="container">
+    <form class="form-login" role="form" action="/evaluation_system/user/login" method="post">
+        <h2 class="form-login-heading">用户登录</h2>
+        <label for="username" class="sr-only">用户名</label>
+        <input type="text" id="username" name="username" class="form-control" placeholder="用户名" required autofocus>
+        <label for="password" class="sr-only">密码</label>
+        <input type="password" id="password" name="password" class="form-control" placeholder="密码" required>
+        <div class="checkbox">
+            <label>
+                <input type="checkbox" value="remember-me"> 记住密码
+            </label>
+        </div>
+        <button class="btn btn-lg btn-primary btn-block" type="submit">登录</button>
+    </form>
+</div> <!-- /container -->
+
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 <!-- Include all compiled plugins (below), or include individual files as needed -->
-<script src="../static/js/bootstrap.min.js" th:src="@{js/bootstrap.min.js}"></script>
+<script src="../static/js/bootstrap.min.js" th:src="@{../js/bootstrap.min.js}"></script>
 </body>
 </html>

src/test/java/cn/minbb/evaluation/EvaluationSystemServerApplicationTests.java

@@ -0,0 +1,25 @@
+package cn.minbb.evaluation;
+
+import cn.minbb.evaluation.util.DesEncryptDecrypt;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class EvaluationSystemServerApplicationTests {
+
+	@Test
+	public void contextLoads() {
+	}
+
+	@Test
+	public void des() throws Exception {
+		String s = "互联网";
+		String mi = DesEncryptDecrypt.getInstance().encrypt(s);
+		System.out.println("++++++++++++++++++++++++++++++" + mi);
+		System.out.println("------------------------------" + DesEncryptDecrypt.getInstance().decrypt(mi));
+	}
+
+}

src/test/java/cn/minbb/evaluationsystemserver/EvaluationSystemServerApplicationTests.java

@@ -1,16 +0,0 @@
-package cn.minbb.evaluationsystemserver;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class EvaluationSystemServerApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}