🐞 fix(): 更新获取打包数据接口

tools/build_out/controllers/login.py

@@ -68,9 +68,9 @@ class LoginResource(object):
 
         # 生成一个token，返回给前端
         result = {
-            'uuid': user.uuid,
+            'uuid': str(user.uuid),
             'name': user.username,
-            'token': create_access_token(identity={'uuid': user.uuid, 'name': user.username}),
+            'token': create_access_token(identity={'uuid': str(user.uuid), 'name': user.username}),
         }
         return result, ResponseCode.HTTP_SUCCESS
 

tools/build_out/controllers/package.py

 '''
 Author: your name
 Date: 2021-06-30 18:03:41
-LastEditTime: 2021-07-17 16:01:22
+LastEditTime: 2021-07-22 10:11:34
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\controllers\package.py
@@ -60,9 +60,8 @@ class PackageResource(object):
                 temp.append({ "name": item.app.app_name, "uuid": str(item.uuid) })
             return temp, len(temp), "get build_logs {}.".format("success" if temp else "fail")
 
-        temp = [PackageModel.is_delete==False]
+        temp = [PackageModel.is_delete==False, PackageModel.create_by==user.id]
         if params.get("app") and isinstance(params.get("app"), str):
-            logger.info(params.get("app"))
             app = AppModel.query.filter(AppModel.uuid==params.get("app")).one_or_none()
             if app:
                 params.update({ "app": app.id })

tools/build_out/controllers/workbench.py

+'''
+Author: your name
+Date: 2021-07-22 04:03:24
+LastEditTime: 2021-07-22 04:03:24
+LastEditors: Please set LastEditors
+Description: In User Settings Edit
+FilePath: \evm-store\tools\build_out\controllers\workbench.py
+'''
+from datetime import datetime, timedelta
+
+
+time_now = datetime.now()
+#最近30天数据
+model_user = User.query.filter(User.create_time >= time_now - timedelta(days=30)).all()
+#最近一周数据
+model_user = User.query.filter(User.create_time >= time_now - timedelta(days=7)).all()
+#最近1天数据
+model_user = User.query.filter(User.create_time >= time_now - timedelta(days=1)).all()
+#最近12小时
+model_user = User.query.filter(User.create_time >= time_now - timedelta(hours=12)).all()
+#最近半小时
+model_user = User.query.filter(User.create_time >= time_now - timedelta(seconds=30)).all()

tools/build_out/views/login.py

+'''
+Author: your name
+Date: 2021-07-15 09:33:39
+LastEditTime: 2021-07-22 09:26:14
+LastEditors: Please set LastEditors
+Description: In User Settings Edit
+FilePath: \evm-store\tools\build_out\views\login.py
+'''
 #!/usr/bin/env python
 # -*- coding: utf_8 -*-
 
+import traceback
 from flask import current_app, jsonify, request
 from flask_restful import Resource
 from flask_restful.reqparse import RequestParser
@@ -53,6 +62,7 @@ class LoginResourceList(Resource):
         except ValidationError as e:
             return response_result(ResponseCode.HTTP_INVAILD_REQUEST, data=e.messages)
         except Exception as e:
+            traceback.print_exc()
             data = None
             if hasattr(e, 'args'):
                 data = e.args

tools/build_out/views/openapi.py

 '''
 Author: your name
 Date: 2021-07-19 14:29:33
-LastEditTime: 2021-07-22 03:20:49
+LastEditTime: 2021-07-22 10:01:22
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\views\api.py
@@ -27,7 +27,7 @@ from marshmallow.exceptions import ValidationError
 from application.app import db
 from application.config import config
 from application.signal_manager import signalManager
-from models import engine, MyModel, MyModel2
+from models import MyModel, MyModel2
 from models.app import AppModel
 from models.annex import AnnexModel
 from models.monitorSystem import MonitorSystemModel
@@ -102,14 +102,15 @@ class BuildAppResource(Resource):
 
     def get(self):
         try:
