✨ feat(后端接口): 应用商店手表端后端接口

tools/build_out/application/signal_manager.py

 '''
 Author: your name
 Date: 2021-06-30 18:03:41
-LastEditTime: 2021-07-20 03:14:41
+LastEditTime: 2021-07-20 10:23:06
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\application\signal_manager.py
@@ -67,6 +67,8 @@ class SignalManager(object):
     actionPostAppReview = PySignal()
     actionGetLauncher = PySignal()
     actionSetLauncher = PySignal()
+    actionGetApplication = PySignal()
+    actionGetAppInfo = PySignal()
     actionGetAppList = PySignal()
     actionGetEpk = PySignal()
     actionApplicationBuild = PySignal()

tools/build_out/controllers/__init__.py

 '''
 Author: your name
 Date: 2021-06-30 17:43:46
-LastEditTime: 2021-07-20 03:15:10
+LastEditTime: 2021-07-20 10:23:19
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\controllers\__init__.py
@@ -84,5 +84,5 @@ def initConnect():
     signalManager.actionGetLauncher.connect(appReview.getLauncher)
     signalManager.actionApplicationBuild.connect(buildAppResource.post)
     signalManager.actionGetAppList.connect(appReview.getAppList)
-    signalManager.actionGetApp.connect(appReview.getApp)
+    signalManager.actionGetApplication.connect(appReview.getApp)
     signalManager.actionGetEpk.connect(appReview.getDownloadFile)

tools/build_out/controllers/api.py

 '''
 Author: your name
 Date: 2021-07-12 11:14:48
-LastEditTime: 2021-07-20 03:14:03
+LastEditTime: 2021-07-20 11:15:28
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\controllers\appi.py
@@ -148,11 +148,12 @@ class AppReview(object):
         if not user:
             return None, ResponseCode.USER_NOT_EXISTS
 
-        app = AppModel.query.filter(AppModel.launcher=="yes", AppModel.create_at==user.id, AppModel.is_delete==False).one_or_none()
+        app = AppModel.query.filter(AppModel.launcher=="yes", AppModel.create_by==user.id, AppModel.is_delete==False).one_or_none()
         if app:
             app.launcher = "no"
             db.session.commit()
-        app = AppModel.query.filter(AppModel.uuid==params.get("app"), AppModel.create_at==user.id, AppModel.is_delete==False).one_or_none()
+
+        app = AppModel.query.filter(AppModel.uuid==params.get("app"), AppModel.create_by==user.id, AppModel.is_delete==False).one_or_none()
         if not app:
             return None, ResponseCode.APPLICATION_NOT_EXISTS
 
@@ -163,6 +164,7 @@ class AppReview(object):
         return True, ResponseCode.HTTP_SUCCESS
 
     def getApp(self, params, jwt={}):
+        logger.info(166177188)
         app = AppModel.query.filter(AppModel.uuid==params.get("uuid"), AppModel.is_delete==False).one_or_none()
         if not app:
             return None, ResponseCode.APPLICATION_NOT_EXISTS
@@ -186,10 +188,13 @@ class AppReview(object):
 
     def getAppList(self, params, jwt={}):
         filters = [AppModel.is_delete==False]
+        logger.info(params)
+
         if params.get("review"):
             filters.append(AppModel.app_review==params.get("review"))
         if params.get("category"):
             filters.append(AppModel.category==params.get("category"))
+
         apps = AppModel.query.filter(*filters).all()
         if not apps:
             return None, ResponseCode.APPLICATION_NOT_EXISTS
@@ -244,23 +249,23 @@ class AppReview(object):
             if not app:
                 return False, ResponseCode.APPLICATION_NOT_EXISTS
         else:
-            app = AppModel.query.filter(AppModel.app_name==params.get("name")).order_by(AppModel.create_at.desc())
-            if len(app) > 1:
+            apps = AppModel.query.filter(AppModel.app_name==params.get("name")).order_by(AppModel.create_at.desc()).all()
+            if len(apps) > 1:
                 app = AppModel.query.filter(AppModel.app_name == params.get("name")).order_by(AppModel.create_at.desc()).one_or_none()
 
             if not app:
-                return False, "app not found"
+                return False, ResponseCode.APPLICATION_NOT_EXISTS
         
         epk_path = Path(config.UPLOAD_ROOT_DIR).joinpath(app.download_url)
         if not epk_path.exists():
-            return False, "epk file not found"
+            return False, ResponseCode.HTTP_NOT_FOUND
 
-        pack = PackageModel(app=app.id, imei=params.get("imei"))
-        db.session.addd(pack)
-        db.session.commit()
-        if pack:
-            update_download_information(params.get('real_ip', '127.0.0.1'), pack.id)
+        # pack = PackageModel(app=app.id, app_version=app.app_version, imei=params.get("imei"))
+        # db.session.add(pack)
+        # db.session.commit()
+        # if pack:
+        #     update_download_information(params.get('real_ip', '127.0.0.1'), pack.id)
 
-        return epk_path, "get dictionary {}.".format("success" if epk_path else "no data")
+        return epk_path, ResponseCode.HTTP_NOT_FOUND
 
 appReview = AppReview()
\ No newline at end of file

tools/build_out/models/app.py

@@ -18,12 +18,13 @@ class AppModel(PrimaryModel):
     app_screen_size = db.Column(db.String(20), nullable = False)
     app_arch = db.Column(db.String(20), nullable = False, default = '')
     app_review = db.Column(db.Integer, nullable = False, default = 0)
+    meta_data = db.Column(db.String(256), nullable = True)
 
     # __table_args__ = (
     #     db.Index('idx_xxx', 'xxx', mysql_using='btree'),
     # )
 
-    def __init__(self, app_name, app_icon, app_version, category='', launcher='', developer=0, download_url='', app_file_size=0, app_screen_size='', app_arch='', app_review=0, create_by=None, create_at=None, update_by=None, update_at=None, remarks=""):
+    def __init__(self, app_name, app_icon, app_version, category='', launcher='', developer=0, download_url='', meta_data='', app_file_size=0, app_screen_size='', app_arch='', app_review=0, create_by=None, create_at=None, update_by=None, update_at=None, remarks=""):
         self.app_name = app_name
         self.app_icon = app_icon
         self.app_version = app_version
@@ -35,6 +36,7 @@ class AppModel(PrimaryModel):
         self.app_screen_size = app_screen_size
         self.app_arch = app_arch
         self.app_review = app_review
+        self.meta_data = meta_data
         self.create_by = create_by
         self.create_at = create_at
         self.update_by = update_by
@@ -56,6 +58,7 @@ class AppModel(PrimaryModel):
             'app_file_size': self.app_file_size,
             'app_screen_size': self.app_screen_size,
             'app_arch': self.app_arch,
+            'meta_data': self.meta_data,
             'app_review': self.app_review,
             "create_by": self.create_by,
             "update_by": self.update_by,
@@ -70,6 +73,7 @@ class PostAppSchema(ma.SQLAlchemySchema):
         unknown = EXCLUDE # 未知字段默认排除
         model = AppModel
 
+    meta_data = fields.String(required=False)
     app_name = ma.auto_field()
     app_icon = fields.String(required=False)
     app_version = ma.auto_field()
@@ -108,8 +112,9 @@ class GetListAppSchema(ma.SQLAlchemySchema):
     app_icon = fields.String(required=False, nullable=True)
     app_version = fields.String(required=False, nullable=True)
     category = fields.String(required=False, nullable=True)
-    category_2t = fields.String(required=False, nullable=True)
+    launcher = fields.String(required=False, nullable=True)
     app_arch = fields.String(required=False, nullable=True)
+    meta_data = fields.String(required=False, nullable=True)
     download_url = fields.String(required=False, nullable=True)
     app_file_size = fields.Integer(required=False, nullable=True)
     app_screen_size = fields.String(required=False, nullable=True)
@@ -128,10 +133,15 @@ class GetAppSchema(ma.SQLAlchemySchema):
         model = AppModel
 
     app_name = ma.auto_field()
+    app_icon = ma.auto_field()
     app_version = ma.auto_field()
     category = ma.auto_field()
     launcher = ma.auto_field()
     app_arch = ma.auto_field()
+    download_url = ma.auto_field()
+    app_file_size = ma.auto_field()
+    app_screen_size = ma.auto_field()
+    remarks = ma.auto_field()
 
 getAppSchema = GetAppSchema()
 

tools/build_out/result.json

-{"directories": [{"basename": "src", "dirname": "\u6d4b\u8bd58-1.0.8-6-20210717140706", "path": "\u6d4b\u8bd58-1.0.8-6-20210717140706/src", "timestamp": 1626502026, "type": "dir"}], "files": [{"basename": "epk.json", "dirname": "\u6d4b\u8bd58-1.0.8-6-20210717140706", "extension": "json", "filename": "epk", "path": "\u6d4b\u8bd58-1.0.8-6-20210717140706/epk.json", "size": 437, "timestamp": 1626502026, "type": "file"}, {"basename": "\u6d4b\u8bd58.epk", "dirname": "\u6d4b\u8bd58-1.0.8-6-20210717140706", "extension": "epk", "filename": "\u6d4b\u8bd58", "path": "\u6d4b\u8bd58-1.0.8-6-20210717140706/\u6d4b\u8bd58.epk", "size": 2848, "timestamp": 1626502026, "type": "file"}]}
+{"directories": [{"basename": "\u76f8\u518c-1.0.0-2-20210720111035", "dirname": ".", "path": "\u76f8\u518c-1.0.0-2-20210720111035", "timestamp": 1626750635, "type": "dir"}], "files": []}
\ No newline at end of file

tools/build_out/views/__init__.py

 '''
 Author: your name
 Date: 2021-07-15 03:22:19
