README.md

@@ -21,8 +21,7 @@
    ├── ...
 ```
 
-## 配置信息
-### Dockerfile
+## Dockerfile
 
 ```bash
 # generalai:v1是镜像名，192.168.10.94:5000是镜像仓库docker registry本地地址
@@ -88,7 +87,7 @@ docker build -t lemon:latest .
 docker images 查看生成的镜像 lemon:latest
 ```
 
-### docker-compose.yml
+## docker-compose.yml
 
 ```shell
 version: "3.3"
@@ -109,8 +108,6 @@ services:
 #      - /data/app/lemon:/app/lemon  # 如果由相同的设置，则会覆盖Dockfile中COPY的文件
       - /data/app/log:/app/log
       - /data/app/fileupload:/app/fileupload
-      - /usr/sbin/dmidecode:/usr/sbin/dmidecode  # dmidecode命令需要root权限，否则会报错
-      - /dev/mem:/dev/mem                        # /dev/mem需要root权限，否则会报错
     environment:
       - TZ=Asia/Shanghai
     networks:    # 配置网络
@@ -170,7 +167,7 @@ networks:
     driver: bridge   # 如果不设置，则默认使用bridge
 ```
 
-### entrypoint.sh
+## entrypoint.sh
 
 ```bash
 #!/bin/bash
@@ -239,14 +236,14 @@ function print_dir_structure() {
 echo "启动完成"
 ```
 
-### mysql初始化
+## mysql初始化
 
 ```
     mysql_app.sql, 数据库的结构，以及默认账号的初始化
     mysql_auth.sql， 修改密码加密规格，修改密码
 ```
 
-### nginx
+## nginx
 
 ```
 server {
@@ -269,7 +266,7 @@ server {
 }
 ```
 
-### supervisor
+## supervisor
 
 ```
 [program:lemon]
@@ -289,43 +286,10 @@ command 可以使用动态参数，例如：--port=88%(process_num)02d，默认
 多进程则修改numproc的值，如numproc=2，则第一个进程使用8800端口，第二个进程使用8801端口。
 ```
 
-## 启动项目
-
-### 本地编译启动
+## 启动
 
 ```
 1. 修改配置文件
 2. 编译，docker build -t lemon .
 3. docker-compose up -d
 ```
-
-### 镜像打包
-
-```
-Dockerfile中首行配置 FROM 192.168.10.94:5000/generalai:v1，使用的是开发环境的docker registry镜像
-这个image中包含工程运行需要的基础环境，包括各种包，supervisor
-
-镜像制作：
-    docker build -t lemon .
-
-镜像导出：
-export: 
-    docker export lemon_web lemon.tar  # lemon_web是docker-compose.yml中的container name, 或者使用container id
-
-或者save:
-    docker save -o lemon.tar lemon:latest # 导出为tar文件，方便传输
-```
-
-### 导入docker镜像包
-
-```
-import: docker import lemon.tar lemon:latest
-或者load: docker load < lemon.tar
-docker-compose up -d
-```
-
-### 查看日志
-
-```
-docker logs -f lemon_web
-```

docker-compose.yml

@@ -16,19 +16,8 @@ services:
 #      - /data/app/lemon:/app/lemon
       - /data/app/log:/app/log
       - /data/app/fileupload:/app/fileupload
-      - ./private_key.pem:/app/lemon/private_key.pem
-      - /usr/sbin/dmidecode:/usr/sbin/dmidecode
-      - /dev/mem:/dev/mem
     environment:
       - TZ=Asia/Shanghai
-      - MYSQL_DATABASE=aiplatform
-      - MYSQL_USER=root
-      - MYSQL_PASSWORD=SghjdA887#
-      - MYSQL_HOST=lemon_mysql
-      - MYSQL_PORT=3306
-      - REDIS_HOST=lemon_redis
-      - REDIS_PORT=6379
-      - REDIS_PASSWORD=hgkiYY87
     networks:
       - lemon_network
     depends_on:
@@ -40,9 +29,8 @@ services:
     image: nginx:latest
     container_name: lemon_nginx
     ports:
-#      - "80:80"
-#      - "443:443"
-      - "8989:8989"
+      - "80:80"
+      - "443:443"
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/lemon.conf
       - ./dist:/app/lemon/dist

entrypoint.sh

@@ -22,26 +22,15 @@
 if [ ! -f "/app/lemon/website/settings_local.py" ];then
     echo "@@init settings_local file"
     cat > /app/lemon/website/settings_local.py << EOF
-import os
-
 mysql_app = {
-    "host": "{}:{}".format(os.environ.get("MYSQL_HOST"), os.environ.get("MYSQL_PORT")),
-    "database": os.environ.get("MYSQL_DATABASE"),
-    "user": os.environ.get("MYSQL_USER"),
-    "password": os.environ.get("MYSQL_PASSWORD"),
+    "host": "lemon_mysql:3306",
+    "database": "aiplatform",
+    "user": "root",
+    "password": "SghjdA887#",
     "time_zone": "+8:00"
 }
-
-redis_app = (
-    os.environ.get("REDIS_HOST"),
-    os.environ.get("REDIS_PORT"),
-    0,
-    os.environ.get("REDIS_PASSWORD"),
-)
-
+redis_app = ("lemon_redis", 6379, 0, "hgkiYY87")
 file_upload_dir = "/app/fileupload"
-rsa_private_file = "/app/lemon/private_key.pem"
-rsa_license_file = "/app/lemon/license"
 EOF
 fi
 

mysql_app.sql

@@ -48,7 +48,7 @@ CREATE TABLE `enterprise`  (
   `industry` int NOT NULL,
   `contact` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
   `phone` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `summary` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
+  `summary` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
   `logo` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL,
   `account` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
   `pwd` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,

nginx.conf

@@ -1,8 +1,7 @@
 server {
-    listen 8989;
+    listen 80;
     server_name 192.168.10.94;
 
-    client_max_body_size 300M;
     root /app/lemon/dist;
 
     location ^~ /api {

website/consts.py

@@ -41,31 +41,3 @@ device_status_map = {
     1003: u"运行中",
     1004: u"故障",
 }
-
-# 系统状态
-system_status_not_active = 9000  # 未激活
-system_status_activated = 9001  # 已激活
-system_status_expire_atall = 9003  # 完全过期
-
-op_type_add = 1001  # 新增
-op_type_add_str = u"新增"
-
-op_type_edit = 1002  # 编辑
-op_type_edit_str = u"编辑"
-
-op_type_list = 1003  # 查询
-op_type_list_str = u"查询"
-
-op_type_delete = 1004  # 删除
-op_type_delete_str = u"删除"
-
-op_type_upload = 1005  # 上传
-op_type_upload_str = u"上传"
-
-op_type_map = {
-    op_type_add: op_type_add_str,
-    op_type_edit: op_type_edit_str,
-    op_type_list: op_type_list_str,
-    op_type_delete: op_type_delete_str,
-    op_type_upload: op_type_upload_str,
-}

website/db/alg_model/alg_model.py

@@ -97,4 +97,4 @@ class ModelRepositry(object):
 
     def get_model_count(self) -> int:
         with get_session() as session:
-            return session.query(Model).filter(Model.delete == 0).count()
+            return session.query(Model).count()

website/db/enterprise/enterprise.py

@@ -19,7 +19,7 @@ def get_enterprise_device_count(id: int) -> int:
 # 获取所有企业实体数量
 def get_enterprise_entity_count(engine: Any) -> int:
     with engine.connect() as conn:
-        count_sql_text = "select count(*) from enterprise where del=0 "
+        count_sql_text = "select count(*) from enterprise "
         count = conn.execute(text(count_sql_text)).fetchone()
         if count:
             return count[0]

website/handler.py

@@ -496,7 +496,7 @@ def authenticated_admin(method):
     return wrapper
 
 
-def operation_log(primary_menu, sub_menu, ope_type, content, comment=""):
+def operation_log(primary_menu, sub_menu, ope_type, content, comment):
     """
     Add logging to a function. level is the logging
     level, name is the logger name, and message is the
@@ -507,7 +507,6 @@ def operation_log(primary_menu, sub_menu, ope_type, content, comment=""):
     def decorate(func):
         @functools.wraps(func)
         def wrapper(self, *args, **kwargs):
-            try:
             with self.app_mysql.connect() as conn:
                 conn.execute(text(
                     "insert into sys_log(user, ip, primary_menu, sub_menu, op_type, content, comment) "
@@ -524,8 +523,6 @@ def operation_log(primary_menu, sub_menu, ope_type, content, comment=""):
                      }
                 )
                 conn.commit()
-            except Exception as e:
-                logging.info("operation log error: %s" % e)
 
             return func(self, *args, **kwargs)
 

website/handlers/alg_model/handler.py

@@ -8,7 +8,7 @@ from website import consts
 from website import db_mysql
 from website import errors
 from website import settings
-from website.handler import APIHandler, authenticated, operation_log
+from website.handler import APIHandler, authenticated
 from website.util import md5, shortuuid
 
 
@@ -19,7 +19,6 @@ class ClassificationAddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_add_str, "添加模型分类", "")
     def post(self):
         name = self.get_escaped_argument("name", "")
         if not name:
@@ -54,7 +53,6 @@ class ClassificationEditHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_edit_str, "编辑模型分类", "")
     def post(self):
         classification_id = self.get_int_argument("id")
         name = self.get_escaped_argument("name", "")
@@ -77,7 +75,6 @@ class ClassificationListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_list_str, "查询模型分类", "")
     def post(self):
         with self.app_mysql.connect() as conn:
             cur = conn.execute(text("""select id, name from model_classification"""))
@@ -92,7 +89,6 @@ class ClassificationDeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_delete_str, "删除模型分类", "")
     def post(self):
         classification_id = self.get_int_argument("id")
         if not classification_id:
@@ -114,7 +110,6 @@ class ListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_list_str, "查询模型列表", "")
     def post(self):
         pageNo = self.get_int_argument("pageNo", 1)
         pageSize = self.get_int_argument("pageSize", consts.PAGE_SIZE)
@@ -129,7 +124,7 @@ class ListHandler(APIHandler):
 
             param = {}
 
-            sql_count = "select count(id) from model m where m.del=0 "
+            sql_count = "select count(id) from model where del=0 "
             param_count = {}
 
             if name:
@@ -166,7 +161,6 @@ class ListHandler(APIHandler):
 
 class ListSimpleHandler(APIHandler):
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_list_str, "查询模型列表", "")
     def post(self):
         with self.app_mysql.connect() as conn:
             sql = "select id, name from model where del=0"
@@ -182,7 +176,6 @@ class AddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "添加模型", consts.op_type_add_str, "添加模型", "")
     def post(self):
         name = self.get_escaped_argument("name", "")
         model_type = self.get_int_argument(
@@ -225,7 +218,6 @@ class EditHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "编辑模型", consts.op_type_edit_str, "编辑模型", "")
     def post(self):
         mid = self.get_int_argument("id")
         name = self.get_escaped_argument("name", "")
@@ -266,7 +258,6 @@ class InfoHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型信息", consts.op_type_list_str, "查询模型信息", "")
     def post(self):
         mid = self.get_int_argument("id")
         if not mid:
@@ -309,7 +300,6 @@ class DeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型列表", consts.op_type_delete_str, "删除模型", "")
     def post(self):
         mid = self.get_int_argument("id")
         if not mid:
@@ -339,7 +329,6 @@ class VersionAddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_add_str, "添加模型版本", "")
     def post(self):
         mid = self.get_int_argument("model_id")
         version = self.get_escaped_argument("version", "")
@@ -393,7 +382,6 @@ class VersionEditHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_edit_str, "编辑模型版本", "")
     def post(self):
         version_id = self.get_int_argument("version_id")
         version = self.get_escaped_argument("version", "")
@@ -457,7 +445,6 @@ class VersionListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_list_str, "模型版本列表", "")
     def post(self):
         model_id = self.get_int_argument("model_id")
         pageNo = self.get_int_argument("pageNo", 1)
@@ -537,7 +524,6 @@ class VersionInfoHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_list_str, "查询模型版本详情", "")
     def post(self):
         version_id = self.get_int_argument("version_id")
         response = {
@@ -620,7 +606,6 @@ class VersionSetDefaultHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_edit_str, "设置模型版本为默认版本", "")
     def post(self):
         version_id = self.get_int_argument("version_id")
         model_id = self.get_int_argument("model_id")
@@ -659,7 +644,6 @@ class VersionDeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型版本", consts.op_type_delete_str, "删除模型版本", "")
     def post(self):
         version_id = self.get_int_argument("version_id")
         if not version_id:

website/handlers/alg_model_hub/handler.py

@@ -9,7 +9,7 @@ from website import consts
 from website import db_mysql
 from website import errors
 from website import settings
-from website.handler import APIHandler, authenticated, operation_log
+from website.handler import APIHandler, authenticated
 
 
 class ListHandler(APIHandler):
@@ -38,7 +38,6 @@ class ListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_list_str, "查询模型运行库列表", "")
     def post(self):
         pageNo = self.get_int_argument("pageNo", 1)
         pageSize = self.get_int_argument("pageSize", consts.PAGE_SIZE)
@@ -105,7 +104,6 @@ class SyncHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_list_str, "查询模型运行库镜像", "")
     def post(self):
         host = self.get_escaped_argument("host", "")
         port = self.get_int_argument("port")
@@ -144,7 +142,6 @@ class AddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_add_str, "新建模型运行库", "")
     def post(self):
         name = self.get_escaped_argument("name", "")
         host = self.get_escaped_argument("host", "")
@@ -191,7 +188,6 @@ class  EditHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_edit_str, "编辑模型运行库", "")
     def post(self):
         id = self.get_int_argument("id")
         name = self.get_escaped_argument("name", "")
@@ -199,7 +195,7 @@ class  EditHandler(APIHandler):
         port = self.get_int_argument("port")
         path = self.get_escaped_argument("path", "")
         comment = self.get_escaped_argument("comment", "")
-        if not id or not name or not host or not port or not path:
+        if not id or not name or not host or not port or path:
             raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, "parameter error")
         with self.app_mysql.connect() as conn:
             conn.execute(
@@ -239,7 +235,6 @@ class InfoHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_list_str, "查询模型运行库信息", "")
     def post(self):
         hid = self.get_int_argument("id")
         if not id:
@@ -271,7 +266,6 @@ class DeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("模型管理", "模型运行库", consts.op_type_delete_str, "删除模型运行库", "")
     def post(self):
         hid = self.get_int_argument("id")
         if not id:

website/handlers/enterprise_busi_model/handler.py

@@ -3,8 +3,8 @@ import json
 import logging
 from sqlalchemy import text
 
-from website import db_mysql, errors, consts
-from website.handler import APIHandler, authenticated, operation_log
+from website import db_mysql, errors
+from website.handler import APIHandler, authenticated
 from website.util import shortuuid
 from website.db.enterprise_busi_model import enterprise_busi_model as DB_BusiModel
 from website.db.enterprise_busi_model import enterprise_busi_model_node_device as DB_BusiModelNodeDevice
@@ -35,7 +35,6 @@ class ListHandler(APIHandler):
     ```
     """
     @authenticated
-    @operation_log("企业管理", "业务模型", consts.op_type_list_str, "查询企业部署的业务模型列表", "")
     def post(self):
         pageNo = self.get_int_argument("pageNo", 1)
         pageSize = self.get_int_argument("pageSize", 10)
@@ -64,7 +63,6 @@ class AddHandler(APIHandler):
     - 返回值：无
     """
     @authenticated
-    @operation_log("企业管理", "业务模型", consts.op_type_add_str, "添加企业部署的业务模型", "")
     def post(self):
         entity_id = self.get_int_argument("entity_id")
         name = self.get_escaped_argument("name", "")
@@ -133,7 +131,6 @@ class InfoHandler(APIHandler):
     ```
     """
     @authenticated
-    @operation_log("企业管理", "业务模型", consts.op_type_list_str, "查询企业部署的业务模型详情")
     def post(self):
         busimodel_id = self.get_int_argument("id")
     
@@ -192,7 +189,6 @@ class EditHandler(APIHandler):
     - 返回值：无
     """
     @authenticated
-    @operation_log("企业管理", "业务模型", consts.op_type_edit_str, "编辑企业部署的业务模型")
     def post(self):
         busimodel_id = self.get_int_argument("id")
     
@@ -259,7 +255,6 @@ class EditHandler(APIHandler):
 
 class DeleteHandler(APIHandler):
     @authenticated
-    @operation_log("企业管理", "业务模型", consts.op_type_delete_str, "删除企业部署的业务模型")
     def post(self):
         busimodel_id = self.get_int_argument("id")
         if not busimodel_id:

website/handlers/enterprise_device/handler.py

@@ -16,7 +16,7 @@ from website.db.enterprise_busi_model import enterprise_busi_model_node_device a
 from website.db.enterprise_device import enterprise_device as DB_Device
 from website.db.enterprise_node import enterprise_node as DB_Node
 from website.db.enterprise_node import enterprise_node_base_model_conf as DB_NodeBaseModelConf
-from website.handler import APIHandler, authenticated, operation_log
+from website.handler import APIHandler, authenticated
 from website.util import date_util
 from website.util import shortuuid
 
@@ -37,7 +37,6 @@ class DeviceClassificationAddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_add_str, "添加设备分类")
     def post(self):
         name = self.get_escaped_argument("name", "")
         with self.app_mysql.connect() as conn:
@@ -83,7 +82,6 @@ class DeviceClassificationHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_list_str, "设备分类列表")
     def post(self):
         with self.app_mysql.connect() as conn:
             cur = conn.execute(
@@ -107,7 +105,6 @@ class DeviceClassificationDeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_delete_str, "删除设备分类")
     def post(self):
         did = self.get_int_argument("id")
 
@@ -154,7 +151,6 @@ class DeviceAddHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_add_str, "企业节点，添加设备")
     def post(self):
         entity_id = self.get_int_argument("entity_id")
         node_id = self.get_int_argument("node_id")
@@ -208,7 +204,6 @@ class DeviceEditHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_edit_str, "企业节点，编辑设备")
     def post(self):
         device_id = self.get_int_argument("device_id")
         name = self.get_escaped_argument("name", "")
@@ -248,7 +243,6 @@ class DeviceDeleteHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_delete_str, "企业节点，删除设备")
     def post(self):
         # node_id = self.get_int_argument('node_id')
         device_id = self.get_int_argument("device_id")
@@ -287,7 +281,6 @@ class DeviceListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_list, "企业节点，设备列表")
     def post(self):
         node_id = self.get_int_argument("node_id")
         pageNo = self.get_int_argument("pageNo", 1)
@@ -336,8 +329,7 @@ class DeviceInfoHandler(APIHandler):
         }
     ```
     """
-    @authenticated
-    @operation_log("企业管理", "设备管理", consts.op_type_list, "企业节点，设备信息")
+
     def post(self):
         device_id = self.get_int_argument("device_id")
         if not device_id:
@@ -382,7 +374,6 @@ class DeviceBasemodelListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list, "企业节点，节点信息 -> 设备列表 -> 基础模型配置 -> 模型列表")
     def post(self):
         device_id = self.get_int_argument("device_id")
         if not device_id:
@@ -404,6 +395,9 @@ class DeviceBasemodelListHandler(APIHandler):
             busi_model_id = item["busi_model_id"]
             busi_model_name = item["name"]
             base_model_list = json.loads(item["base_models"])
+            logging.info("##############################################################")
+            logging.info(base_model_list)
+            logging.info("##############################################################")
             base_models = []
             for base_model in base_model_list:
                 base_model_id = base_model["id"]
@@ -454,8 +448,6 @@ class DeviceBaseModelCustomConfigHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_add_str,
-                   "企业节点，节点信息 -> 设备列表 -> 基础模型配置 -> 基础模型参数配置")
     def post(self):
         device_id = self.get_int_argument("device_id")
         node_id = self.get_int_argument("node_id")
@@ -541,7 +533,6 @@ class StatusListHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "设备状态", consts.op_type_list_str,"设备状态列表")
     def post(self):
         entity_id = self.get_int_argument("entity_id")
         group = self.get_int_argument("group")
@@ -608,7 +599,6 @@ class StatusInfoHandler(APIHandler):
     """ """
 
     @authenticated
-    @operation_log("企业管理", "设备状态", consts.op_type_list_str, "设备信息")
     def post(self):
         device_id = self.get_int_argument("id")
         if not device_id:

website/handlers/enterprise_entity/handler.py

@@ -12,7 +12,7 @@ from website import settings
 from website.db.alg_model.alg_model import ModelRepositry
 from website.db.enterprise import enterprise
 from website.db.enterprise_device.enterprise_device import EnterpriseDeviceRepository
-from website.handler import APIHandler, authenticated, operation_log
+from website.handler import APIHandler, authenticated
 from website.util import shortuuid, aes
 
 
@@ -24,7 +24,6 @@ class EntityIndexHandler(APIHandler):
     """首页"""
 
     @authenticated
-    @operation_log("首页", "企业列表", consts.op_type_list_str, "企业列表")
     async def post(self):
         pageNo = self.get_int_argument("pageNo", 1)
         pageSize = self.get_int_argument("pageSize", 10)
@@ -120,7 +119,6 @@ class EntityIndexBasecountHandler(APIHandler):
     """首页基础统计书记"""
 
     @authenticated
-    @operation_log("首页", "企业列表", consts.op_type_list_str, "基础统计数据")
     def post(self):
         entity_count = enterprise.get_enterprise_entity_count(self.app_mysql)
         model_repository = ModelRepositry()
@@ -135,7 +133,6 @@ class EntityAddHandler(APIHandler):
     """添加企业"""
 
     @authenticated
-    @operation_log("首页", "企业列表", consts.op_type_add_str, "添加企业项目")
     def post(self):
         name = self.tostr(self.get_escaped_argument("name", ""))
         province = self.get_escaped_argument("province", "")
@@ -206,7 +203,6 @@ class EntityEditHandler(APIHandler):
     """编辑企业"""
 
     @authenticated
-    @operation_log("首页", "企业列表", consts.op_type_edit_str, "编辑企业项目")
     def post(self):
         eid = self.get_int_argument("id")
         name = self.tostr(self.get_escaped_argument("name", ""))
@@ -271,7 +267,6 @@ class EntityInfoHandler(APIHandler):
     """企业信息"""
 
     @authenticated
-    @operation_log("企业管理", "企业信息", consts.op_type_list_str, "企业信息")
     def post(self):
         eid = self.get_int_argument("id")
 
@@ -315,7 +310,6 @@ class ModelsHandler(APIHandler):
     """企业模型"""
 
     @authenticated
-    @operation_log("企业管理", "企业模型", consts.op_type_list_str, "企业模型")
     def post(self):
         eid = self.get_int_argument("id")
 
@@ -360,7 +354,6 @@ class EntityDeleteHandler(APIHandler):
     """删除企业"""
 
     @authenticated
-    @operation_log("首页", "企业列表", consts.op_type_delete_str, "删除企业")
     def post(self):
         eid = self.get_int_argument("id")
 
@@ -376,7 +369,6 @@ class EntityPwdcheckHandler(APIHandler):
     """查看企业密码"""
 
     @authenticated
-    @operation_log("企业管理", "企业信息", consts.op_type_list_str, "查看企业密码")
     def post(self):
         eid = self.get_int_argument("id")
 

website/handlers/enterprise_node/handler.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
 
-from website import errors, consts
+from website import errors
 from website.db.enterprise_busi_model import enterprise_busi_model as DB_BusiModel
 from website.db.enterprise_busi_model import (
     enterprise_busi_model_node_device as DB_BusiModelNodeDevice,
@@ -10,7 +10,7 @@ from website.db.enterprise_device import enterprise_device as DB_Device
 from website.db.enterprise_entity import enterprise_entity as DB_Entity
 from website.db.enterprise_node import enterprise_node as DB_Node
 from website.db.enterprise_node import enterprise_node_alert as DB_NodeAlert
-from website.handler import APIHandler, authenticated, operation_log
+from website.handler import APIHandler, authenticated
 from website.util import shortuuid
 
 
@@ -30,8 +30,7 @@ class AddHandler(APIHandler):
     - 返回值：无
     """
 
-    @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_add_str, "添加企业节点")
+    # @authenticated
     def post(self):
         entity_id = self.get_int_argument("entity_id")
         entity_suid = self.get_escaped_argument("entity_suid", "")
@@ -84,8 +83,7 @@ class EditHandler(APIHandler):
     - 返回值：无
     """
 
-    @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_edit_str, "更新企业节点")
+    # @authenticated
     def post(self):
         node_id = self.get_int_argument("node_id", 0)
         name = self.get_escaped_argument("name", "")
@@ -153,7 +151,6 @@ class TreeHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "企业节点树")
     def post(self):
         entity_id = self.get_escaped_argument("entity_id", "")
         name = self.get_escaped_argument("name", "")
@@ -186,7 +183,6 @@ class InfoHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "企业节点信息")
     def post(self):
         node_id = self.get_int_argument("node_id")
 
@@ -202,7 +198,6 @@ class InfoHandler(APIHandler):
 class DeleteHandler(APIHandler):
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "删除节点")
     def post(self):
         node_id = self.get_int_argument("node_id")
         if not node_id:
@@ -238,7 +233,6 @@ class BusimodelHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "业务模型部署列表")
     def post(self):
         node_id = self.get_int_argument("node_id")
         pageNo = self.get_int_argument("pageNo", 1)
@@ -290,7 +284,6 @@ class   BusimodelInfoHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "业务模型部署 -> 业务模型信息")
     def post(self):
         node_id = self.get_int_argument("node_id")
         busi_model_id = self.get_int_argument("busi_model_id")
@@ -339,7 +332,6 @@ class BusimodelDeployHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_add_str, "业务模型部署 -> 业务模型配置")
     def post(self):
         node_id = self.get_int_argument("node_id")
         busi_model_id = self.get_int_argument("busi_model_id")
@@ -411,7 +403,6 @@ class AlertHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_list_str, "节点信息 -> 设备列表 -> 告警设置信息")
     def post(self):
         node_id = self.get_int_argument("node_id")
         if not node_id:
@@ -461,7 +452,6 @@ class AlertConfigHandler(APIHandler):
     """
 
     @authenticated
-    @operation_log("企业管理", "节点设置", consts.op_type_edit_str, "节点信息 -> 设备列表 -> 告警设置，更新配置")
     def post(self):
         node_id = self.get_int_argument("node_id")
         is_sms = self.get_int_argument("is_sms", 0)

website/handlers/file/handler.py

@@ -30,7 +30,7 @@ class UploadHandler(APIHandler):
         logging.info("file_size: %s", file_size)
 
         if file_size > 300 * 1024 * 1024:
-            raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, '超出300M限定大小')
+            raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, 'Exceed 300M size limit')
 
         filetype = filename.split(".") and filename.split(".")[-1] or ""
 

website/handlers/system/handler.py

@@ -1,19 +1,21 @@
 # -*- coding: utf-8 -*-
 """系统信息"""
-import datetime
-import json
 import logging
-import re
+import uuid
 import time
+import re
+import os
+import json
+import hashlib
 
-from sqlalchemy import text
+import datetime
 
-from website import consts
 from website import errors
 from website import settings
+from website.handler import APIHandler, WebHandler, authenticated, operation_log, permission
 from website.db_mysql import to_json_list
-from website.handler import APIHandler, authenticated
-from website.util import sysinfo, rsa_oaep
+from website.util import sysinfo, rsa
+from sqlalchemy import text
 
 
 class VersionHandler(APIHandler):
@@ -22,12 +24,8 @@ class VersionHandler(APIHandler):
     def post(self):
         self.finish()
 
-
 class IdentifycodeHandler(APIHandler):
-    """系统识别码"""
-
-    # @authenticated
-
+    @authenticated
     # @permission([100014, 100015])
     # @operation_log("资产管理中心", "系统激活", "查询", "查询本地识别码", "查询本地识别码")
     def post(self):
@@ -35,7 +33,6 @@ class IdentifycodeHandler(APIHandler):
 
         self.finish({"result": code})
 
-
 class LicenseUploadHandler(APIHandler):
     @authenticated
     # @permission([100014, 100015])
@@ -58,44 +55,45 @@ class LicenseUploadHandler(APIHandler):
         if file_size > 10 * 1024 * 1024:
             raise errors.HTTPAPIError(errors.ERROR_METHOD_NOT_ALLOWED, 'Exceed 10M size limit')
 
+        md5_str = hashlib.md5(file.body).hexdigest()
+
         filepath = settings.rsa_license_file
 
         try:
             body = file['body']
-            plaintext = rsa_oaep.decrypt_message_pri(
-                open(settings.rsa_private_file).read().strip('\n').encode('utf-8'), body)
+            public_key = rsa.load_pub_key_string(open(settings.rsa_public_file).read().strip('\n').encode('utf-8'))
+            plaintext = rsa.decrypt(public_key, body)
             plaintext_json = json.loads(self.tostr(plaintext))
 
-            syscode = plaintext_json["sys_code"]
-            expireat = plaintext_json["expire_at"]
+            syscode = plaintext_json["syscode"]
+            expireat = plaintext_json["expireat"]
 
-            current_syscode = sysinfo.get_idntify_code_v2()
+            current_syscode = sysinfo.get_identify_code()
             if syscode != current_syscode:
                 raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, "license激活失败，请重新激活")
 
-            with self.app_mysql.connect() as conn:
-                conn.execute(text(
-                    "update sys_license set syscode=:syscode, expireat=:expireat, status=:status",
-                    {
-                        "syscode": syscode,
-                        "expireat": expireat,
-                        "status": consts.system_status_activated
-                    }
-                ))
-                conn.commit()
-
+            row = self.db_app.get("select id from license where syscode=%s", syscode)
+            if row:
+                self.db_app.update(
+                    "update license set expireat=%s where syscode=%s", str(expireat), syscode
+                )
+            else:
+                self.db_app.insert(
+                    "insert into license(syscode, expireat) values(%s, %s)",
+                    syscode, expireat
+                )
             self.r_app.set("system:license", json.dumps({"syscode":syscode, "expireat":expireat}))
 
             with open(filepath, 'wb') as f:
                 f.write(file['body'])
 
