添加了表单字段验证测试

xiaoan-dao/src/main/java/com/xiaoan/dao/backend/provider/LogProvider.java

@@ -25,6 +25,7 @@ public class LogProvider {
         String searchKey = param.getSearchKey();
         if(!StringUtils.isAllBlank(searchKey)){
             sql.append(" and (( u.user_name like '%").append(searchKey).append("%' )");
+            sql.append(" or ( u.real_name like '%").append(searchKey).append("%' )");
             sql.append(" or ( z.description like '%").append(searchKey).append("%' )");
             sql.append(" or ( z.type like '%").append(searchKey).append("%' ))");
         }

xiaoan-domain/pom.xml

@@ -20,7 +20,6 @@
             <artifactId>xiaoan-common</artifactId>
         </dependency>
 
-
     </dependencies>
 
 

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

@@ -5,6 +5,7 @@ import com.xiaoan.common.model.BaseModel;
 import lombok.Data;
 
 import javax.persistence.*;
+import javax.validation.constraints.Email;
 import java.io.Serializable;
 
 @Data
@@ -37,6 +38,7 @@ public class UserEntity extends BaseModel implements Serializable {
     @Column(length = 1)
     private int status; // 0:启用  1：停用
 
+//    @Email
     @Column
     private String email;
 

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

@@ -2,6 +2,8 @@ package com.xiaoan.domain.dto.request;
 
 import lombok.Data;
 
+import javax.validation.constraints.Email;
+
 /**
  * Created by owen on 2020/2/18 0018 17:09
  */
@@ -21,6 +23,7 @@ public class UserRequest{
 
     private int sex; // 0:男  1：女
 
+    @Email
     private String email;
 
     private Long departmentId; //部门
@@ -29,5 +32,4 @@ public class UserRequest{
 
     private String phone;
 
-//    private String searchKey; //搜索条件
 }

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

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -34,6 +35,12 @@ import java.util.concurrent.TimeUnit;
 @Log4j2
 public class IndexController {
 
+
+    /**
+     * token过期时间，有效期一天
+     */
+    private static int tokenExpire = 1000*60*60*24;
+
     @Autowired
     private UserService userService;
 
@@ -81,7 +88,8 @@ public class IndexController {
         tokenMap.put("role", roles);
 
 
-        String token = JwtUtil2.createJWT(-1, tokenMap);
+//        String token = JwtUtil2.createJWT(-1, tokenMap);
+        String token = JwtUtil2.createJWT(tokenExpire, tokenMap);
 //
 
         HashMap<String, Object> result = new HashMap<>();
@@ -93,7 +101,7 @@ public class IndexController {
 
 
         // 更新到 redis, 有效期24h, 旧token无效
-        redisTemplate.opsForValue().set(userEntity.getUserName(), token, Long.parseLong("240000"), TimeUnit.HOURS);
+        redisTemplate.opsForValue().set(userEntity.getUserName(), token, Long.parseLong("23"), TimeUnit.HOURS);
 
         // 更新登录次数
         Integer loginCount = userEntity.getViewCount();

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Condition;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.*;
 
 
@@ -50,7 +51,7 @@ public class UserController extends BaseController {
     @RequiresRoles(value = {"admin"}, logical = Logical.OR)
     @ApiOperation("新增或修改用户信息")
     @PostMapping("save")
-    public ResultJson save(@RequestBody UserRequest param){
+    public ResultJson save(@Valid @RequestBody UserRequest param){
         int n = 0;
 
         UserEntity entity = null;