update
This commit is contained in:
@@ -113,8 +113,14 @@ class Framework:
|
||||
if os.path.exists(_):
|
||||
plugins = os.listdir(_)
|
||||
|
||||
if self.config['path_dev'] != None and os.path.exists(self.config['path_dev']):
|
||||
plugins += os.listdir(self.config['path_dev'])
|
||||
if self.config['path_dev'] != None:
|
||||
if type(self.config['path_dev']) == type(''):
|
||||
plugin_path_list = [self.config['path_dev']]
|
||||
elif type(self.config['path_dev']) == type([]):
|
||||
plugin_path_list = self.config['path_dev']
|
||||
for __ in plugin_path_list:
|
||||
if os.path.exists(__):
|
||||
plugins += os.listdir(__)
|
||||
|
||||
for package_name in plugins:
|
||||
db_path = os.path.join(self.config['path_data'], 'db', f'{package_name}.db')
|
||||
|
||||
@@ -46,16 +46,23 @@ class PluginManager:
|
||||
try:
|
||||
#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)
|
||||
tmps = os.listdir(plugin_path)
|
||||
add_plugin_list = []
|
||||
for t in tmps:
|
||||
if not t.startswith('_') and os.path.isdir(os.path.join(plugin_path, t)):
|
||||
add_plugin_list.append(t)
|
||||
cls.all_package_list[t] = {'pos':'dev', 'path':os.path.join(plugin_path, t), 'loading':True}
|
||||
plugins = plugins + add_plugin_list
|
||||
|
||||
if type(plugin_path) == type(''):
|
||||
plugin_path_list = [plugin_path]
|
||||
elif type(plugin_path) == type([]):
|
||||
plugin_path_list = plugin_path
|
||||
|
||||
for __ in plugin_path_list:
|
||||
if __ != None and __ != '':
|
||||
if os.path.exists(__):
|
||||
sys.path.insert(0, __)
|
||||
tmps = os.listdir(__)
|
||||
add_plugin_list = []
|
||||
for t in tmps:
|
||||
if not t.startswith('_') and os.path.isdir(os.path.join(__, t)):
|
||||
add_plugin_list.append(t)
|
||||
cls.all_package_list[t] = {'pos':'dev', 'path':os.path.join(__, t), 'loading':True}
|
||||
plugins = plugins + add_plugin_list
|
||||
except Exception as exception:
|
||||
F.logger.error('Exception:%s', exception)
|
||||
F.logger.error(traceback.format_exc())
|
||||
|
||||
@@ -118,10 +118,12 @@ def videojs():
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@F.app.route("/headers", methods=['GET', 'POST'])
|
||||
def headers():
|
||||
from support import d
|
||||
F.logger.info(d(request.headers))
|
||||
return jsonify(d(request.headers))
|
||||
|
||||
|
||||
# 3.10에서 이거 필수
|
||||
@F.socketio.on('connect', namespace=f'/framework')
|
||||
|
||||
@@ -57,10 +57,6 @@ function j_row_end() {
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function j_hr(margin='5') {
|
||||
var str = '<hr style="width: 100%; margin:'+margin+'px;" />';
|
||||
return str;
|
||||
@@ -73,6 +69,20 @@ function j_hr_black() {
|
||||
|
||||
|
||||
|
||||
// 한줄 왼쪽
|
||||
function j_row_info(left, right, l=2, r=8) {
|
||||
var str =' \
|
||||
<div class="row"> \
|
||||
<div class="col-sm-'+1+'" style="text-align:right;"></div> \
|
||||
<div class="col-sm-'+l+'" style="text-align:right;"> \
|
||||
<strong>'+ left +'</strong> \
|
||||
</div> \
|
||||
<div class="col-sm-'+r+'" style="word-break:break-all;"> \
|
||||
<span class="text-left" style="padding-left:10px; padding-top:3px;">'+right +'</span> \
|
||||
</div> \
|
||||
</div>';
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
VERSION="4.0.28"
|
||||
VERSION="4.0.29"
|
||||
Reference in New Issue
Block a user