+            logging.info(plaintext_json)
         except Exception as e:
             logging.info(e)
             raise errors.HTTPAPIError(errors.ERROR_BAD_REQUEST, "license激活失败，请重新激活")
 
         self.finish()
 
-
 class ActivateInfoHandler(APIHandler):
     @authenticated
     # @permission([100014, 100015])
@@ -118,11 +116,11 @@ class ActivateInfoHandler(APIHandler):
             date_remain = delta if delta > 0 else 0
 
         data = {
-            # "system": settings.system_info[settings.system_type]["name"],
-            # "license": license_str,
-            # "activate_at": activate_at,
-            # "expire_at": expire_at,
-            # "date_remain": date_remain
+            "system": settings.system_info[settings.system_type]["name"],
+            "license": license_str,
+            "activate_at": activate_at,
+            "expire_at": expire_at,
+            "date_remain": date_remain
         }
 
         self.finish(data)
@@ -130,6 +128,7 @@ class ActivateInfoHandler(APIHandler):
 
 class InfoHandler(APIHandler):
     def post(self):
+
         self.finish()
 
 
@@ -142,15 +141,15 @@ class LogHandler(APIHandler):
         pageNo = self.get_int_argument("pageNo", 1)
         pageSize = self.get_int_argument("pageSize", 20)
 
