Forráskód Böngészése

调整代码结构修改鉴权设置

luoshi 2 éve
szülő
commit
1a0446012a

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/binder/FileFormatBinder.java → src/main/java/com/qmth/ops/api/binder/FileFormatBinder.java

@@ -1,4 +1,4 @@
-package com.qmth.ops.api.controller.binder;
+package com.qmth.ops.api.binder;
 
 import com.qmth.ops.biz.domain.FileFormat;
 import org.springframework.format.Formatter;

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/binder/VersionNumberBinder.java → src/main/java/com/qmth/ops/api/binder/VersionNumberBinder.java

@@ -1,4 +1,4 @@
-package com.qmth.ops.api.controller.binder;
+package com.qmth.ops.api.binder;
 
 import com.qmth.ops.biz.utils.VersionNumber;
 import org.springframework.format.Formatter;

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/admin/ConfigController.java

@@ -1,7 +1,7 @@
 package com.qmth.ops.api.controller.admin;
 
+import com.qmth.ops.api.binder.FileFormatBinder;
 import com.qmth.ops.api.constants.OpsApiConstants;
-import com.qmth.ops.api.controller.binder.FileFormatBinder;
 import com.qmth.ops.biz.domain.ConfigItem;
 import com.qmth.ops.biz.domain.FileFormat;
 import com.qmth.ops.biz.service.AppService;

+ 6 - 0
src/main/java/com/qmth/ops/api/controller/admin/UserController.java

@@ -6,6 +6,7 @@ import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.ops.api.constants.OpsApiConstants;
 import com.qmth.ops.api.security.AdminSession;
 import com.qmth.ops.biz.domain.User;
+import com.qmth.ops.biz.query.UserQuery;
 import com.qmth.ops.biz.service.UserService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,4 +33,9 @@ public class UserController {
         }
         return new AdminSession(user);
     }
+
+    @PostMapping("/query")
+    public UserQuery query(UserQuery query) {
+        return userService.query(query);
+    }
 }

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/admin/VersionController.java

@@ -1,7 +1,7 @@
 package com.qmth.ops.api.controller.admin;
 
+import com.qmth.ops.api.binder.VersionNumberBinder;
 import com.qmth.ops.api.constants.OpsApiConstants;
-import com.qmth.ops.api.controller.binder.VersionNumberBinder;
 import com.qmth.ops.biz.domain.Version;
 import com.qmth.ops.biz.query.VersionQuery;
 import com.qmth.ops.biz.service.AppService;

+ 1 - 1
src/main/java/com/qmth/ops/api/controller/export/ConfigExportController.java

@@ -5,8 +5,8 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.exception.ParameterException;
 import com.qmth.boot.core.exception.UnauthorizedException;
+import com.qmth.ops.api.binder.FileFormatBinder;
 import com.qmth.ops.api.constants.OpsApiConstants;
-import com.qmth.ops.api.controller.binder.FileFormatBinder;
 import com.qmth.ops.biz.domain.*;
 import com.qmth.ops.biz.service.*;
 import com.qmth.ops.biz.utils.PropertyFileUtil;

+ 46 - 0
src/main/java/com/qmth/ops/biz/query/UserQuery.java

@@ -0,0 +1,46 @@
+package com.qmth.ops.biz.query;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qmth.boot.mybatis.query.BaseQuery;
+import com.qmth.ops.biz.domain.Role;
+import com.qmth.ops.biz.domain.User;
+
+public class UserQuery extends BaseQuery<User> {
+
+    private static final long serialVersionUID = -8943542338584325944L;
+
+    private Long id;
+
+    private String loginNameStartWith;
+
+    private Role role;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getLoginNameStartWith() {
+        return loginNameStartWith;
+    }
+
+    public void setLoginNameStartWith(String loginNameStartWith) {
+        this.loginNameStartWith = loginNameStartWith;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public void setRole(Role role) {
+        this.role = role;
+    }
+
+    public LambdaQueryWrapper<User> build() {
+        return new LambdaQueryWrapper<User>().eq(id != null, User::getId, id).eq(role != null, User::getRole, role)
+                .likeRight(loginNameStartWith != null, User::getLoginName, loginNameStartWith);
+    }
+}

+ 5 - 0
src/main/java/com/qmth/ops/biz/service/UserService.java

@@ -3,6 +3,7 @@ package com.qmth.ops.biz.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qmth.ops.biz.dao.UserDao;
 import com.qmth.ops.biz.domain.User;
+import com.qmth.ops.biz.query.UserQuery;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,4 +37,8 @@ public class UserService {
         userDao.insert(user);
         return user;
     }
+
+    public UserQuery query(UserQuery query) {
+        return userDao.selectPage(query, query.build());
+    }
 }

+ 3 - 1
src/main/resources/application.properties

@@ -1,5 +1,7 @@
 server.port=8080
 
-com.qmth.datasource.url=jdbc:mysql://localhost:3306/test_ops
+com.qmth.api.global-auth=false
+
+com.qmth.datasource.url=jdbc:mysql://localhost:3306/test_ops?useUnicode=true&characterEncoding=UTF-8
 com.qmth.datasource.username=root
 com.qmth.datasource.password=root