Merge branch 'master' into develop/express

src/main/java/com/peanut/modules/book/controller/MyUserController.java

@@ -82,15 +82,24 @@ public class MyUserController {
     @RequestMapping("/getUserList")
     public R getUserList(@RequestBody PageIdDto p){
         LambdaQueryWrapper<MyUserEntity> wrapper = new LambdaQueryWrapper<>();
-        if(!p.getKey().equals(null)){
+        if(!p.getKey().equals(null)&&p.getKey()!=""){
             wrapper.eq(MyUserEntity::getTel,p.getKey()).or().eq(MyUserEntity::getName,p.getKey());
         }
-        wrapper.eq(MyUserEntity::getDelFlag,0);
+        wrapper.orderByDesc(MyUserEntity::getCreateTime);
         Page<MyUserEntity> myUserEntityPage = userService.getBaseMapper().selectPage(new Page<MyUserEntity>(p.getPage(), p.getLimit()), wrapper);
 
         return R.ok().put("user",myUserEntityPage);
     }
 
+    /**
+     * 管理员添加用户
+     * @return
+     */
+    @RequestMapping("/addUserForAdmin")
+    public R addUserForAdmin(){
+        return null;
+    }
+
 
     /**
      * 信息

src/main/resources/application-dev.yml

@@ -17,9 +17,9 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://127.0.0.1:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+      url: jdbc:mysql://59.110.212.44:3306/e_book_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
       username: root
-      password: password
+      password: HSXY1234hsxy
       initial-size: 10
       max-active: 100
       min-idle: 10