240521

Author: justinzm

app/__init__.py

@@ -54,14 +54,12 @@ def create_app():
 
 def register_blueprint(app):
     from app.admin import create_blueprint_admin
-    from app.api.v1 import create_blueprint_api_v1
+    from app.api import api
     from app.home import home
     from app.wechat import wechat
-    # from app.api import api
 
     app.register_blueprint(create_blueprint_admin(), url_prefix="/admin")
-    app.register_blueprint(create_blueprint_api_v1(), url_prefix="/api/v1")
     app.register_blueprint(home)
     app.register_blueprint(wechat)
-    # app.register_blueprint(api)
+    app.register_blueprint(api)
 

app/admin/__init__.py

@@ -7,7 +7,7 @@
 
 from flask import Blueprint
 from app.admin import auth_group, login, index, welcome, auth_permission, auth_user, conf, section, category, article, \
-    upload, page, member, wx_diymenu, wx_imgtext, wx_reply, wx_text, param, ad
+    upload, page, member, wx_diymenu, wx_imgtext, wx_reply, wx_text, param, ad, user, client
 
 
 def create_blueprint_admin():
@@ -32,6 +32,8 @@ def create_blueprint_admin():
     wx_imgtext.api.register(admin_blueprint)
     wx_reply.api.register(admin_blueprint)
     wx_text.api.register(admin_blueprint)
+    user.api.register(admin_blueprint)
+    client.api.register(admin_blueprint)
 
     return admin_blueprint
 

app/admin/client.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Time    : 2020/8/26 0026
+# @Author  : justin.郑 3907721@qq.com
+# @File    : client.py
+# @Desc    : 客户端管理
+
+from flask import render_template, request, jsonify
+from werkzeug.security import generate_password_hash
+from app.libs.redprint import Redprint
+from app.libs.role import role_required
+from app.models.client import Client
+from app.models.base import db
+
+api = Redprint('client')
+mdb = globals()['Client']
+
+
+@api.route('/index')
+@role_required()
+def client_index():
+    all = mdb.all()
+    count = mdb.count()
+    return render_template('admin/client/index.html', list=all, count=count, menutitle='客户端管理', navtitle='用户列表')
+
+
+@api.route('/add', methods=['POST', 'GET'])
+@role_required()
+def client_add():
+    if request.method == 'POST':
+        with db.auto_commit():
+            res_add = mdb()
+            res_add.set_attrs(request.form)
+            db.session.add(res_add)
+        return jsonify({'status': 200})
+    else:
+        return render_template('admin/client/add.html')
+
+
+@api.route('/edit', methods=['POST', 'GET'])
+@role_required()
+def client_edit():
+    if request.method == 'GET':
+        id = request.args.get('id')
+        find = mdb.by_id(id)
+        return render_template('admin/client/edit.html', find=find)
+
+    if request.method == 'POST':
+        form = request.form
+        data = mdb().set_dicts(form)
+        id = request.form.get('id')
+        if request.form.get('_password'):
+            data['_password'] = generate_password_hash(request.form.get('_password'))
+        try:
+             mdb.query.filter_by(id=id).update(data)
+             db.session.commit()
+        except Exception as e:
+            return jsonify({'status': 400, 'msg': e})
+        return jsonify({'status': 200})
+
+
+@api.route('/delete', methods=['POST'])
+@role_required()
+def client_delete():
+    id = request.form.get('id')
+    id_list = id.split(",")
+    try:
+        if len(id_list) > 1:
+            for i in id_list:
+                mdb.query.filter_by(id=i).delete()
+        else:
+            mdb.query.filter_by(id=id).delete()
+        db.session.commit()
+    except Exception as e:
+        return jsonify({'status': 400, 'msg': e})
+    return jsonify({'status': 200})
+
+

app/admin/member.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # @Time    : 2020/8/26 0026
 # @Author  : justin.郑 3907721@qq.com
-# @File    : member.py
+# @File    : client.py
 # @Desc    : 用户管理
 
 from flask import render_template, request, jsonify

app/admin/user.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+# _*_ coding: utf-8 _*_
+# @Time : 2024/5/5 15:37
+# @Author : justin.郑 3907721@qq.com
+# @File : user.py
+# @desc : 用户管理
+
+
+from flask import render_template, request, jsonify
+from app.libs.redprint import Redprint
+from app.libs.role import role_required
+from app.models.user import User
+from app.models.base import db
+
+api = Redprint('user')
+mdb = globals()['User']
+
+
+@api.route('/index')
+@role_required()
+def user_index():
+    all = mdb.all()
+    count = mdb.count()
+    return render_template('admin/user/index.html',
+                           list=all, count=count, menutitle='用户管理', navtitle='用户列表')
+
+
+@api.route('/add', methods=['POST', 'GET'])
+@role_required()
+def user_add():
+    if request.method == 'POST':
+        with db.auto_commit():
+            res_add = mdb()
+            res_add.set_attrs(request.form)
+            db.session.add(res_add)
+        return jsonify({'status': 200})
+    else:
+        return render_template('admin/user/add.html')
+
+
+@api.route('/edit', methods=['POST', 'GET'])
+@role_required()
+def user_edit():
+    if request.method == 'GET':
+        id = request.args.get('id')
+        find = mdb.by_id(id)
+        return render_template('admin/user/edit.html', find=find)
+
+    if request.method == 'POST':
+        form = request.form
+        data = mdb().set_dicts(form)
+        id = request.form.get('id')
+        try:
+            mdb.query.filter_by(id=id).update(data)
+            db.session.commit()
+        except Exception as e:
+            return jsonify({'status': 400, 'msg': e})
+        return jsonify({'status': 200})
+
+
+@api.route('/delete', methods=['POST'])
+@role_required()
+def user_delete():
+    id = request.form.get('id')
+    id_list = id.split(",")
+    try:
+        if len(id_list) > 1:
+            for i in id_list:
+                mdb.query.filter_by(id=i).delete()
+        else:
+            mdb.query.filter_by(id=id).delete()
+        db.session.commit()
+    except Exception as e:
+        return jsonify({'status': 400, 'msg': e})
+    return jsonify({'status': 200})
+
+
+

