wiki

app/script/convert.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 Linux_Version="9.1.0"
-Windows_Version="8.0.0"
+Windows_Version="8.1.0"
 Btm_Version="2.3.0"
 
 FILES=(

app/view/admin/pluginswin.html

@@ -163,7 +163,7 @@ function download_item(){
     $.ajax({
 		type : 'POST',
 		url : '/admin/download_plugin',
-        data: { name:plugin.name, version:plugin.version},
+        data: { name:plugin.name, version:plugin.version, os:'Windows'},
 		dataType : 'json',
 		success : function(data) {
             layer.close(ii)

wiki/files/linux/PluginLoader.py

@@ -1,53 +1,55 @@
 #coding: utf-8
+# +-------------------------------------------------------------------
+# | 宝塔Linux面板
+# +-------------------------------------------------------------------
+# | Copyright (c) 2015-2099 宝塔软件(http://bt.cn) All rights reserved.
+# +-------------------------------------------------------------------
+# | Author: hwliang <hwl@bt.cn>
+# +-------------------------------------------------------------------
+
+#+--------------------------------------------------------------------
+#|   插件和模块加载器
+#+--------------------------------------------------------------------
+
 import public,os,sys,json
 
-#获取插件列表(0/1)
-def get_plugin_list(force = 0):
-    api_root_url = 'https://api.bt.cn'
-    api_url = api_root_url+ '/panel/get_plugin_list'
-    cache_file = 'data/plugin_list.json'
+def plugin_run(plugin_name,def_name,args):
+    '''
+        @name 执行插件方法
+        @param plugin_name<string> 插件名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not plugin_name or not def_name: return public.returnMsg(False,'插件名称和插件方法名称不能为空!')
     
-    if force==0 and os.path.exists(cache_file):
-        jsonData = public.readFile(cache_file)
-        softList = json.loads(jsonData)
-    else:
-        try:
-            jsonData = public.HttpGet(api_url)
-        except Exception as ex:
-            raise public.error_conn_cloud(str(ex))
-        softList = json.loads(jsonData)
-        if type(softList)!=dict or 'list' not in softList:
-            if type(softList)==str:
-                raise Exception(softList)
-            else:
-                raise Exception('云端插件列表获取失败')
-        public.writeFile(cache_file, jsonData)
-    return softList
+    # 获取插件目录
+    plugin_path = public.get_plugin_path(plugin_name)
+    is_php = os.path.exists(os.path.join(plugin_path,'index.php'))
 
-#获取授权状态() 返回：0.免费版 1.专业版 2.企业版 -1.获取失败
-def get_auth_state():
-    try:
-        softList = get_plugin_list()
-        if softList['ltd'] > -1:
-            return 2
-        elif softList['pro'] > -1:
-            return 1
+    # 检查插件目录是否合法
+    if is_php:
+        plugin_file = os.path.join(plugin_path,'index.php')
     else:
-            return 0
-    except:
-        return -1
+        plugin_file = os.path.join(plugin_path, plugin_name + '_main.py')
+    if not public.path_safe_check(plugin_file): return public.returnMsg(False,'插件路径不合法')
 
-#执行插件方法(插件名,方法名,参数)
-def plugin_run(plugin_name, def_name, args):
-    if not plugin_name or not def_name: return public.returnMsg(False,'插件名称和插件方法名称不能为空!')
-    if not path_check(plugin_name) or not path_check(def_name): return public.returnMsg(False,'插件名或方法名不能包含特殊符号!')
-    p_path = public.get_plugin_path(plugin_name)
-    if not os.path.exists(p_path + '/index.php') and not os.path.exists(p_path + '/%s_main.py' % plugin_name): return public.returnMsg(False,'插件不存在!')
+    # 检查插件入口文件是否存在
+    if not os.path.exists(plugin_file): return public.returnMsg(False,'指定插件入口文件不存在')
+
+    # 添加插件目录到系统路径
+    public.sys_path_append(plugin_path)
 
-    is_php = os.path.exists(p_path + '/index.php')
+    try:
         if not is_php:
-        public.package_path_append(p_path)
-        plugin_main = __import__(plugin_name + '_main')
+            # 引用插件入口文件
+            _name = "{}_main".format(plugin_name)
+            plugin_main = __import__(_name)
+
+            # 检查类名是否符合规范
+            if not hasattr(plugin_main,_name):
+                return public.returnMsg(False,'指定插件入口文件不符合规范')
+            
             try:
                 if sys.version_info[0] == 2:
                     reload(plugin_main)
@@ -56,77 +58,182 @@ def plugin_run(plugin_name, def_name, args):
                     reload(plugin_main)
             except:
                 pass
-        plu = eval('plugin_main.' + plugin_name + '_main()')
-        if not hasattr(plu, def_name):
+            
+            # 实例化插件类
+            plugin_obj = getattr(plugin_main,_name)()
+
+            # 检查方法是否存在
+            if not hasattr(plugin_obj,def_name):
                 return public.returnMsg(False,'在[%s]插件中找不到[%s]方法' % (plugin_name,def_name))
             
             if 'plugin_get_object' in args and args.plugin_get_object == 1:
-        if not is_php:
-            return getattr(plu, def_name)
+                return getattr(plugin_obj, def_name)
+            
+            # 执行方法
+            return getattr(plugin_obj,def_name)(args)
         else:
+            if 'plugin_get_object' in args and args.plugin_get_object == 1:
                 return None
-    else:
-        if not is_php:
-            data = eval('plu.' + def_name + '(args)')
-        else:
             import panelPHP
             args.s = def_name
             args.name = plugin_name
-            data = panelPHP.panelPHP(plugin_name).exec_php_script(args)
-        return data
+            return panelPHP.panelPHP(plugin_name).exec_php_script(args)
+
+    except SyntaxError as ex:
+        return public.returnMsg(False,'指定插件不兼容当前操作系统')
+    except Exception as ex:
+        public.print_error()
+        return public.returnMsg(False,'指定插件不存在')
     
-#执行模块方法(模块名,方法名,参数)
-def module_run(mod_name, def_name, args):
-    if not mod_name or not def_name: return public.returnMsg(False,'模块名称和模块方法名称不能为空!')
-    if not path_check(mod_name) or not path_check(def_name): return public.returnMsg(False,'模块名或方法名不能包含特殊符号!')
 
-    if 'model_index' in args:
-        if args.model_index:
-            mod_file = "{}/{}Model/{}Model.py".format(public.get_class_path(),args.model_index,mod_name)
+def get_module_list():
+    '''
+        @name 获取模块列表
+        @return list    
+    '''
+    module_list = []
+    class_path = public.get_class_path()
+    for name in os.listdir(class_path):
+        path = os.path.join(class_path,name)
+        # 过滤无效文件
+        if not name or name.endswith('.py') or name[0] == '.' or not name.endswith('Model') or os.path.isfile(path):continue
+        module_list.append(name)
+    return module_list
+
+def module_run(module_name,def_name,args):
+    '''
+        @name 执行模块方法
+        @param module_name<string> 模块名称
+        @param def_name<string> 方法名称
+        @param args<dict_obj> 参数对像
+        @return mixed
+    '''
+    if not module_name or not def_name: return public.returnMsg(False,'模块名称和模块方法名称不能为空!')
+    model_index = args.get('model_index',None)
+    class_path = public.get_class_path()
+    panel_path = public.get_panel_path()
+    
+    module_file = None
+    if model_index:
+        # 新模块目录
+        if model_index in ['mod']:
+            _name = "{}Mod".format(module_name)
+            module_file = os.path.join(panel_path,'mod','project',module_name + 'Mod.py')
+        elif model_index:
+            # 旧模块目录
+            _name = "{}Model".format(module_name)
+            module_file = os.path.join(class_path,model_index+"Model",module_name + 'Model.py')
         else:
-            mod_file = "{}/projectModel/{}Model.py".format(public.get_class_path(),mod_name)
+            _name = "{}Model".format(module_name)
+            module_file = os.path.join(class_path,"projectModel",module_name + 'Model.py')
     else:
+        # 如果没指定模块名称，则遍历所有模块目录
         module_list = get_module_list()
-        for module_dir in module_list:
-            mod_file = "{}/{}/{}Model.py".format(public.get_class_path(),module_dir,mod_name)
-            if os.path.exists(mod_file): break
+        for name in module_list:
+            module_file = os.path.join(class_path,name,module_name + 'Model.py')
+            if os.path.exists(module_file):
+                _name = "{}Model".format(module_name)
+                break
+    
+    # 判断模块入口文件是否存在
+    if not os.path.exists(module_file):
+        return public.returnMsg(False,'模块[%s]不存在' % module_name)
     
-    if not os.path.exists(mod_file):
-        return public.returnMsg(False,'模块[%s]不存在' % mod_name)
+    # 判断模块路径是否合法
+    if not public.path_safe_check(module_file):
+        return public.returnMsg(False,'模块路径不合法')
     
-    def_object = public.get_script_object(mod_file)
-    if not def_object: return public.returnMsg(False,'模块[%s]不存在!' % mod_name)
+    public.sys_path_append(os.path.dirname(module_file))
     try:
-        run_object = getattr(def_object.main(),def_name,None)
-    except:
-        return public.returnMsg(False,'模块入口实例化失败' % mod_name)
-    if not run_object: return public.returnMsg(False,'在[%s]模块中找不到[%s]方法' % (mod_name,def_name))
+        # 引用模块入口文件
+        module_main = __import__(_name)
+
+        # 检查模块是否符合规范
+        if not hasattr(module_main,'main'):
+            return public.returnMsg(False,'指定模块入口文件不符合规范')
+
+        # 实例化模块类
+        module_obj = getattr(module_main,'main')()
+
+        # 检查方法是否存在
+        if not hasattr(module_obj,def_name):
+            return public.returnMsg(False,'在[%s]模块中找不到[%s]方法' % (module_name,def_name))
+        
         if 'module_get_object' in args and args.module_get_object == 1:
-        return run_object
-    result = run_object(args)
-    return result
+            return getattr(module_obj,def_name)
+
+        # 执行方法
+        return getattr(module_obj,def_name)(args)
+    except SyntaxError as ex:
+        return public.returnMsg(False,'指定模块不兼容当前操作系统')
+    except Exception as ex:
+        public.print_error()
+        return public.returnMsg(False,'指定模块不存在')
+    
+
+def get_plugin_list(upgrade_force = False):
+    '''
+        @name 获取插件列表
+        @param upgrade_force<bool> 是否强制重新获取列表
+        @return dict
+    '''
+
+    api_root_url = 'https://api.bt.cn'
+    api_url = api_root_url+ '/panel/get_plugin_list'
+    panel_path = public.get_panel_path()
+    data_path = os.path.join(panel_path,'data')
+
+    if not os.path.exists(data_path):
+        os.makedirs(data_path,384)
+
+    plugin_list = {}
+    plugin_list_file = os.path.join(data_path,'plugin_list.json')
+    if os.path.exists(plugin_list_file) and not upgrade_force:
+        plugin_list_body = public.readFile(plugin_list_file)
+        try:
+            plugin_list = json.loads(plugin_list_body)
+        except:
+            plugin_list = {}
+    
+    if not os.path.exists(plugin_list_file) or upgrade_force or not plugin_list:
+        try:
+            res = public.HttpGet(api_url)
+        except Exception as ex:
+            raise public.error_conn_cloud(str(ex))
+        if not res: raise Exception(False,'云端插件列表获取失败')
+
+        plugin_list = json.loads(res)
+        if type(plugin_list)!=dict or 'list' not in plugin_list:
+            if type(plugin_list)==str:
+                raise Exception(plugin_list)
+            else:
+                raise Exception('云端插件列表获取失败')
+        public.writeFile(plugin_list_file,json.dumps(plugin_list))
+        
+    return plugin_list
+
+
+def start_total():
+    '''
+        @name 启动统计服务
+        @return dict
+    '''
+    pass
+
+def get_soft_list(args):
+    '''
+        @name 获取软件列表
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
+    pass
 
-#获取模块文件夹列表
-def get_module_list():
-    list = []
-    class_path = public.get_class_path()
-    f_list = os.listdir(class_path)
-    for fname in f_list:
-        f_path = class_path+'/'+fname
-        if os.path.isdir(f_path) and len(fname) > 6 and fname.find('.') == -1 and fname.find('Model') != -1:
-            list.append(fname)
-    return list
-
-#检查路径是否合法
-def path_check(path):
-    list = ["./","..",",",";",":","?","'","\"","<",">","|","\\","\n","\r","\t","\b","\a","\f","\v","*","%","&","$","#","@","!","~","`","^","(",")","+","=","{","}","[","]"]
-    for i in path:
-        if i in list:
-            return False
-    return True
-
-#数据加密
 def db_encrypt(data):
+    '''
+        @name 数据库加密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
     try:
         key = __get_db_sgin()
         iv = __get_db_iv()
@@ -143,8 +250,12 @@ def db_encrypt(data):
     }
     return result
 
-#数据解密
 def db_decrypt(data):
+    '''
+        @name 数据库解密
+        @param args<dict_obj> 参数对像
+        @return dict
+    '''
     try:
         key = __get_db_sgin()
         iv = __get_db_iv()
@@ -215,3 +326,49 @@ def __aes_encrypt(data, key, iv):
     encryptedbytes = aes.encrypt(data)
     en_text = base64.b64encode(encryptedbytes)
     return en_text.decode('utf-8')
+
+def plugin_end():
+    '''
+        @name 插件到期处理
+        @return dict
+    '''
+    pass
+
+def daemon_task():
+    '''
+        @name 后台任务守护
+        @return dict
+    '''
+    pass
+
+def daemon_panel():
+    '''
+        @name 面板守护
+        @return dict
+    '''
+    pass
+
+def flush_auth_key():
+    '''
+        @name 刷新授权密钥
+        @return dict
+    '''
+    pass
+
+def get_auth_state():
+    '''
+        @name 获取授权状态
+        @return 返回：0.免费版 1.专业版 2.企业版 -1.获取失败
+    '''
+    try:
+        softList = get_plugin_list()
+        if softList['ltd'] > -1:
+            return 2
+        elif softList['pro'] > -1:
+            return 1
+        else:
+            return 0
+    except:
+        return -1
+
+ 

wiki/files/win/bt.js

@@ -66,6 +66,31 @@ if("undefined" != typeof bt && bt.hasOwnProperty("compute_confirm")){
 		});
 	}
 }
+if("undefined" != typeof bt && bt.hasOwnProperty("input_confirm")){
+    bt.input_confirm = function (config, callback) {
+		layer.open({
+			type: 1,
+			title: config.title,
+			area: '430px',
+			closeBtn: 2,
+			shadeClose: true,
+			btn: [lan['public'].ok, lan['public'].cancel],
+			content:
+				'<div class="bt-form hint_confirm pd30">\
+						<div class="hint_title">\
+							<i class="hint-confirm-icon"></i>\
+							<div class="hint_con">' +
+				config.msg +
+				'</div>\
+						</div>\
+				</div>',
+			yes: function (layers, index) {
+                layer.close(layers);
+                if (callback) callback();
+			},
+		});
+	}
+}
 if("undefined" != typeof database && database.hasOwnProperty("del_database")){
     database.del_database = function (wid, dbname,obj, callback) {
         var title = '',

wiki/updatewin.md

@@ -16,6 +16,8 @@ Windows版宝塔由于加密文件太多，无法全部解密，因此无法做
 
 - 全局搜索替换 https://www.bt.cn/api/ => http://www.example.com/api/（需排除ipsModel.py）
 
+- 全局搜索替换 http://www.bt.cn/api/ => http://www.example.com/api/
+
 - 全局搜索替换 https://download.bt.cn/win/panel/data/setup.py => http://www.example.com/win/panel/data/setup.py
 
 - class/panel_update.py 文件 public.get_url() =>  'http://www.example.com'