user 添加了用户验证

xiaoan-application/src/main/resources/application-test.properties

@@ -0,0 +1,50 @@
+
+#DB
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+#spring.datasource.druid.url=jdbc:mysql://218.17.126.170:9998/4dkankan_v2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.url=jdbc:mysql://localhost:3306/4dkankan_v2?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+spring.datasource.druid.password=123456
+
+# 初始连接数
+spring.datasource.druid.initial-size=5
+# 最小连接池数量
+spring.datasource.druid.min-idle=10
+# 最大连接池数量
+spring.datasource.druid.max-active=20
+# 配置获取连接等待超时的时间
+spring.datasource.druid.max-wait=60000
+# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+spring.datasource.druid.time-between-eviction-runs-millis=60000
+# 配置一个连接在池中最小生存的时间，单位是毫秒
+spring.datasource.druid.min-evictable-idle-time-millis=30000
+# 配置一个连接在池中最大生存的时间，单位是毫秒
+spring.datasource.druid.max-evictable-idle-time-millis=90000
+# 配置检测连接是否有效
+spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
+spring.datasource.druid.test-while-idle=true
+spring.datasource.druid.test-on-borrow=false
+spring.datasource.druid.test-on-return=false
+spring.datasource.druid.web-stat-filter.enabled=true
+spring.datasource.druid.stat-view-servlet.enabled=true
+
+#logging.file=log/xiaoan.log
+
+# Redis数据库索引（默认为0）
+spring.redis.database=0
+spring.redis.host=127.0.0.1
+spring.redis.port=6379
+spring.redis.password=
+# 连接超时时间 单位 ms（毫秒）
+spring.redis.timeout=3000ms
+# 连接池中的最大空闲连接，默认值也是8。
+spring.redis.jedis.pool.max-idle=8
+#连接池中的最小空闲连接，默认值也是0。
+spring.redis.jedis.pool.min-idle=0
+# 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
+spring.redis.jedis.pool.max-active=8
+# 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
+spring.redis.jedis.pool.max-wait=-1ms
+
+logging.path=/root/user/java/log/xiaoan

xiaoan-application/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 server.port=8011
 
-spring.profiles.active=dev
+spring.profiles.active=test
 
 #mybatis
 #mybatis.mapper-locations=classpath:mapper/*.xml

xiaoan-common/pom.xml

@@ -137,6 +137,13 @@
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper-spring-boot-starter</artifactId>
             <version>2.0.2</version>
+            <!-- 解决 tomcat 启动时包冲突-->
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
 

xiaoan-common/src/main/java/com/xiaoan/common/util/PasswordUtils.java

@@ -168,7 +168,7 @@ public class PasswordUtils {
 
     public static void main(String[] args) {
         // 13138102395 13112311178 Aa11111111
-        String userName = "owen";
+        String userName = "15088889999";
         String password = "12345678";
 
         try {

xiaoan-domain/src/main/java/com/xiaoan/domain/backend/DepartmentEntity.java

@@ -18,7 +18,7 @@ public class DepartmentEntity extends BaseModel implements Serializable {
     /**
      * 部门代号
      */
-    private String num;
+    private Integer num;
 
     /**
      * 部门名称

xiaoan-domain/src/main/java/com/xiaoan/domain/backend/UserEntity.java

@@ -29,7 +29,7 @@ public class UserEntity extends BaseModel implements Serializable {
     /**
      * 用户编号
      */
-    private String userNum;
+    private Integer userNum;
 
     @Column
     private int sex; // 0:男  1：女

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/DepartmentRequest.java

@@ -1,8 +1,9 @@
 package com.xiaoan.domain.dto.request;
 
-import com.xiaoan.common.model.PageDto;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Created by Hb_zzZ on 2020/2/27.
  */
@@ -11,8 +12,9 @@ public class DepartmentRequest {
 
     private Long id;
 
-    private String num;
+//    private String num;
 
+    @NotBlank(message = "部门名称不能为空")
     private String name;
 
 }

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/LoginRequest.java

@@ -2,15 +2,18 @@ package com.xiaoan.domain.dto.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * Created by owen on 2020/2/18 0018 17:09
  */
 @Data
 public class LoginRequest {
 
-
+    @NotBlank(message = "用户名不能为空")
     private String userName;
 
+    @NotBlank(message = "密码不能为空")
     private String password;
 
 

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/RoleRequest.java

@@ -2,6 +2,7 @@ package com.xiaoan.domain.dto.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Set;
 
 /**
@@ -12,6 +13,7 @@ public class RoleRequest {
 
     private Long id;
 
+    @NotBlank(message = "角色名称不能为空")
     private String roleName;
 
     // 描述

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/request/UserRequest.java

@@ -12,9 +12,10 @@ public class UserRequest{
 
     private Long id;
 
-    @NotBlank
+    @NotBlank(message = "用户名不能为空")
     private String userName;
 
+    @NotBlank(message = "真实姓名不能为空")
     private String realName; // 真实姓名
 
     /**
@@ -22,21 +23,27 @@ public class UserRequest{
      */
 //    @Pattern(regexp = "^[0-9]*$")
 //    @NotNull
-    private String userNum;
+//    private String userNum;
 
     private int sex; // 0:男  1：女
 
-    @Email
+    @NotBlank(message = "email不能为空")
+    @Email(message = "email格式有误")
     private String email;
 
-    @NotNull
-    private Long departmentId; //部门
+    /**
+     * .@NotBlank: 只能用在String 类型
+     * .@NotNull：对象类型，只能用@NotNull
+     */
+    @NotNull(message = "部门不能为空")
+    private Long departmentId;
 
-    private Long roleId; // 角色id
+    @NotNull(message = "角色不能为空")
+    private Long roleId;
 
-//    @NotBlank(message = "phone不能为空字符串/null")
-    @Size(max = 11, message = "长度不能大于11位")
-    @Pattern(regexp = "^[0-9]*$")
+    @NotBlank(message = "phone不能为空")
+    @Size(min = 11, max = 11, message = "phone格式有误")
+    @Pattern(regexp = "^[0-9]*$", message = "只能包含数字")
     private String phone;
 
 }

xiaoan-domain/src/main/java/com/xiaoan/domain/dto/response/UserResponse.java

@@ -17,7 +17,7 @@ public class UserResponse extends BaseModel {
 
     private String realName; // 真实姓名
 
-    private String userNum;
+    private Integer userNum;
 
     private int sex; // 0:男  1：女
 

xiaoan-web/src/main/java/com/xiaoan/web/backend/DepartmentController.java

@@ -5,7 +5,6 @@ import com.xiaoan.common.constant.MsgCode;
 import com.xiaoan.common.model.PageDto;
 import com.xiaoan.common.util.ResultJson;
 import com.xiaoan.domain.backend.DepartmentEntity;
-import com.xiaoan.domain.backend.RoleEntity;
 import com.xiaoan.domain.dto.request.DepartmentRequest;
 import com.xiaoan.service.backend.DepartmentService;
 import com.xiaoan.web.aop.WebControllerLog;
@@ -17,7 +16,6 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
@@ -75,13 +73,15 @@ public class DepartmentController extends BaseController {
             Integer byMaxNum = departmentService.findByMaxNum();
 
             // 用于第一条数据
-            if (byMaxNum == null){
-                byMaxNum = 0;
-            }
+//            if (byMaxNum == null){
+//                byMaxNum = 0;
+//            }
+//
+//            byMaxNum = byMaxNum + 1;
 
-            byMaxNum = byMaxNum + 1;
+            byMaxNum = (byMaxNum == null)? 1:byMaxNum + 1;
 
-            entity.setNum(byMaxNum.toString());
+            entity.setNum(byMaxNum);
             departmentService.save(entity);
         } else {
             entity = departmentService.findById(id);

xiaoan-web/src/main/java/com/xiaoan/web/backend/UserController.java

@@ -59,7 +59,7 @@ public class UserController extends BaseController {
     @PostMapping("save")
     public ResultJson save(@Valid @RequestBody UserRequest param){
 
-        System.out.println(param.toString());
+//        System.out.println(param.toString());
 
         int n = 0;
 
@@ -84,12 +84,13 @@ public class UserController extends BaseController {
 
             Integer byMaxNum = userService.findByMaxNum();
             // 用于第一条数据
-            if (byMaxNum == null){
-                byMaxNum = 1;
-            }
-            byMaxNum  = byMaxNum +  1;
+//            if (byMaxNum == null){
+//                byMaxNum = 1;
+//            }
+//            byMaxNum  = byMaxNum +  1;
+            byMaxNum = (byMaxNum == null)? 1:byMaxNum + 1;
 
-            entity.setUserNum(byMaxNum.toString());
+            entity.setUserNum(byMaxNum);
 
 
             entity.setPassword(PasswordUtils.encrypt(param.getUserName(), "12345678", PasswordUtils.getStaticSalt()));
@@ -137,6 +138,10 @@ public class UserController extends BaseController {
         return new ResultJson(MsgCode.SUCCESS_CODE, MsgCode.msg_SUCCESS);
     }
 
+
+    /**
+     * deleteAll 可以跟delete合并，写一个接口就可以了
+     */
     @RequiresRoles(value = {"admin"}, logical = Logical.OR)
     @ApiOperation("删除多用户")
     @GetMapping("delete/all/{ids}")