-        user_list = user.split(",") if user else []
+        users = user.split(",")
         with self.app_mysql.connect() as conn:
-            sql = "select user, ip, content, op_type, content, create_time from sys_log where 1=1"
+            sql = "select user, ip, content, op_type, content from sys_log where 1=1"
             sql_count = "select count(*) from sys_log where 1=1"
             p = {}
-            if user_list:
+            if users:
                 sql += " and user in :users"
                 sql_count += " and user in :users"
-                p["users"] = user_list
+                p["users"] = users
             if start:
                 sql += " and date_format(create_time, '%Y-%m-%d') >= :start"
                 sql_count += " and date_format(create_time, '%Y-%m-%d') >= :start"
@@ -167,7 +166,5 @@ class LogHandler(APIHandler):
             p["pageSize"] = pageSize
             res = conn.execute(text(sql), p)
             data = to_json_list(res)
-            for item in data:
-                item["create_time"] = str(item["create_time"])
 
             self.finish({"count": count, "data": data})

website/handlers/system/url.py

@@ -8,6 +8,7 @@ handlers = [
     ("/system/license/upload", handler.LicenseUploadHandler),
     ("/system/activate/info", handler.ActivateInfoHandler),
     ("/system/info", handler.InfoHandler),
+
     ("/system/log", handler.LogHandler),
 ]
 

website/settings.py

@@ -78,11 +78,8 @@ enterprise_aes_key = "FquMBlcVoIkTAmL7"
 
 file_upload_dir = "/data/fileupload"
 
-system_salt = "5bVQmI0ATh+QITf75WgVchT6TPN1DEOasSmrtMcTsPQ="
-
-# rsa_public_file = "/home/app/public"
+rsa_public_file = "/home/app/public"
 rsa_license_file = "/home/app/license"
-rsa_private_file = "/home/app/private_key.pem"
 
 # hashlib.sha256(base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes)).hexdigest()
 

website/util/rsa.py

@@ -1,60 +1,22 @@
 # -*- coding: utf-8 -*-
-from binascii import a2b_hex, b2a_hex
-
-from M2Crypto import BIO
 from M2Crypto import RSA
-
+from M2Crypto import BIO
+from binascii import a2b_hex, b2a_hex
 
 def load_pub_key_string(string):
     bio = BIO.MemoryBuffer(string)
     return RSA.load_pub_key_bio(bio)
 
-
 def block_data(texts, block_size):
     for i in range(0, len(texts), block_size):
         yield texts[i:i + block_size]
 
-
-def encrypt(texts):
-    ciphertext = b""
-    block_size = 256 - 11
-
-    for text in block_data(texts.encode('utf-8'), block_size):
-        current_text = pri_key.private_encrypt(text, RSA.pkcs1_padding)
-        ciphertext += current_text
-
-    return b2a_hex(ciphertext)
-
-
-def decrypt(texts):
+def decrypt(publick_key, texts):
     plaintext = b""
     block_size = 256
 
     for text in block_data(a2b_hex(texts), block_size):
-        current_text = pub_key.public_decrypt(text, RSA.pkcs1_padding)
+        current_text = publick_key.public_decrypt(text, RSA.pkcs1_padding)
         plaintext += current_text
 
     return plaintext
-
-
-if __name__ == '__main__':
-    # 2048代表生成密钥的位数，65537代表公钥的指数
-    key = RSA.gen_key(2048, 65537)
-    key.save_key("private_key", None)
-    key.save_pub_key("public_key")
-
-    prikey = open("private_key").read()
-    pubkey = open("public_key").read()
-
-    pri_key = RSA.load_key_string(prikey.strip('\n').encode('utf-8'))
-    pub_key = load_pub_key_string(pubkey.strip('\n').encode('utf-8'))
-
-    texts = "hellohellohellohellohellohellohellohellohellohellohellohellohello" \
-            "hellohellohellohellohellohellohellohellohellohellohellohellohello" \
-            "hellohellohellohellohellohellohellohellohellohellohellohellohello" \
-            "hellohellohellohellohellohellohellohellohellohellohello"
-
-    ciphertext = encrypt(texts)
-    print(ciphertext)
-    plaintext = decrypt(ciphertext)
-    print(plaintext)

