用户接口

@@ -9,7 +9,7 @@ from .models import *
 from .oauth2 import authorization, require_oauth, generate_user_info
 from .oauth2 import authorization, require_oauth, generate_user_info
 from authlib.oauth2 import OAuth2Error
 from authlib.oauth2 import OAuth2Error
 from authlib.integrations.flask_oauth2 import current_token
 from authlib.integrations.flask_oauth2 import current_token
-from . import user_create, client_create, client_query
+from . import user_create, client_create, client_query,user_query
 
 
 
 
 def current_user():
 def current_user():
@@ -139,7 +139,7 @@ class DataManager(BlueprintApi):
     @bp.route("/logout", methods=["GET"])
     @bp.route("/logout", methods=["GET"])
     # @require_oauth("profile")
     # @require_oauth("profile")
     def logout():
     def logout():
-        url=''
+        url = ''
         try:
         try:
             user = current_user()
             user = current_user()
             grant = authorization.validate_consent_request(end_user=user)
             grant = authorization.validate_consent_request(end_user=user)
@@ -150,7 +150,7 @@ class DataManager(BlueprintApi):
             db.session.commit()
             db.session.commit()
             remove_user()
             remove_user()
             if accesstoken:
             if accesstoken:
-                url =grant.client.client_uri
+                url = grant.client.client_uri
         except OAuth2Error as error:
         except OAuth2Error as error:
             return jsonify(dict(error.get_body()))
             return jsonify(dict(error.get_body()))
         return redirect(url)
         return redirect(url)
@@ -170,7 +170,17 @@ class DataManager(BlueprintApi):
 
 
     """接口"""
     """接口"""
     @staticmethod
     @staticmethod
-    @bp.route("/user_create", methods=["POST"])
+    @bp.route("/users", methods=["GET"])
+    @swag_from(user_query.Api.api_doc)
+    def user_query():
+        """
+        获取用户列表
+        """
+        return user_query.Api().result
+    
+    
+    @staticmethod
+    @bp.route("/users", methods=["POST"])
     @swag_from(user_create.Api.api_doc)
     @swag_from(user_create.Api.api_doc)
     def user_create():
     def user_create():
         """
         """
@@ -179,7 +189,7 @@ class DataManager(BlueprintApi):
         return user_create.Api().result
         return user_create.Api().result
 
 
     @staticmethod
     @staticmethod
-    @bp.route("/client_create", methods=["POST"])
+    @bp.route("/client", methods=["POST"])
     @swag_from(client_create.Api.api_doc)
     @swag_from(client_create.Api.api_doc)
     def client_create():
     def client_create():
         """
         """

+# coding=utf-8
+#author:        qianyingz
+#createtime:    2021/8/14
+#email:         qianyingz@chinadci.com
+
+from authlib.oidc.core.claims import UserInfo
+from .models import *
+from app.util.component.ApiTemplate import ApiTemplate
+
+
+class Api(ApiTemplate):
+    api_name = "获取用户列表"
+
+    def para_check(self):
+        pass
+
+    def process(self):
+        # 返回结果
+        res = {}
+        res["result"] = False
+        try:
+            # 业务逻辑
+            pass
+            page_index = int(self.para.get("pageIndex", "0"))
+            page_size = int(self.para.get("pageSize", "1000"))
+            name = self.para.get("name")
+            id = self.para.get('guid')
+
+            if id:
+                tmp_user = User.query.filter_by(id=id).first()
+                res["data"] = {"id": tmp_user.id, "username": tmp_user.username,
+                               "role": tmp_user.role}
+            else:
+                # 获取集合
+                userLinq = User.query.order_by(User.id.desc())
+                if name:
+                    userLinq = userLinq.filter(
+                        User.username.like("%" + name + "%"))
+                tmp_count = userLinq.count()
+                tmp_list = userLinq.limit(page_size).offset(
+                    page_index * page_size).all()
+                res["data"] = {
+                    "count": tmp_count,
+                    "list": list(map(lambda t:
+                                     {"id": t.id, "username": t.username,
+                                         "role": t.role},
+                                     tmp_list))}
+            res["result"] = True
+
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+
+        "tags": ["认证接口"],
+        "parameters": [
+            {"name": "page_index",
+             "in": "query",
+             "type": "int",
+             "description": "当前页",
+             "default": 0},
+            {"name": "page_size",
+             "in": "query",
+             "type": "int",
+             "description": "条数",
+             "default": 1000},
+            {"name": "name",
+             "in": "query",
+             "type": "string",
+             "description": "名称关键字"},
+            {"name": "guid",
+             "in": "query",
+             "type": "string",
+             "description": "用户id，用于获取用户信息"}
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }