Merge branch 'develop' of 192.168.1.249:LJJ/encrypted-file-system into develop

efs-bus/src/main/java/com/zjty/efs/bus/controller/NoticeController.java

@@ -59,7 +59,7 @@ public class NoticeController {
 
     @GetMapping("/getNoticeList")
     @ApiOperation(value = "获取通知列表接口", notes = "获取列表，type为通知类型，接收 0，发送 1，草稿 2，消息提醒　0")
-    @ApiImplicitParams({@ApiImplicitParam(name = "user", value = "当前用户名称", paramType = "query", required = true, example = "username", dataType = "int"),
+    @ApiImplicitParams({@ApiImplicitParam(name = "user", value = "当前用户名称", paramType = "query", required = true, example = "account", dataType = "int"),
     @ApiImplicitParam(name = "type", value = "通知类型", paramType = "query", required = true, example = "0", dataType = "int"),
     @ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query", required = true, dataType = "int"),
     @ApiImplicitParam(name = "pageSize", value = "条数", paramType = "query", required = true, dataType = "int")})

efs-log/src/main/java/com/zjty/efs/log/subject/entity/EfsLog.java

 package com.zjty.efs.log.subject.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zjty.efs.misc.config.AutoDocument;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
@@ -39,5 +40,6 @@ public class EfsLog {
     private String msg;
 
     @ApiModelProperty(value = "创建时间",example = "2010-01-01 00:00:00")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date time;
 }

efs-union/src/main/java/com/zjty/efs/union/config/EfsCorsFilter.java → efs-union/src/main/java/com/zjty/efs/union/config/FpCorsFilter.java

@@ -10,15 +10,14 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /**
- * cors
- *
- * @author LJJ cnljj1995@gmail.com
- * on 2020-03-26
+ * <p>Description :
+ * <p>Date : 2018/11/8 10:53
+ * <p>@author : Mcj
  */
 @Component
 @WebFilter(filterName = "MyCorsFilter", urlPatterns = "/*")
 @Order(2)
-public class EfsCorsFilter implements Filter {
+public class FpCorsFilter implements Filter {
     @Override
     public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain)
             throws IOException, ServletException {

efs-union/src/main/resources/application.properties

@@ -6,7 +6,7 @@ spring.main.allow-bean-definition-overriding=true
 
 ##连接中心数据库数据库mysql
 spring.datasource.url=jdbc:mysql://localhost:3306/ty_efs?useSSL=false&serverTimezone=UTC&characterEncoding=UTF-8
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
 spring.datasource.password=root
 

efs-user/src/main/java/com/zjty/efs/user/subject/controller/UserController.java

@@ -68,7 +68,7 @@ public class UserController {
         String pwd = "qwer1234";
         UserDo userDo = userService.resetPassword(id, pwd);
 
-        return ResponseEntity.ok(new UserPwdVo(id, pwd, userDo.getUsername()));
+        return ResponseEntity.ok(new UserPwdVo(id, pwd, userDo.getAccount()));
     }
 
     @PutMapping("/pwd")
@@ -84,19 +84,19 @@ public class UserController {
                                     @RequestParam(value = "nPwd") String nPwd) {
 
         UserDo user = userService.updatePwd(id, oPwd, nPwd);
-        if (user.getUsername() == null) {
+        if (user.getAccount() == null) {
             return ResponseEntity.status(403).body(new UserPwdVo("","",""));
         }
-        return ResponseEntity.ok(new UserPwdVo(id, nPwd, user.getUsername()));
+        return ResponseEntity.ok(new UserPwdVo(id, nPwd, user.getAccount()));
     }
 
     @PutMapping("/login")
     @ApiOperation(value = "登陆接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="username",value="用户名",dataType="string", paramType = "query"),
+            @ApiImplicitParam(name="account",value="用户名",dataType="string", paramType = "query",example = "mcj"),
             @ApiImplicitParam(name="password",value="密码",dataType="string", paramType = "query")
     })
-    public ResponseEntity<UserDo> login(@RequestParam(value = "username") String username,
+    public ResponseEntity<UserDo> login(@RequestParam(value = "account") String username,
                                          @RequestParam(value = "password") String password) {
         UserDo user = userService.login(username, password);
 
@@ -124,14 +124,14 @@ public class UserController {
     }
 
     @PostMapping("/user")
-    @ApiOperation(value = "新增人员信息的接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name="userDo",value="人员信息",dataType="object", paramType = "body")
-    })
+//    @ApiOperation(value = "新增人员信息的接口")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name="userDo",value="人员信息",dataType="object", paramType = "body")
+//    })
     public ResponseEntity<UserDo> addUser(@RequestBody UserDo userDo) {
 
         UserDo user = userService.addUser(userDo);
-        if (user.getUsername() == null) {
+        if (user.getAccount() == null) {
             return ResponseEntity.status(403).body(user);
         } else {
             return ResponseEntity.ok(user);

efs-user/src/main/java/com/zjty/efs/user/subject/dao/UserDao.java

@@ -14,7 +14,6 @@ import java.util.List;
 @Repository
 public interface UserDao extends JpaRepository<UserDo, String> {
 
-    @Query(value = "select o from UserDo o where o.username = ?1 ")
-    List<UserDo> findByUsername(String username);
+    List<UserDo> findByAccount(String account);
 
 }

efs-user/src/main/java/com/zjty/efs/user/subject/entity/UserDo.java

@@ -11,10 +11,7 @@ import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -50,11 +47,11 @@ public class UserDo {
     @ApiModelProperty(value = "联系方式（短号）",example = "123")
     private String cornet;
 
-    @ApiModelProperty(value = "备注",example = "dadsd")
+    @ApiModelProperty(value = "备注", example = "dadsd")
     private String remark;
 
-    @ApiModelProperty(value = "用户名",example = "username")
-    private String username;
+    @ApiModelProperty(value = "用户名", example = "zhangsan")
+    private String account;
 
     @ApiModelProperty(value = "部门/处室", example = "秘书处")
     private String department;

efs-user/src/main/java/com/zjty/efs/user/subject/entity/UserStatusVo.java

@@ -25,6 +25,6 @@ public class UserStatusVo {
     @ApiModelProperty(value = "返回消息" ,example = "成功or失败")
     private String msg;
 
-    @ApiModelProperty(value = "状态 1正常 2冻结")
+    @ApiModelProperty(value = "状态 1正常 2冻结", example = "1")
     private Integer status;
 }

efs-user/src/main/java/com/zjty/efs/user/subject/entity/UserVo.java

 package com.zjty.efs.user.subject.entity;
 
+import com.zjty.efs.misc.config.AutoDocument;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @ApiModel(value = "人员集合返回值")
+@AutoDocument
 public class UserVo {
 
     @ApiModelProperty(value = "总数", example = "100")
@@ -27,6 +29,6 @@ public class UserVo {
     @ApiModelProperty(value = "每页大小", example = "10")
     private int size;
 
-    @ApiModelProperty(value = "人员对象")
+    @ApiModelProperty(value = "人员对象", example = "")
     List<UserDo> data;
 }

efs-user/src/main/java/com/zjty/efs/user/subject/service/impl/UserServiceImpl.java

@@ -78,7 +78,7 @@ public class UserServiceImpl implements UserService {
         List<NameListVo> rs = new ArrayList<>();
         userDao.findAll().forEach(
                 o -> {
-                    if (!o.getId().equals(id) && !"admin".equals(o.getUsername())) {
+                    if (!o.getId().equals(id) && !"admin".equals(o.getAccount())) {
                         NameListVo nameListVo = new NameListVo(o.getId(), o.getName(), o.getDepartment());
                         rs.add(nameListVo);
                     }
@@ -106,7 +106,7 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserDo addUser(UserDo userDo) {
-        if (userDao.findByUsername(userDo.getUsername()).size() < 1) {
+        if (userDao.findByAccount(userDo.getAccount()).size() < 1) {
             userDo.setPassword(MD5Untils.getMD5Str(userDo.getPassword()));
             userDo.setUpdateTime(new Date());
             userDao.save(userDo);
@@ -128,14 +128,14 @@ public class UserServiceImpl implements UserService {
     @Override
     public UserDo login(String username, String password) {
         log.info("用户登陆：{}", username);
-        List<UserDo> byUsername = userDao.findByUsername(username);
+        List<UserDo> byUsername = userDao.findByAccount(username);
         log.info("{}", byUsername);
         if (byUsername.size() == 1) {
             log.info("用户存在");
             if (byUsername.get(0).getPassword().equals(MD5Untils.getMD5Str(password))) {
                 return byUsername.get(0);
             } else {
-                log.warn("用户登陆密码错误,错误账号:{}，姓名:{}", byUsername.get(0).getUsername(), byUsername.get(0).getName());
+                log.warn("用户登陆密码错误,错误账号:{}，姓名:{}", byUsername.get(0).getAccount(), byUsername.get(0).getName());
                 return new UserDo();
             }
         } else {