app/api/__init__.py

@@ -5,40 +5,37 @@
 # @File    : __init__.py.py
 # @Desc    :
 
-from flask import Blueprint, current_app
-from werkzeug.exceptions import HTTPException
+from flask import Blueprint
+from http.client import HTTPException
 from app.libs.error import APIException
 from app.libs.error_code import ServerException
 
+
+# 蓝图 Blueprint
 api = Blueprint('api', __name__)
 
-from app.api import token
 from app.api import test
+from app.api import llm
+from app.api import token
+
 
+# 捕捉全局异常
+@api.errorhandler(Exception)
+def framework_error(e):
+    # print(e)
+    if isinstance(e, APIException):
+        return e
+    if isinstance(e, HTTPException):
+        code = e.code
+        msg = e.description
+        error_code = 1007
+        return APIException(msg, code, error_code)
+    else:
+        # 调试模式
+        # log
+        if not api.config['DEBUG']:
+            return ServerException()
+        else:
+            raise e
 
-# # 捕捉全局异常
-# @api.errorhandler(Exception)
-# def framework_error(e):
-#     # print(e)
-#     if isinstance(e, APIException):
-#         return e
-#     if isinstance(e, HTTPException):
-#         code = e.code
-#         msg = e.description
-#         error_code = 1007
-#         return APIException(msg, code, error_code)
-#     else:
-#         # 调试模式
-#         # log
-#         if not current_app.config['DEBUG']:
-#             return ServerException()
-#         else:
-#             raise e
-
-"""
-
-接口地址
-http://127.0.0.1:5000/docs/api
-
-"""
 

app/api/llm.py

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# _*_ coding: utf-8 _*_
+# @Time : 2024/5/20 下午3:29
+# @Author : justin.郑 3907721@qq.com
+# @File : llm.py
+# @desc :
+
+from flask import url_for, current_app
+from werkzeug.utils import redirect
+from app.api import api
+from app.validators.forms import StockForm
+
+
+@api.route('/api/tmp')
+def apiindex():
+    # form = StockForm().validate_for_api()
+    return 'api index'

app/api/test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+1#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # @Time    : 2020/6/19 0019
 # @Author  : justin.郑 3907721@qq.com
@@ -7,10 +7,9 @@
 
 from flask import request, jsonify, g
 from app import cache
-from app.api import api
 from app.libs.token_auth import auth
 import datetime
-
+from app.api import api
 
 # @api.route('/api/v1/auth', methods=['GET'])
 # def api_auth():
@@ -58,16 +57,14 @@
 #     pass
 
 
-@api.route('/api/v1/test', methods=['GET'])
+@api.route('/api/test')
 @auth.login_required
 def api_test():
     """ 测试接口"""
-    if request.method == 'GET':
-        uid = g.member.uid
-        return jsonify({"msg": "ok", "data": "测试", "member_id": uid, "code": 0})
+    return "123"
 
 
-@api.route('/api/v1/cache', methods=['GET'])
+@api.route('/cache', methods=['GET'])
 @cache.cached(timeout=50)
 def api_test_cache():
     time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')

app/api/token.py

@@ -10,12 +10,12 @@
 from app.api import api
 from app.libs.enums import MemberTypeEnum
 from app.libs.error_code import AuthFailed
-from app.models.member import Member
-from app.validators.forms import MemberForm, TokenForm
+from app.models.client import Client
+from app.validators.forms import ClientForm, TokenForm
 from itsdangerous import TimedJSONWebSignatureSerializer as Serializer, SignatureExpired, BadSignature
 
 
-@api.route('/api/v1/get_token', methods=['POST'])
+@api.route('/api/get_token', methods=['POST'])
 def get_token():
     """ 获取Token
     @@@
@@ -28,22 +28,22 @@ def get_token():
 
     #### 返回 json
 
-    > { "token": "eyJhbGciOiJIUzUxMiIsImlhdCI6MTU5OTEyNDA2MiwiZXhwIjoxNTk5MTMxMjYyfQ.eyJ1aWQiOjUsInNjb3BlIjoiTWVtYmVyU2NvcGUifQ.Y1DV9jRO7BajErkyqVws3vhXer-iEPclKNatn7b1UguYDjYsqmIbN0zZGVxXXjGBq5FiOdPF84A3XzMwezzKdg" }
+    > { "token": "eyJhbGciOiJIUzUxMiIsImlhdCI6MTU5OTEyNDA2MiwiZXhwIjoxNTk5MTMxM……" }
 
     #### 备注
     - POST Raw JSON 方式提交
     - http://127.0.0.1:5000/api/v1/get_token
     @@@
     """
-    form = MemberForm().validate_for_api()
-    identity = Member.verify(form.app_key.data, form.app_secret.data)
+    form = ClientForm().validate_for_api()
+    identity = Client.verify(form.app_key.data, form.app_secret.data)
     # 生成令牌
     expiration = current_app.config['TOKEN_EXPIRATION']
     token = generate_auth_token(identity['uid'], identity['scope'], expiration)
     return jsonify({"token": token.decode('ascii')}), 201
 
 
-@api.route('/api/v1/get_token_info', methods=['POST'])
+@api.route('/api/get_token_info', methods=['POST'])
 def get_token_info():
     """获取令牌信息
     @@@