website/util/rsa_OAEP.py

@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+from Crypto.PublicKey import RSA
+from Crypto.Cipher import PKCS1_OAEP
+import base64
+
+"""
+RSA 加密中,有两种常见的填充方式:PKCS1_v1_5 和 PKCS1_OAEP。这两种填充方式在安全性和性能方面都有一些差异。
+
+PKCS1_v1_5 填充方式:
+    这是较早的 RSA 填充方式,相对简单且性能较好。
+    但是它存在一些安全隐患,比如可能会受到选择密文攻击(Chosen Ciphertext Attack, CCA)。
+PKCS1_OAEP 填充方式:
+    PKCS1_OAEP 是一种更加安全的填充方式,它使用了随机填充来提高安全性。
+    PKCS1_OAEP 可以抵御选择密文攻击(CCA)和其他一些攻击方式,因此被认为更加安全。
+    但是,PKCS1_OAEP 的性能略低于 PKCS1_v1_5,因为它需要进行更多的计算。
+"""
+
+# 生成密钥对
+def generate_keys():
+    key = RSA.generate(2048)
+    private_key = key.export_key()
+    public_key = key.publickey().export_key()
+    return private_key, public_key
+
+# 加密消息，message为bytes类型
+def encrypt_message(public_key, message):
+    cipher = PKCS1_OAEP.new(RSA.import_key(public_key))
+    encrypted_message = base64.b64encode(cipher.encrypt(message))
+    print("Encrypted message:", encrypted_message.decode())
+
+    return encrypted_message
+
+# 解密消息
+def decrypt_message(private_key, encrypted_message):
+    decipher = PKCS1_OAEP.new(RSA.import_key(private_key))
+    decrypted_message = decipher.decrypt(base64.b64decode(encrypted_message))
+    print("Decrypted message:", decrypted_message.decode())
+    return decrypted_message.decode()
+
+# 主程序
+if __name__ == "__main__":
+    # 生成密钥对
+    private_key, public_key = generate_keys()
+    print(private_key)
+    print(public_key)
+
+    # 序列化公钥和私钥
+    # private_pem = private_key.private_bytes(
+    #     encoding=serialization.Encoding.PEM,
+    #     format=serialization.PrivateFormat.PKCS8,
+    #     encryption_algorithm=serialization.NoEncryption()
+    # )
+    # public_pem = public_key.public_bytes(
+    #     encoding=serialization.Encoding.PEM,
+    #     format=serialization.PublicFormat.SubjectPublicKeyInfo
+    # )
+
+    # 打印公钥和私钥
+    print("Private Key:")
+    print(private_key.decode())
+    print("Public Key:")
+    print(public_key.decode())
+
+    # 待加密消息
+    message = b"Hello, RSA!"
+
+    # 加密消息
+    encrypted_message = encrypt_message(public_key, message)
+    print("Encrypted Message:")
+    print(encrypted_message)
+
+    # 解密消息
+    decrypted_message = decrypt_message(private_key, encrypted_message)
+    print("Decrypted Message:")
+    print(decrypted_message)

website/util/rsa_oaep.py

@@ -1,124 +0,0 @@
-# -*- coding: utf-8 -*-
-import argparse
-import base64
-import json
-import sys
-
-from Crypto.Cipher import PKCS1_OAEP
-from Crypto.PublicKey import RSA
-
-"""
-RSA 加密中,有两种常见的填充方式:PKCS1_v1_5 和 PKCS1_OAEP。这两种填充方式在安全性和性能方面都有一些差异。
-
-PKCS1_v1_5 填充方式:
-    这是较早的 RSA 填充方式,相对简单且性能较好。
-    但是它存在一些安全隐患,比如可能会受到选择密文攻击(Chosen Ciphertext Attack, CCA)。
-PKCS1_OAEP 填充方式:
-    PKCS1_OAEP 是一种更加安全的填充方式,它使用了随机填充来提高安全性。
-    PKCS1_OAEP 可以抵御选择密文攻击(CCA)和其他一些攻击方式,因此被认为更加安全。
-    但是,PKCS1_OAEP 的性能略低于 PKCS1_v1_5,因为它需要进行更多的计算。
-"""
-
-
-# 生成密钥对
-def generate_keys():
-    key = RSA.generate(2048)
-    private_key = key.export_key()
-    public_key = key.publickey().export_key()
-    return private_key, public_key
-
-
-# 公钥加密消息，message为bytes类型
-def encrypt_message_pub(public_key, message):
-    cipher = PKCS1_OAEP.new(RSA.import_key(public_key))
-    encrypted_message = base64.b64encode(cipher.encrypt(message))
-    # print("Encrypted message:", encrypted_message.decode())
-    return encrypted_message
-
-
-# 私钥解密消息
-def decrypt_message_pri(private_key, encrypted_message):
-    decipher = PKCS1_OAEP.new(RSA.import_key(private_key))
-    decrypted_message = decipher.decrypt(base64.b64decode(encrypted_message))
-    # print("Decrypted message:", decrypted_message.decode())
-    return decrypted_message.decode()
-
-
-def test():
-    # 生成密钥对
-    private_key, public_key = generate_keys()
-    print(private_key)
-    print(public_key)
-
-    # 打印公钥和私钥
-    print("Private Key:")
-    print(private_key.decode())
-    print("Public Key:")
-    print(public_key.decode())
-
-    # 待加密消息
-    # message = b"Hello, RSA!"
-    message = "Hello, RSA!".encode()
-
-    # 加密消息
-    encrypted_message = encrypt_message_pub(public_key, message)
-    print("Encrypted Message:")
-    print(encrypted_message)
-
-    # 解密消息
-    decrypted_message = decrypt_message_pri(private_key, encrypted_message)
-    print("Decrypted Message:")
-    print(decrypted_message)
-
-
-def save_keys():
-    private_key, public_key = generate_keys()
-
-    with open("private_key.pem", "wb") as f:
-        f.write(private_key)
-
-    with open("public_key.pem", "wb") as f:
-        f.write(public_key)
-
-
-# 主程序
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description='manual to sign enterprise license')
-    parser.add_argument("-o", type=str,
-                        help="operation type, "
-                             "'t' is for function test, "
-                             "'s' is to sign and save license, "
-                             "'g' is to generate keys and save them, "
-                             "'d' is to decrypt license",
-                        required=True)  # name, t/test, s/sign, g/generate key, d/decrypt
-    parser.add_argument("-c", type=str, help="enterprise's sys code, its something code like MD5")  # code
-    parser.add_argument("-e", type=str, help="expire date, eg: 2035-01-01")  # expire
-
-    args = parser.parse_args()
-    operation = args.o
-    if operation == "t":  # test
-        test()
-    elif operation == "g":  # generate keys and save
-        save_keys()
-
-    elif operation == "s":  # sign and save license
-        code = args.c
-        expire = args.e
-        if not code or not expire:
-            print("sys code and expire date are required")
-            sys.exit(1)
-
-        pub_key = open("public_key.pem", "r").read()
-        license = encrypt_message_pub(pub_key.strip('\n').encode('utf-8'),
-                                      json.dumps({"sys_code": code, "expire_at": expire}).encode("utf-8"))
-
-        with open("license", "wb") as f:
-            f.write(license)
-    elif operation == "d":  # decrypt license
-        private_key = open("private_key.pem", "r").read()
-        with open("license", "rb") as f:
-            license = f.read()
-            # 解密消息
-            body = decrypt_message_pri(private_key.strip('\n').encode('utf-8'), license)
-            json_body = json.loads(body)
-            print(json_body)

