Merge branch 'ZJZGJ' of http://www.sri-robot.cn:30000/SRI-DINO/Server-py into ZJZGJ

sri-server-bg01/README-usage-win.bash

@@ -1,3 +1,9 @@
 ## USAGE
 
+# 收集离线安装包
+pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d C:\temp\sri-server-bg01
+# 离线安装
+pip install --no-index --find-links=C:\temp\sri-server-bg01 -r requirements-win.txt
+
+# 在线安装
 pip install -r requirements-win.txt -i https://pypi.tuna.tsinghua.edu.cn/simple

sri-server-bg01/hub.py

@@ -16,10 +16,10 @@ class Global(object):
     #                                                            database='vms')
 
     # --- 业务数据数据库 ---
-    mdb = importlib.import_module(f"xclient.xmongo").Client(host='10.10.10.73', port=47017, database='bg',
+    mdb = importlib.import_module(f"xclient.xmongo").Client(host='127.0.0.1', port=47017, database='bg',
                                                             username='admin', password='admin')
-    # mysql = importlib.import_module(f"clients.db_maria2").Client(host='127.0.0.1', port=3306, database='ar',
-    #                                                              username='root', password='20221212!')
+    # mdb = importlib.import_module(f"xclient.xmongo").Client(host='10.10.10.73', port=47017, database='bg',
+    #                                                         username='admin', password='admin')
     # mysql = importlib.import_module(f"xclient.db_maria2").Client(host='58.34.94.176', port=8806, database='hs',
     #                                                              username='root', password='rootroot&123123')
 
@@ -30,4 +30,4 @@ class Global(object):
 
     # local_api = importlib.import_module(f"apis.local.api").Api()
 
-    mccbts_agent = importlib.import_module(f"xapi.mccbts.api").API()
+    # mccbts_agent = importlib.import_module(f"xapi.mccbts.api").API()

sri-server-bg01/requirements-win.txt

@@ -11,7 +11,6 @@ redis==3.5.3
 pymongo==3.11.2
 influxdb==5.3.1
 pymysql==0.9.3
-peewee==3.17.0
 SQLAlchemy==1.4.30
 # --- for server ---
 aiofiles==23.2.1

sri-server-bg02/README-usage-win.bash

@@ -1,3 +1,9 @@
 ## USAGE
 
+# 收集离线安装包
+pip download -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements-win.txt -d C:\temp\sri-server-bg02
+# 离线安装
+pip install --no-index --find-links=C:\temp\sri-server-bg02 -r requirements-win.txt
+
+# 在线安装
 pip install -r requirements-win.txt -i https://pypi.tuna.tsinghua.edu.cn/simple

sri-server-bg02/hub.py

@@ -8,19 +8,19 @@ methods = importlib.import_module(f"xlib")
 
 class Global(object):
     # --- 中间件服务器 ---
-    # emqx = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
+    emqx = importlib.import_module(f"xclient.xmqtt").Client(host='127.0.0.1', port=41883)
 
 
-    # aps = importlib.import_module(f"xpip.xapscheduler").APS(db_type='mongo',
-    #                                                         db_host='127.0.0.1',
-    #                                                         db_port=27017,
-    #                                                         username='admin', password='admin',
-    #                                                         database='bg', collection='LoopTask')
-
-    emqx = importlib.import_module(f"xclient.xmqtt").Client(host='10.10.10.73', port=41883)
-
     aps = importlib.import_module(f"xpip.xapscheduler").APS(db_type='mongo',
-                                                            db_host='10.10.10.73',
+                                                            db_host='127.0.0.1',
                                                             db_port=47017,
                                                             username='admin', password='admin',
-                                                            database='bg', collection='LoopTask')
+                                                            database='bg', collection='LoopTask')
+
+    # emqx = importlib.import_module(f"xclient.xmqtt").Client(host='10.10.10.73', port=41883)
+
+    # aps = importlib.import_module(f"xpip.xapscheduler").APS(db_type='mongo',
+    #                                                         db_host='10.10.10.73',
+    #                                                         db_port=47017,
+    #                                                         username='admin', password='admin',
+    #                                                         database='bg', collection='LoopTask')

sri-server-bg02/requirements-win.txt

@@ -11,6 +11,5 @@ redis==3.5.3
 pymongo==3.11.2
 influxdb==5.3.1
 pymysql==0.9.3
-peewee==3.17.0
 SQLAlchemy==1.4.30
 paho-mqtt==1.6.1