-LastEditTime: 2021-07-19 19:27:31
+LastEditTime: 2021-07-20 10:07:12
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\views\__init__.py
@@ -40,6 +40,11 @@ api.add_resource(app.AppResourceList, '/app')
 api.add_resource(openapi.AppReviewResource, '/api/app-review')
 api.add_resource(openapi.CStringToolResource, '/api/convert-to-c-string')
 api.add_resource(openapi.BuildAppResource, '/evm_store/application/build')
+api.add_resource(openapi.App, '/api/app')
+api.add_resource(openapi.AppInfo, '/api/app-info')
+api.add_resource(openapi.LauncherResource, '/api/app-launcher')
+api.add_resource(openapi.AppListResource, '/api/app-list')
+api.add_resource(openapi.DownloadEpk, '/api/download-epk')
 
 api.add_resource(package.PackageResource, '/package/<string:uuid>')
 api.add_resource(package.PackageResourceList, '/package')

tools/build_out/views/app.py

@@ -61,6 +61,7 @@ class AppResourceList(Resource):
     @jwt_required(locations=["headers"])
     def post(self):
         self.parser.add_argument('User-Agent', location='headers')
+        self.parser.add_argument("meta_data", type=str, location="form", required=True)
         self.parser.add_argument("app_name", type=str, location="form", required=True)
         self.parser.add_argument("app_version", type=str, location="form", required=True)
         self.parser.add_argument("category", type=str, location="form", required=True)

tools/build_out/views/openapi.py

 '''
 Author: your name
 Date: 2021-07-19 14:29:33
-LastEditTime: 2021-07-20 03:02:05
+LastEditTime: 2021-07-20 11:35:45
 LastEditors: Please set LastEditors
 Description: In User Settings Edit
 FilePath: \evm-store\tools\build_out\views\api.py
@@ -10,10 +10,11 @@ FilePath: \evm-store\tools\build_out\views\api.py
 # -*- coding: utf_8 -*-
 
 import os
+import random
 import traceback
 from pathlib import Path
 from datetime import datetime
-from flask import current_app, jsonify, request
+from flask import current_app, jsonify, request, Response
 from flask_restful import Resource
 from flask_restful.reqparse import RequestParser
 from flask_jwt_extended import ( jwt_required, get_jwt_identity )
@@ -197,26 +198,23 @@ class LauncherResource(Resource):
         super().__init__()
         self.parser = RequestParser()
 
-    def get(self):
+    def post(self):
         # self.parser.add_argument("page", type=int, location="args", default=1)
         self.parser.add_argument("imei", type=str, location="json", required=True)
         args = self.parser.parse_args()
 
         try:
-            print(args)
-            jwt = get_jwt_identity()
             data = dict()
             for key, value in args.items():
                 if value != None:
                     data[key] = value
 
-            result, message = signalManager.actionGetLauncher.emit(data, jwt)
+            result, message = signalManager.actionGetLauncher.emit(data)
             if result:
                 ret = result.read_bytes()
-                # with open(result.as_posix(), "rb") as f:
+                # with open(result.resolve().as_posix(), "rb") as f:
                 #     ret = f.read()
-                #     logger.info(type(ret))
-                return ret
+                return Response(ret, mimetype="text/html", content_type="text/html; charset=utf-8")
             return response_result(message, data=result)
         except ValidationError as e:
             return response_result(ResponseCode.HTTP_INVAILD_REQUEST, data=e.messages)
@@ -233,24 +231,33 @@ class AppListResource(Resource):
         super().__init__()
         self.parser = RequestParser()
 
-    def get(self):
-        # self.parser.add_argument("page", type=int, location="args", default=1)
-        self.parser.add_argument("category", type=str, location="json", required=True)
+    def post(self):
+        self.parser.add_argument("imei", type=str, location="json", required=False)
+        self.parser.add_argument("review", type=int, location="json", required=False)
+        self.parser.add_argument("category", type=str, location="json", required=False)
         args = self.parser.parse_args()
 
         try:
-            print(args)
             data = dict()
             for key, value in args.items():
                 if value != None:
                     data[key] = value
-            result, message = signalManager.actionGetApp.emit(data, {})
+
+            dataList = None
+            result, message = signalManager.actionGetAppList.emit(data)
             if result:
-                result = getListAppsSchema.dumps(result.items)
-            return response_result(message, data=result)
+                dataList = []
+                # 遍历列表，添加一些额外信息
+                for item in result:
+                    t = item.to_dict()
+                    t.update({ 'download': random.randint(1, 1000), 'like': random.randint(0, 100) })
+                    dataList.append(t)
+                # result = getListAppsSchema.dumps(result)
+            return response_result(message, data=dataList)
         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
@@ -265,23 +272,23 @@ class App(Resource):
 
     def get(self):
         # self.parser.add_argument("page", type=int, location="args", default=1)
-        self.parser.add_argument("uuid", type=str, location="json", required=True)
+        self.parser.add_argument("uuid", type=str, location="args", required=True)
         args = self.parser.parse_args()
 
         try:
-            print(args)
             data = dict()
             for key, value in args.items():
                 if value != None:
                     data[key] = value
 
-            result, message = signalManager.actionGetApp.emit(data)
+            result, message = signalManager.actionGetApplication.emit(data)
             if result:
                 result = getAppSchema.dump(result)
             return response_result(message, data=result)
         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
@@ -296,12 +303,11 @@ class AppInfo(Resource):
 
     def get(self):
         # self.parser.add_argument("page", type=int, location="args", default=1)
-        self.parser.add_argument("imei", type=str, location="json", required=True)
+        self.parser.add_argument("imei", type=str, location="args", required=True)
         args = self.parser.parse_args()
 
         try:
-            print(args)
-
+            logger.info(args)
             return response_result(ResponseCode.HTTP_SUCCESS)
         except ValidationError as e:
             return response_result(ResponseCode.HTTP_INVAILD_REQUEST, data=e.messages)
@@ -318,7 +324,8 @@ class DownloadEpk(Resource):
         super().__init__()
         self.parser = RequestParser()
 
-    def get(self):
+    def post(self):
+        self.parser.add_argument("byId", type=str, location="json", required=True)
         self.parser.add_argument("uuid", type=str, location="json", required=True)
         self.parser.add_argument("imei", type=str, location="json", required=True)
         args = self.parser.parse_args()
@@ -331,7 +338,7 @@ class DownloadEpk(Resource):
                     data[key] = value
 
             data.update({ 'real_ip': request.headers.get('X-Forwarded-For', '127.0.0.1') })
-            result, message = signalManager.actionGetDownload.emit(data)
+            result, message = signalManager.actionGetEpk.emit(data)
             # 读取epk文件，按照格式返回相应结构体数据
             logger.info(data)
             if result:
@@ -339,7 +346,7 @@ class DownloadEpk(Resource):
                 # with open(result.as_posix(), "rb") as f:
                 #     ret = f.read()
                 #     logger.info(type(ret))
-                return ret
+                return Response(ret, content_type="text/html; charset=utf-8")
             return response_result(message, data=result)
         except ValidationError as e:
             return response_result(ResponseCode.HTTP_INVAILD_REQUEST, data=e.messages)

tools/frontend/src/views/Application/Form.vue

@@ -17,7 +17,7 @@
         >
           <a-radio-group v-model="post.algorithm">
             <a-radio-button value="zlib"> zlib </a-radio-button>
-            <a-radio-button value="eheatshrink"> eheatshrink </a-radio-button>
+            <a-radio-button value="heatshrink"> heatshrink </a-radio-button>
           </a-radio-group>
         </a-form-item>
         <a-form-item
@@ -98,6 +98,13 @@
         >
           <a-textarea v-model="post.remarks" rows="4" placeholder="请输入应用介绍" />
         </a-form-item>
+        <a-form-item
+          label="元信息"
+          :labelCol="{ span: 7 }"
+          :wrapperCol="{ span: 10 }"
+        >
+          <a-textarea v-model="post.meta_data" rows="4" placeholder="可以存储一些JSON格式应用元信息，接口获取" />
+        </a-form-item>
         <a-form-item
           label="应用源文件"
           :labelCol="{ span: 7 }"
@@ -176,6 +183,7 @@ export default {
         app_screen_size: null,
         app_arch: null,
         remarks: null,
+        meta_data: null,
         logo: null,
         fileList: []
       },

tools/frontend/src/views/Application/Index.vue

@@ -267,22 +267,10 @@
               <a-col :span="12"> </a-col>
             </a-row>
             <a-divider />
-            <p :style="[sya]">Contacts</p>
+            <p :style="[sya]">应用元信息</p>
             <a-row>
-              <a-col :span="6">
-                <a-description-item title="Email" :content="record.email" />
-              </a-col>
-              <a-col :span="6">
-                <a-description-item title="Cell" :content="record.cell" />
-              </a-col>
-              <a-col :span="6">
-                <a-description-item title="Phone" :content="record.phone" />
-              </a-col>
-              <a-col :span="6">
-                <a-description-item
-                  title="Coordinates"
-                  :content="record.latitude + ' ' + record.longitude"
-                />
+              <a-col :span="24">
+                <a-description-item title="JSON" :content="record.meta_data" />
               </a-col>
             </a-row>
             <a-row>