website/util/sysinfo.py

@@ -4,10 +4,10 @@ import os
 import socket
 import subprocess
 import uuid
-from website import settings
+
 
 def get_cpu_id():
-    p = subprocess.Popen(["dmidecode -t 4 | grep ID | tail -1"],
+    p = subprocess.Popen(["dmidecode -t 4 | grep ID"],
                          shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     data = p.stdout
     lines = []
@@ -23,75 +23,6 @@ def get_cpu_id():
     return lines
 
 
-def get_system_uuid():
-    p = subprocess.Popen(["dmidecode -s system-uuid"],
-                         shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    data = p.stdout
-    lines = []
-    while True:
-        line = str(data.readline(), encoding="utf-8")
-        if line == '\n':
-            break
-        if line:
-            lines.append(line)
-        else:
-            break
-    print("system uuid {}".format(lines))
-
-    return lines
-
-
-def get_system_manufacture():
-    p = subprocess.Popen(["dmidecode -s processor-manufacturer | tail -1"],
-                         shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    data = p.stdout
-    lines = []
-    while True:
-        line = str(data.readline(), encoding="utf-8")
-        if line == '\n':
-            break
-        if line:
-            lines.append(line)
-        else:
-            break
-
-    return lines
-
-
-def get_board_manufacturer():
-    p = subprocess.Popen(["dmidecode -s baseboard-manufacturer"],
-                         shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    data = p.stdout
-    lines = []
-    while True:
-        line = str(data.readline(), encoding="utf-8")
-        if line == '\n':
-            break
-        if line:
-            lines.append(line)
-        else:
-            break
-
-    return lines
-
-
-def get_board_serial_number():
-    p = subprocess.Popen(["dmidecode -s baseboard-serial-number"],
-                         shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    data = p.stdout
-    lines = []
-    while True:
-        line = str(data.readline(), encoding="utf-8")
-        if line == '\n':
-            break
-        if line:
-            lines.append(line)
-        else:
-            break
-
-    return lines
-
-
 def get_board_serialnumber():
     p = subprocess.Popen(["dmidecode -t 2 | grep Serial"],
                          shell=True, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -109,37 +40,6 @@ def get_board_serialnumber():
     return lines
 
 
-def get_idntify_code_v2():
-    cpuid = get_cpu_id()
-    system_uuid = get_system_uuid()
-    system_manufacture = get_system_manufacture()
-    board_manufacturer = get_board_manufacturer()
-    board_serial_number = get_board_serial_number()
-    s = ""
-
-    if cpuid:
-        s += cpuid[0]["ID"]
-        print("cpuid: ", cpuid[0]["ID"])
-    if system_uuid:
-        print(system_uuid)
-        s += system_uuid[0].strip()
-    if system_manufacture:
-        print(system_manufacture)
-        s += system_manufacture[0].strip()
-    if board_manufacturer:
-        print(board_manufacturer)
-        s += board_manufacturer[0].strip()
-    if board_serial_number:
-        print(board_serial_number)
-        s += board_serial_number[0].strip()
-
-    s += settings.system_salt
-    # system_salt = "5bVQmI0ATh+QITf75WgVchT6TPN1DEOasSmrtMcTsPQ="
-    # s += system_salt
-    code = hashlib.sha256(s.encode("utf8")).hexdigest()
-    return code
-
-
 def get_identify_code():
     mac = uuid.UUID(int=uuid.getnode()).hex[-12:]
     mac_addr = ":".join([mac[e:e + 2] for e in range(0, 11, 2)])
@@ -165,6 +65,14 @@ def get_identify_code():
     return code
 
 
+def get_system_uuid():
+    # 获取系统uuid
+    # 这个 UUID 是与硬件相关的,因此即使在 Docker 容器中,它也应该是唯一的，可以用来标识宿主机,而不是容器本身。
+    with open("/sys/class/dmi/id/product_uuid", "r") as f:
+        host_uuid = f.read().strip()
+    return host_uuid
+
+
 def get_docker_container_id():
     # 获取当前 Docker 容器的 ID
     cmd = "cat /proc/self/cgroup"
@@ -176,7 +84,3 @@ def get_docker_container_id():
     else:
         container_id = container_message.strip().split("docker/")[-1]
     return container_id
-
-
-if __name__ == "__main__":
-    print(get_idntify_code_v2())