Merge branch 'develop' of git.yfzx.zjtys.com.cn:zhuangshuang/EncryptedFileSystem into develop

efs-union/src/main/java/com/zjty/efs/union/config/UserInit.java

+package com.zjty.efs.union.config;
+
+import com.zjty.efs.misc.util.MD5Untils;
+import com.zjty.efs.user.subject.dao.UserDao;
+import com.zjty.efs.user.subject.entity.UserDo;
+import com.zjty.efs.user.subject.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+import sun.security.provider.MD5;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * user 模块初始化admin
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-03-30
+ */
+@Slf4j
+@Component
+public class UserInit implements CommandLineRunner {
+
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserDao userDao;
+
+    @Override
+    public void run(String... args) throws Exception {
+//        log.info("删除现有admin账户信息");
+//        userDao.deleteUserDosByAccount("admin");
+        List<UserDo> rs = userDao.findByAccount("admin");
+
+
+        if (rs.isEmpty()) {
+            userDao.save(new UserDo(null, "admin","123","admin","admin","admin","admin","admin",MD5Untils.getMD5Str("admin"),1,"admin",new Date()));
+            return;
+        }
+        UserDo admin = rs.get(0);
+        log.info("初始化amdin账户");
+        admin.setPassword(MD5Untils.getMD5Str("admin"));
+        userDao.save(admin);
+        log.info("初始化admin完成,{}", admin.toString());
+    }
+}

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

@@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Date;
 import java.util.List;
 
+import static org.springframework.web.bind.annotation.RequestMethod.*;
+import static org.springframework.web.bind.annotation.RequestMethod.OPTIONS;
+
 /**
  * @author LJJ cnljj1995@gmail.com
  * on 2020-03-24
@@ -24,6 +27,7 @@ import java.util.List;
 @AutoDocument
 @Api(tags = "用户模块接口")
 @Slf4j
+//@CrossOrigin(origins = "*", allowCredentials = "true", methods = {GET, POST, PUT, DELETE, PATCH, OPTIONS})
 public class UserController {
 
     @Autowired
@@ -74,15 +78,15 @@ public class UserController {
     @PutMapping("/pwd")
     @ApiOperation(value = "用户修改密码")
     @ApiImplicitParams({
-            @ApiImplicitParam(name="id",value="人员id",dataType="string", paramType = "query"),
-            @ApiImplicitParam(name="oPwd",value="老密码",dataType="string", paramType = "query"),
-            @ApiImplicitParam(name="nPwd",value="新密码",dataType="string", paramType = "query")
 
     })
-    public ResponseEntity<UserPwdVo> updatePwd(@RequestParam(value = "id") String id,
-                                    @RequestParam(value = "oPwd") String oPwd,
-                                    @RequestParam(value = "nPwd") String nPwd) {
+    public ResponseEntity<UserPwdVo> updatePwd(
+                                    @RequestBody AccVo accVo
+                                   ) {
 
+        String oPwd = accVo.getOPwd();
+        String nPwd = accVo.getNPwd();
+        String id = accVo.getId();
         UserDo user = userService.updatePwd(id, oPwd, nPwd);
         if (user.getAccount() == null) {
             return ResponseEntity.status(403).body(new UserPwdVo("","",""));
@@ -98,8 +102,11 @@ public class UserController {
     })
     public ResponseEntity<UserDo> login(@RequestParam(value = "account") String username,
                                          @RequestParam(value = "password") String password) {
+        log.info("account:{} 登陆", username);
+
         UserDo user = userService.login(username, password);
 
+
         if (user.getName() != null) {
             return ResponseEntity.ok(user);
         } else {

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

@@ -16,4 +16,7 @@ public interface UserDao extends JpaRepository<UserDo, String> {
 
     List<UserDo> findByAccount(String account);
 
+
+    void deleteUserDosByAccount(String name);
+
 }

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

+package com.zjty.efs.user.subject.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LJJ cnljj1995@gmail.com
+ * on 2020-03-30
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AccVo {
+    private String id;
+
+    private String oPwd;
+
+    private String nPwd;
+}

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

@@ -32,7 +32,7 @@ public class UserDo {
     @ApiModelProperty(value = "id",example = "jksdhfjks5")
     @Id
     @GeneratedValue(generator = "uuid2")
-    @GenericGenerator(name = "uuid2", strategy = "org.hibernate.id.UUIDGenerator" )
+    @GenericGenerator(name = "uuid2", strategy = "org.hibernate.id.UUIDGenerator")
     private String id;
 
     @ApiModelProperty(value = "用户姓名",example = "mcj")

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author LJJ cnljj1995@gmail.com
@@ -131,6 +132,12 @@ public class UserServiceImpl implements UserService {
         List<UserDo> byUsername = userDao.findByAccount(username);
         log.info("{}", byUsername);
         if (byUsername.size() == 1) {
+
+            if (byUsername.get(0).getStatus() == 0) {
+                log.warn("登陆用户被冻结:{}", byUsername.get(0).getAccount());
+                return new UserDo();
+            }
+
             log.info("用户存在");
             if (byUsername.get(0).getPassword().equals(MD5Untils.getMD5Str(password))) {
                 return byUsername.get(0);
@@ -146,7 +153,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public UserDo updatePwd(String id, String oPwd, String nPwd) {
-        UserDo user = userDao.findById(id).get();
+        Optional<UserDo> user2 = userDao.findById(id);
+
+        UserDo user = user2.get();
 
         if (!user.getPassword().equals(MD5Untils.getMD5Str(oPwd))) {
             log.warn("密码不对");