update

plugins/xui/index.py

@@ -161,11 +161,14 @@ def getXuiInfo():
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
-    setting_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
-
+    port_data = setting.field('id,key,value').where("key=?", ('webPort',)).find()
+    path_data = setting.field('id,key,value').where("key=?", ('webBasePath',)).find()
     data['username'] = info['username']
     data['password'] = info['password']
-    data['port'] = setting_data['value']
+    data['port'] = port_data['value']
+    data['path'] = path_data['value']
+
+    data['ip'] = mw.getHostAddr()
     return mw.returnJson(True, 'ok', data)
 
 def installPreInspection():

plugins/xui/js/xui.js

@@ -45,36 +45,20 @@ function xuiCommonFunc(){
             <input class="bt-input-text mr5" type="text" value="' + info.port  +'">\
         </p>';
 
+        con += '<p class="conf_p">\
+            <span>路径</span>\
+            <input class="bt-input-text mr5" type="text" value="' + info.path  +'">\
+        </p>';
+
         con += '<hr/><p class="conf_p" style="text-align:center;">\
             <button id="open_url" class="btn btn-default btn-sm">打开XUI</button>\
         </p>';
 
         $(".soft-man-con").html(con);
+        $('#open_url').click(function(){
+            var url = 'http://' + data.ip + ':' + data.port;
+            window.open(url);
+            copyText(url);
+        });
     });
-    
-    // $('#mtproxy_url').click(function(){
-    // 	mtPost('url', '', {}, function(rdata){
-    //         var data = $.parseJSON(rdata.data);
-
-    //         layer.open({
-    //             title: "mtproxy代理信息",
-    //             area: ['600px', '180px'],
-    //             type:1,
-    //             closeBtn: 1,
-    //             shadeClose: false,
-    //             btn:["复制","取消"],
-    //             content: '<div class="pd15">\
-    //                         <div class="divtable">\
-    //                             <pre class="layui-code">'+data.data+'</pre>\
-    //                         </div>\
-    //                     </div>',
-    //             success:function(){
-    //                 copyText(data.data);
-    //             },
-    //             yes:function(){
-    //                 copyText(data.data);
-    //             }
-    //         });
-    // 	});
-    // });
 }

web/core/mw.py

@@ -704,7 +704,8 @@ def getCpuType():
 
 
 def getLanguage():
-    path = 'data/language.pl'
+    panel_dir = getPanelDir()
+    path = panel_dir+'/data/language.pl'
     if not os.path.exists(path):
         return 'Simplified_Chinese'
     return readFile(path).strip()
@@ -965,8 +966,8 @@ def writeDbLog(stype, msg, args=(), uid=1):
         return False
 
 def writeSpeed(title, used, total, speed=0):
-    path = getPanelDir()
-    speed_file= path + '/data/panel_speed.pl'
+    panel_dir = getPanelDir()
+    speed_file= panel_dir + '/data/panel_speed.pl'
     # 写进度
     if not title:
         data = {'title': None, 'progress': 0,'total': 0, 'used': 0, 'speed': 0}
@@ -978,8 +979,8 @@ def writeSpeed(title, used, total, speed=0):
 
 
 def getSpeed():
-    path = getPanelDir()
-    speed_file= path + '/data/panel_speed.pl'
+    panel_dir = getPanelDir()
+    speed_file= panel_dir + '/data/panel_speed.pl'
     # 取进度
     path = getPanelDir()
     data = readFile(speed_file)