-            # result = db.session.query(AnnexModel).all()
-            # res = db.session.query(AnnexModel).filter(AnnexModel.id>=100).update({ 'uuid': uuid.uuid1().hex })
+            # res = db.session.query(AppModel).filter(AppModel.id>1000).update({ 'uuid': uuid.uuid4().hex })
             # logger.info(res)
-            # for item in result:
-            #     item.uuid = uuid.uuid1().hex
-            #     logger.info(item.uuid)
-            #     db.session.flush()
-            # db.session.commit()
+            
+            result = db.session.query(AppModel).all()
+            for item in result:
+                item.uuid = uuid.uuid1().hex
+                logger.info(item.uuid)
+                db.session.flush()
+            db.session.commit()
 
             # result = db.session.query(PackageModel).all()
             # print(result)
@@ -121,13 +122,9 @@ class BuildAppResource(Resource):
             #     db.session.flush()
             # db.session.commit()
 
-            with engine.connect() as conn:
-                logger.info(123)
-
             # result_proxy = conn.execute("select id, host, path, protocol, create_at from monitor_request")
             # result = result_proxy.fetchall()
             result = db.session.query(MyModel2).filter().all()
-                logger.info(result)
             for item in result:
                 res = MonitorSystemModel.query.filter(MonitorSystemModel.id==item.id).first()
                 if not res:
@@ -146,7 +143,6 @@ class BuildAppResource(Resource):
             # result = result_proxy.fetchall()
 
             result = db.session.query(MyModel).filter().all()
-                logger.info(result)
             for item in result:
                 # print(item[3])
                 # 查找app，更新download_url
@@ -295,8 +291,6 @@ class ObfuscatedCode(Resource):
             return response_result(ResponseCode.HTTP_SERVER_ERROR, data=data)
 
 # 获取启动器接口
-
-
 class LauncherResource(Resource):
     def __init__(self) -> None:
         super().__init__()
@@ -331,8 +325,6 @@ class LauncherResource(Resource):
             return response_result(ResponseCode.HTTP_SERVER_ERROR, data=data)
 
 # 获取App列表接口
-
-
 class AppListResource(Resource):
     def __init__(self) -> None:
         super().__init__()
@@ -413,8 +405,6 @@ class AppListResource(Resource):
             return response_result(ResponseCode.HTTP_SERVER_ERROR, data=data)
 
 # 获取应用接口
-
-
 class App(Resource):
     def __init__(self) -> None:
         super().__init__()

tools/frontend/src/defaultSettings.js

 /*
  * @Author: your name
  * @Date: 2021-07-15 09:33:39
- * @LastEditTime: 2021-07-15 18:24:43
+ * @LastEditTime: 2021-07-22 09:50:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \evm-store\tools\frontend\src\defaultSettings.js
@@ -11,9 +11,9 @@ export default {
     primaryColor: '#1890FF', // primary color of ant design
     layout: 'sidemenu', // nav menu position: sidemenu or topmenu
     contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
-    fixedHeader: true, // sticky header
-    autoHideHeader: true, // auto hide header
-    fixSiderbar: true, // sticky siderbar
+    fixedHeader: false, // sticky header
+    autoHideHeader: false, // auto hide header
+    fixSiderbar: false, // sticky siderbar
     leftMenuTitle: "EVM 应用商店", // 左侧边栏顶部名称
     leftMenuIcon: "", // 左侧边栏顶部Logo
     appSlogan: "EVM，致力于为互联网行业提供物联网解决方案", // 应用宣传文案

tools/frontend/vue.config.js

 /*
  * @Author: your name
  * @Date: 2021-07-15 09:33:39
- * @LastEditTime: 2021-07-17 16:45:06
+ * @LastEditTime: 2021-07-22 03:35:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \evm-store\tools\frontend\vue.config.js
@@ -15,7 +15,7 @@ function resolve(dir) {
   return path.join(__dirname, dir);
 }
 // 基础路径 注意发布之前要先修改这里
-const BASE_URL = process.env.NODE_ENV === "production" ? "/frontend/" : "/";
+const BASE_URL = process.env.NODE_ENV === "production" ? "./" : "/";
 
 module.exports = {
   publicPath: BASE_URL, // 根据你的实际情况更改这里