Revert "update："

This reverts commit 3d0112c7.

@@ -28,7 +28,6 @@ spring:
 #    host: 127.0.0.1
 #    host: 127.0.0.1
     host: 192.168.1.53
     host: 192.168.1.53
     port: 6379
     port: 6379
-    password: vmvnv1v2VV.
   jackson:
   jackson:
     serialization:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
       FAIL_ON_EMPTY_BEANS: false
@@ -102,8 +101,6 @@ eureka:
             name: "admin"         #These two are needed so that the server
             name: "admin"         #These two are needed so that the server
             password: "123456"
             password: "123456"
   client:
   client:
-#    register-with-eureka: false
-#    fetch-registry: false
     #eureka注册中心服务器地址
     #eureka注册中心服务器地址
     service-url:
     service-url:
 #      defaultZone: http://127.0.0.1:12345/eureka/
 #      defaultZone: http://127.0.0.1:12345/eureka/

@@ -28,7 +28,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
@@ -43,7 +42,6 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Properties;
@@ -70,15 +68,13 @@ public class UserController {
     @GetMapping("/list")
     @GetMapping("/list")
     public ResultJson<PageInfo> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
     public ResultJson<PageInfo> list(@RequestParam(value = "pageNum",required = false,defaultValue = "1")
                                         int pageNum,
                                         int pageNum,
-                                     @RequestParam(value = "pageSize",required = false,defaultValue = "5")
+                                @RequestParam(value = "pageSize",required = false,defaultValue = "5")
                                         int pageSize,
                                         int pageSize,
-                                     @RequestParam(value = "userName",required = false) String username,
-                                     @RequestParam(value = "realName",required = false) String realname,
-                                        @RequestParam(value = "updatetime", required = false)
-                                        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date updatetime)
+                                @RequestParam(value = "userName",required = false) String username,
+                                @RequestParam(value = "realName",required = false) String realname)
     {
     {
 
 
-        PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username,  realname, updatetime);
+        PageInfo<KakoUser> usersPageInfo = userService.selectAllUser(pageNum,pageSize, username,  realname);
         return new ResultJson("200","success",usersPageInfo);
         return new ResultJson("200","success",usersPageInfo);
     }
     }
 
 

@@ -6,7 +6,6 @@ import com.tianbo.warehouse.model.KakoUserRole;
 import com.tianbo.warehouse.model.USERS;
 import com.tianbo.warehouse.model.USERS;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
-import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 
 
@@ -14,7 +13,7 @@ public interface KakoUserService {
 
 
     KakoUser loadByUsername(String username);
     KakoUser loadByUsername(String username);
 
 
-    PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize, String username, String realName, Date updatetime);
+    PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize, String username, String realName);
 
 
     int insertSelective(KakoUser record);
     int insertSelective(KakoUser record);
 
 

@@ -59,12 +59,11 @@ public class KakoUserServiceImpl implements KakoUserService{
     }
     }
 
 
     @Override
     @Override
-    public PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize,String username, String realName, Date updatetime){
+    public PageInfo<KakoUser> selectAllUser(int pageNum, int pageSize,String username, String realName){
         Page<KakoUser> page =  PageHelper.startPage(pageNum,pageSize);
         Page<KakoUser> page =  PageHelper.startPage(pageNum,pageSize);
         KakoUser users = new KakoUser();
         KakoUser users = new KakoUser();
         users.setLoginName(username);
         users.setLoginName(username);
         users.setName(realName);
         users.setName(realName);
-        users.setUpdateDate(updatetime);
         List<KakoUser> list = kakoUserMapper.selectAllUser(users);
         List<KakoUser> list = kakoUserMapper.selectAllUser(users);
         for (KakoUser user: list) {
         for (KakoUser user: list) {
 //            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());
 //            List<PERMISSION> permissionList = permissionMapper.findByUserId(user.getUserId());

@@ -47,9 +47,6 @@
     <if test="name != null" >
     <if test="name != null" >
       and name like concat('%',#{name,jdbcType=VARCHAR},'%')
       and name like concat('%',#{name,jdbcType=VARCHAR},'%')
     </if>
     </if>
-    <if test="updateDate != null ">
-      and update_date &gt; #{updateDate,jdbcType=TIMESTAMP}
-    </if>
   </select>
   </select>
   <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" >
   <select id="selectByUsername" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select
     select