diff --git a/lib/framework/init_plugin.py b/lib/framework/init_plugin.py index e5b2c1f..ef751c4 100644 --- a/lib/framework/init_plugin.py +++ b/lib/framework/init_plugin.py @@ -55,7 +55,8 @@ class PluginManager: # 2018-09-04 try: - plugin_path = F.SystemModelSetting.get('plugin_dev_path') + #plugin_path = F.SystemModelSetting.get('plugin_dev_path') + plugin_path = F.config['path_dev'] if plugin_path != None and plugin_path != '': if os.path.exists(plugin_path): sys.path.insert(0, plugin_path) diff --git a/lib/framework/init_route.py b/lib/framework/init_route.py index 7173778..c00edb7 100644 --- a/lib/framework/init_route.py +++ b/lib/framework/init_route.py @@ -62,24 +62,6 @@ def robot_to_root(): return send_from_directory('', 'static/file/robots.txt') - - - - - - - - - - - - - - - - - - @F.app.route("/") @@ -126,3 +108,8 @@ def upload(): F.logger.error(traceback.format_exc()) return jsonify('fail') + +# 3.10에서 이거 필수 +@F.socketio.on('connect', namespace=f'/framework') +def connect(): + pass diff --git a/lib/framework/static/js/ff_global1.js b/lib/framework/static/js/ff_global1.js index 8aca164..9e8e471 100644 --- a/lib/framework/static/js/ff_global1.js +++ b/lib/framework/static/js/ff_global1.js @@ -14,6 +14,7 @@ $(document).ready(function(){ var protocol = window.location.protocol; var frameSocket = io.connect(protocol + "//" + document.domain + ":" + location.port + "/framework"); +console.log(frameSocket); frameSocket.on('notify', function(data){ $.notify({ diff --git a/lib/framework/version.py b/lib/framework/version.py index a1e11a3..1deaac4 100644 --- a/lib/framework/version.py +++ b/lib/framework/version.py @@ -1 +1 @@ -VERSION="4.0.1" \ No newline at end of file +VERSION="4.0.2" \ No newline at end of file diff --git a/lib/support/base/subprocess.py b/lib/support/base/subprocess.py index 12c1371..85c9529 100644 --- a/lib/support/base/subprocess.py +++ b/lib/support/base/subprocess.py @@ -127,7 +127,6 @@ class SupportSubprocess(object): tmp.append(f'"{x}"') self.command = ' '.join(tmp) - iter_arg = '' if platform.system() == 'Windows': self.process = subprocess.Popen(self.command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True, shell=self.shell, env=self.env, encoding='utf8') else: