From ecf378781575ed27b719e530b0ba800085f056b5 Mon Sep 17 00:00:00 2001
From: wudong <wudong@qdxkrs.com>
Date: Tue, 29 Nov 2022 16:22:21 +0800
Subject: [PATCH] del git m

---
 app/configs/global_var.py | 47 ---------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/app/configs/global_var.py b/app/configs/global_var.py
index 19a09a8..727e51d 100644
--- a/app/configs/global_var.py
+++ b/app/configs/global_var.py
@@ -1,49 +1,3 @@
-<<<<<<< HEAD
-"""
-@Time ： 2022/11/15 10:13
-@Auth ： 东
-@File ：global_var.py
-@IDE ：PyCharm
-@Motto：ABC(Always Be Coding)
-@Desc：
-
-"""
-import multiprocessing
-
-
-
-def _init():  # 初始化
-    # 中断标志
-    global _global_dict
-    _global_dict = {}
-
-#     # ws列表存储
-#     global _active_connections
-#     _active_connections = multiprocessing.Manager().list()
-
-#     # ws字典存储
-#     global _active_connections_dist
-#     _active_connections_dist = multiprocessing.Manager().dict()
-
-
-# def get_active_connections():
-#     return _active_connections
-
-# def get_active_connections_dist():
-#     return _active_connections_dist
-
-def set_value(key, value):
-    # 定义一个全局变量
-    _global_dict[key] = value
-
-
-def get_value(key):
-    # 获得一个全局变量，不存在则提示读取对应变量失败
-    try:
-        return _global_dict[key]
-    except:
-        print('读取' + key + '失败\r\n')
-=======
 """
 @Time ： 2022/11/15 10:13
 @Auth ： 东
@@ -80,4 +34,3 @@ def get_value(key):
         return json.loads(dict)[key]
     except:
         print('读取' + key + '失败\r\n')
->>>>>>> 286d822a5b44522b15a86a59ffec219798cedd1f