update

plugins/xui/index.py

@@ -156,17 +156,17 @@ def initdUinstall():
 
 def getXuiInfo():
 
+    data = {}
     user = pSqliteDb('users')
-
     info = user.field('username,password').where("id=?", (1,)).find()
 
     setting = pSqliteDb('settings')
+    setting_data = setting.field('webPort')..where("key=?", ('webPort',)).find()
 
-    setting_data = setting.where("key=?", ('webPort',)).find()
+    data['username'] = info['username']
-
+    data['password'] = info['password']
-    print(info)
+    data['port'] = info['webPort']
-    print(setting_data)
+    return mw.returnJson(True, 'ok', data)
-    return mw.returnJson(True, 'ok', '')
 
 def installPreInspection():
     sys = mw.execShell("cat /etc/*-release | grep PRETTY_NAME |awk -F = '{print $2}' | awk -F '\"' '{print $2}'| awk '{print $1}'")

plugins/xui/js/xui.js

@@ -27,35 +27,53 @@ function mtPost(method, version, args,callback){
 }
 
 function mtCommonFunc(){
-	var con = '<hr/><p class="conf_p" style="text-align:center;">\
+
-        <button id="mtproxy_url" class="btn btn-default btn-sm">获取连接地址</button>\
+    mtPost('info', '', {}, function(rdata){
-    </p>';
+        var rdata = $.parseJSON(rdata.data);
-
+        var con = '<p class="conf_p">\
-    $(".soft-man-con").html(con);
+            <span>用户名</span>\
-
+            <input class="bt-input-text mr5" type="number" value="' + rdata['username'] + '">, 秒\
-    $('#mtproxy_url').click(function(){
+        </p>';
-    	mtPost('url', '', {}, function(rdata){
+
-            var data = $.parseJSON(rdata.data);
+        con += '<p class="conf_p">\
-
+            <span>密码</span>\
-            layer.open({
+            <input class="bt-input-text mr5" type="number" value="' + rdata['password']  +'" name="max">,MB\
-                title: "mtproxy代理信息",
+        </p>';
-                area: ['600px', '180px'],
+        con += '<p class="conf_p">\
-                type:1,
+            <span>端口</span>\
-                closeBtn: 1,
+            <input class="bt-input-text mr5" type="number" value="' + rdata['port']  +'" name="max">,MB\
-                shadeClose: false,
+        </p>';
-                btn:["复制","取消"],
+
-                content: '<div class="pd15">\
+        var con = '<hr/><p class="conf_p" style="text-align:center;">\
-                            <div class="divtable">\
+            <button id="mtproxy_url" class="btn btn-default btn-sm">打开XUI</button>\
-                                <pre class="layui-code">'+data.data+'</pre>\
+        </p>';
-                            </div>\
+
-                        </div>',
+        $(".soft-man-con").html(con);
-                success:function(){
-                    copyText(data.data);
-                },
-                yes:function(){
-                    copyText(data.data);
-                }
-            });
-    	});
     });
+    
+    // $('#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);
+    //             }
+    //         });
+    // 	});
+    // });
 }