提交代码

app.py

@@ -3,7 +3,6 @@ import platform
 import os
 from flask import Flask
 from flask_cors import CORS
-from configs.nacos_config import nacos_service_single
 from interfaces.resume import resume
 from interfaces.rocketmq import rocket
 import logging
@@ -13,7 +12,7 @@ from logging.handlers import TimedRotatingFileHandler
 app = Flask(__name__)
 app.config['JSON_AS_ASCII'] = False
 CORS(app, resources=r'/*')
-nacos_service_single.start()
+# nacos_service_single.start()
 # 注册蓝图
 app.register_blueprint(resume, url_prefix='/resume')
 app.register_blueprint(rocket, url_prefix='/rocket')

configs/connections.py

@@ -3,10 +3,9 @@
 '''
 from flask import Flask
 from py2neo import Graph
-from configs.nacos_config import nacos_service_single
+from configs.nacos_config import configs
 from py2neo import Node
 app = Flask(__name__)
-configs = nacos_service_single.get_nacos_configs()
 neo4j_url = configs['neo4j_url']
 username = configs['neo4j_username']
 password = configs['neo4j_password']

configs/nacos_bak.py

@@ -1,61 +1,135 @@
-import json
-import platform
-from flask import Flask
-from nacos import NacosClient
-app = Flask(__name__)
-
-config_json = {
-    "local": {
-        "address": "192.168.3.80:8848",
-        "namespace": "dev",
-        "username": "nacos",
-        "password": "nacos",
-        "data_id": "python-mendunr",
-        "group": "DEFAULT_GROUP"
-    },
-    "production": {
-        "address": "127.0.0.1:8848",
-        "namespace": "dev",
-        "username": "nacos",
-        "password": "2099citu##$$**.com",
-        "data_id": "python-mendunr",
-        "group": "DEFAULT_GROUP"
-    }
-}
-
-
-class NacosConfig:
-    def __init__(self, environment='local'):
-        env_config = config_json[environment]
-        self.SERVER_ADDRESSES = env_config['address']
-        self.NAMESPACE = env_config['namespace']
-        self.USERNAME = env_config['username']
-        self.PASSWORD = env_config['password']
-        self.data_id = env_config['data_id']
-        self.group = env_config['group']
-        self.client = NacosClient(server_addresses=self.SERVER_ADDRESSES, namespace=self.NAMESPACE,
-                                  username=self.USERNAME, password=self.PASSWORD)
-        self.config_data = None
-
-    def load_config(self):
-        """从Nacos加载配置"""
-        config_str = self.client.get_config(data_id=self.data_id, group=self.group)
-        self.config_data = json.loads(config_str) if config_str else {}
-        return self.config_data
-
-    def get_config(self):
-        """返回当前加载的配置数据"""
-        if self.config_data is None:
-            self.load_config()
-        return self.config_data
-
-
-# 根据操作系统选择环境
-plat = platform.system().lower()
-environment = 'local' if plat == 'windows' else 'production'
-nacos_config = NacosConfig(environment=environment)
-configs = nacos_config.get_config()
-
-
-if __name__ == '__main__':
-    app.run(debug=True)
+import nacos
+import socket
+from threading import Timer
+import logging
+import time
+import os
+import requests
+
+
+class NacosService:
+    CLIENT = None
+    DATA_ID = None
+    GROUP = None
+    LOCAL_IP = None
+    SERVER_ADDRESSES = None
+    NAMESPACE = None
+    logger = logging.getLogger('app')  # 这里设置名字
+
+    __instance = None
+    _registered = False  # 添加注册标志位
+
+    def __init__(self):
+        if os.name == 'posix':  # 'posix' 表示类Unix系统，包括Linux
+            default_address = "127.0.0.1:8848"
+        else:
+            default_address = "192.168.3.80:8848"
+        self.LOCAL_IP = str(os.getenv("NACOS_REGISTER_IP", default=socket.gethostbyname(socket.gethostname())))
+        self.SERVER_ADDRESSES = default_address
+        self.NAMESPACE = "dev"
+        self.DATA_ID = "python-mendunr"
+        self.GROUP = "DEFAULT_GROUP"
+
+    def __new__(cls, *args, **kwargs):
+        if NacosService.__instance is None:
+            NacosService.__instance = object.__new__(cls, *args, **kwargs)
+        return NacosService.__instance
+
+    ### 获取配置
+    def getConfig(self):
+        return self.CLIENT.get_config(self.DATA_ID, self.GROUP)
+
+    ### 注册实例
+    def register_instance(self):
+        if self._registered:
+            return
+
+        res = requests.post(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance",
+                            data={
+                                'groupName': self.GROUP,
+                                'metadata': '{"preserved.register.source":"SPRING_CLOUD","preserved.heart.beat.interval": 5500, "preserved.heart.beat.timeout": 30000, "preserved.ip.delete.timeout": 60000}',
+                                'namespaceId': self.NAMESPACE,
+                                'port': 3333,
+                                'enable': True,
+                                'healthy': True,
+                                'clusterName': 'DEFAULT',
+                                'ip': self.LOCAL_IP,
+                                'weight': 1,
+                                'ephemeral': False,  # 修改这里为 False
+                                'serviceName': self.GROUP + "@@" + self.DATA_ID
+                            })
+        if res.status_code == 200:
+            self.logger.info("register_instance res %s", str(res.content, 'UTF-8'))
+            self._registered = True  # 设置注册成功标志位
+        else:
+            self.logger.error(f"Failed to register instance: {res.status_code} - {res.text}")
+
+    def send_heartbeat(self):
+        try:
+            res = requests.put(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance/beat",
+                               data={
+                                   "ip": self.LOCAL_IP,
+                                   "port": "3333",
+                                   "namespaceId": self.NAMESPACE,
+                                   "serviceName": self.GROUP + "@@" + self.DATA_ID,
+                                   "clusterName": "DEFAULT"}
+                               )
+            if res.status_code == 200:
+                res_json = res.json()
+                if res_json["code"] == 20404:  ### 找不到资源重新注册
+                    self.register_instance()
+            else:
+                self.logger.error(f"Failed to send heartbeat: {res.status_code} - {res.text}")
+            t = Timer(4, self.send_heartbeat)  ## 4秒执行一次
+            t.start()
+        except Exception as e:
+            self.logger.error(f"send_heartbeat error: {e}")
+
+    def getServer(self, serverName):
+        try:
+            res = requests.get(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance/list",
+                               params={'namespaceId': self.NAMESPACE, 'serviceName': self.GROUP + "@@" + serverName})
+            if res.status_code == 200:
+                hosts = res.json()["hosts"]
+                if len(hosts) > 0:
+                    return hosts[0]
+            else:
+                self.logger.error(f"Failed to get server list: {res.status_code} - {res.text}")
+        except Exception as e:
+            self.logger.error(f"getServer error: {e}")
+        return None
+
+    def start(self):
+        try:
+            self.CLIENT = nacos.NacosClient(self.SERVER_ADDRESSES, namespace=self.NAMESPACE)
+            self.register_instance()
+            self.send_heartbeat()
+        except Exception as e:
+            self.logger.error(f"start error: {e}")
+
+    def get_nacos_configs(self):
+        url = f"http://{self.SERVER_ADDRESSES}/nacos/v1/cs/configs"
+        params = {
+            'tenant': self.NAMESPACE,
+            'dataId': self.DATA_ID,
+            'group': self.GROUP
+        }
+        try:
+            r = requests.get(url, params)
+            r.encoding = r.apparent_encoding
+            if r.status_code == 200:
+                r_dict = r.json()
+                return r_dict
+            else:
+                self.logger.error(f"Failed to get Nacos configs: {r.status_code} - {r.text}")
+        except Exception as e:
+            self.logger.error(f"get_nacos_configs error: {e}")
+        return None
+
+
+nacos_service_single = NacosService()
+
+
+# 发送url请求,获取nacos上的配置
+def get_nacos_configs():
+    return nacos_service_single.get_nacos_configs()

configs/nacos_config.py

@@ -1,135 +1,61 @@
-import nacos
-import socket
-from threading import Timer
-import logging
-import time
-import os
-import requests
-
-
-class NacosService:
-    CLIENT = None
-    DATA_ID = None
-    GROUP = None
-    LOCAL_IP = None
-    SERVER_ADDRESSES = None
-    NAMESPACE = None
-    logger = logging.getLogger('app')  # 这里设置名字
-
-    __instance = None
-    _registered = False  # 添加注册标志位
-
-    def __init__(self):
-        if os.name == 'posix':  # 'posix' 表示类Unix系统，包括Linux
-            default_address = "127.0.0.1:8848"
-        else:
-            default_address = "192.168.3.80:8848"
-        self.LOCAL_IP = str(os.getenv("NACOS_REGISTER_IP", default=socket.gethostbyname(socket.gethostname())))
-        self.SERVER_ADDRESSES = default_address
-        self.NAMESPACE = "dev"
-        self.DATA_ID = "python-mendunr"
-        self.GROUP = "DEFAULT_GROUP"
-
-    def __new__(cls, *args, **kwargs):
-        if NacosService.__instance is None:
-            NacosService.__instance = object.__new__(cls, *args, **kwargs)
-        return NacosService.__instance
-
-    ### 获取配置
-    def getConfig(self):
-        return self.CLIENT.get_config(self.DATA_ID, self.GROUP)
-
-    ### 注册实例
-    def register_instance(self):
-        if self._registered:
-            return
-
-        res = requests.post(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance",
-                            data={
-                                'groupName': self.GROUP,
-                                'metadata': '{"preserved.register.source":"SPRING_CLOUD","preserved.heart.beat.interval": 5500, "preserved.heart.beat.timeout": 30000, "preserved.ip.delete.timeout": 60000}',
-                                'namespaceId': self.NAMESPACE,
-                                'port': 3333,
-                                'enable': True,
-                                'healthy': True,
-                                'clusterName': 'DEFAULT',
-                                'ip': self.LOCAL_IP,
-                                'weight': 1,
-                                'ephemeral': False,  # 修改这里为 False
-                                'serviceName': self.GROUP + "@@" + self.DATA_ID
-                            })
-        if res.status_code == 200:
-            self.logger.info("register_instance res %s", str(res.content, 'UTF-8'))
-            self._registered = True  # 设置注册成功标志位
-        else:
-            self.logger.error(f"Failed to register instance: {res.status_code} - {res.text}")
-
-    def send_heartbeat(self):
-        try:
-            res = requests.put(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance/beat",
-                               data={
-                                   "ip": self.LOCAL_IP,
-                                   "port": "3333",
-                                   "namespaceId": self.NAMESPACE,
-                                   "serviceName": self.GROUP + "@@" + self.DATA_ID,
-                                   "clusterName": "DEFAULT"}
-                               )
-            if res.status_code == 200:
-                res_json = res.json()
-                if res_json["code"] == 20404:  ### 找不到资源重新注册
-                    self.register_instance()
-            else:
-                self.logger.error(f"Failed to send heartbeat: {res.status_code} - {res.text}")
-            t = Timer(4, self.send_heartbeat)  ## 4秒执行一次
-            t.start()
-        except Exception as e:
-            self.logger.error(f"send_heartbeat error: {e}")
-
-    def getServer(self, serverName):
-        try:
-            res = requests.get(url=f"http://{self.SERVER_ADDRESSES}/nacos/v1/ns/instance/list",
-                               params={'namespaceId': self.NAMESPACE, 'serviceName': self.GROUP + "@@" + serverName})
-            if res.status_code == 200:
-                hosts = res.json()["hosts"]
-                if len(hosts) > 0:
-                    return hosts[0]
-            else:
-                self.logger.error(f"Failed to get server list: {res.status_code} - {res.text}")
-        except Exception as e:
-            self.logger.error(f"getServer error: {e}")
-        return None
-
-    def start(self):
-        try:
-            self.CLIENT = nacos.NacosClient(self.SERVER_ADDRESSES, namespace=self.NAMESPACE)
-            self.register_instance()
-            self.send_heartbeat()
-        except Exception as e:
-            self.logger.error(f"start error: {e}")
-
-    def get_nacos_configs(self):
-        url = f"http://{self.SERVER_ADDRESSES}/nacos/v1/cs/configs"
-        params = {
-            'tenant': self.NAMESPACE,
-            'dataId': self.DATA_ID,
-            'group': self.GROUP
-        }
-        try:
-            r = requests.get(url, params)
-            r.encoding = r.apparent_encoding
-            if r.status_code == 200:
-                r_dict = r.json()
-                return r_dict
-            else:
-                self.logger.error(f"Failed to get Nacos configs: {r.status_code} - {r.text}")
-        except Exception as e:
-            self.logger.error(f"get_nacos_configs error: {e}")
-        return None
-
-
-nacos_service_single = NacosService()
-
-
-# 发送url请求,获取nacos上的配置
-def get_nacos_configs():
-    return nacos_service_single.get_nacos_configs()
+import json
+import platform
+from flask import Flask
+from nacos import NacosClient
+app = Flask(__name__)
+
+config_json = {
+    "local": {
+        "address": "192.168.3.80:8848",
+        "namespace": "dev",
+        "username": "nacos",
+        "password": "nacos",
+        "data_id": "python-mendunr",
+        "group": "DEFAULT_GROUP"
+    },
+    "production": {
+        "address": "127.0.0.1:8848",
+        "namespace": "dev",
+        "username": "nacos",
+        "password": "2099citu##$$**.com",
+        "data_id": "python-mendunr",
+        "group": "DEFAULT_GROUP"
+    }
+}
+
+
+class NacosConfig:
+    def __init__(self, environment='local'):
+        env_config = config_json[environment]
+        self.SERVER_ADDRESSES = env_config['address']
+        self.NAMESPACE = env_config['namespace']
+        self.USERNAME = env_config['username']
+        self.PASSWORD = env_config['password']
+        self.data_id = env_config['data_id']
+        self.group = env_config['group']
+        self.client = NacosClient(server_addresses=self.SERVER_ADDRESSES, namespace=self.NAMESPACE,
+                                  username=self.USERNAME, password=self.PASSWORD)
+        self.config_data = None
+
+    def load_config(self):
+        """从Nacos加载配置"""
+        config_str = self.client.get_config(data_id=self.data_id, group=self.group)
+        self.config_data = json.loads(config_str) if config_str else {}
+        return self.config_data
+
+    def get_config(self):
+        """返回当前加载的配置数据"""
+        if self.config_data is None:
+            self.load_config()
+        return self.config_data
+
+
+# 根据操作系统选择环境
+plat = platform.system().lower()
+environment = 'local' if plat == 'windows' else 'production'
+nacos_config = NacosConfig(environment=environment)
+configs = nacos_config.get_config()
+
+
+if __name__ == '__main__':
+    app.run(debug=True)

nacos-data/snapshot/python-mendunr+DEFAULT_GROUP+dev

@@ -0,0 +1,17 @@
+{
+    "MYSQL_HOST":"127.0.0.1",
+    "MYSQL_USER":"root",
+    "MYSQL_PASSWORD":"123456",
+    "MYSQL_PORT":3306,
+    "DATA_BASE":"digitization_data",
+    "FILE_PATH":"/data/excel/data2/团队效能管理平台/模拟数据/",
+    "MINIO_HOST":"192.168.3.86:9000",
+    "MINIO_USER":"root",
+    "MINIO_PASSWORD":"2099citu##$$**.com",
+    "REPORT_FOLDER":"data/report/",
+    "BUCKET":"dev",
+    "neo4j_url":"bolt://192.168.3.86:7687",
+    "neo4j_username":"neo4j",
+    "neo4j_password":"!@#qwe123^&*",
+    "csv_url":"/data/neo4j-community-3.5.28/import"
+}