u

class/public.py

@@ -31,7 +31,6 @@ def getBinDir():
 
 
 def M(table):
-
     sql = db.Sql()
     return sql.table(table)
 

route/plugins.py

@@ -16,6 +16,7 @@ import public
 
 plugins = Blueprint('plugins', __name__, template_folder='templates')
 __plugin_name = "plugins"
+__row_num = 3
 
 
 @plugins.route("/file", methods=['GET'])
@@ -39,7 +40,7 @@ def file():
 @plugins.route("/list", methods=['GET', 'POST'])
 def list():
 
-    public.M('tasks')
+    # public.M('tasks')
 
     data = json.loads(public.readFile("data/type.json"))
     ret = {}
@@ -63,10 +64,11 @@ def list():
                     else:
                         if tmp['pid'] == typeVal:
                             plugins_info.append(tmp)
-                except ValueError, Argument:
+                except:
                     pass
 
     ret['data'] = plugins_info
+    ret['list'] = get_page(plugins_info, request.args)
     return jsonify(ret)
 
 
@@ -98,10 +100,9 @@ def install():
     print taskAdd
     public.M('tasks').add('id,name,type,status,addtime, execstr', taskAdd)
 
-    # sh = __plugin_name + '/' + name + '/' + pluginInfo['shell']
+    sh = __plugin_name + '/' + name + '/' + pluginInfo['shell']
     # os.system('/bin/bash ' + sh + ' install')
-    print request.args
-    return ''
+    return public.retJson(True, '已将安装任务添加到队列!')
 
 
 @plugins.route('/uninstall', methods=['POST'])
@@ -121,7 +122,7 @@ def installed():
     infoJsonPos = __plugin_name + '/' + name + '/' + 'info.json'
 
     if not os.path.exists(infoJsonPos):
-        return public.retJson(-1, "info.json数据不存在!", ())
+        return public.retJson(-1, "配置数据(info.json)不存在!", ())
 
     pluginInfo = json.loads(public.readFile(infoJsonPos))
 
@@ -129,3 +130,27 @@ def installed():
     os.system('/bin/bash ' + sh + ' install')
     print request.args
     return ''
+
+# 取分页
+
+
+def get_page(data, args):
+    # 包含分页类
+    import page
+    # 实例化分页类
+    page = page.Page()
+    info = {}
+    info['count'] = len(data)
+    info['row'] = __row_num
+    info['p'] = 1
+    if hasattr(args, 'p'):
+        info['p'] = int(get['p'])
+    info['uri'] = {}
+    info['return_js'] = ''
+    if hasattr(args, 'tojs'):
+        info['return_js'] = args.tojs
+
+    # 获取分页数据
+    result = {}
+    result['page'] = page.GetPage(info)
+    return result

route/task.py

@@ -3,6 +3,10 @@
 from flask import Flask
 from flask import Blueprint, render_template
 
+import sys
+sys.path.append("class/")
+import public
+
 
 task = Blueprint('task', __name__, template_folder='templates')
 
@@ -14,4 +18,5 @@ def index():
 
 @task.route("/count")
 def count():
-    return "0"
+    c = public.M('tasks').where("status!=?", ('1',)).count()
+    return str(c)

static/js/soft.js

@@ -6,7 +6,7 @@ function phpSoftMain(name, key) {
     }
 
     var loadT = layer.msg(lan.public.the, { icon: 16, time: 0, shade: [0.3, '#000'] });
-    $.get('/plugin?action=getPluginInfo&name=php', function(rdata) {
+    $.get('/plugins?action=getPluginInfo&name=php', function(rdata) {
         layer.close(loadT);
         nameA = rdata.versions[key];
         bodys = [
@@ -1765,7 +1765,7 @@ function GetSList(isdisplay) {
 
     var condition = (search + type + page).slice(1);
     $.post('/plugins/list?' + condition, '', function(rdata) {
-        // console.log(rdata);
+        console.log(rdata);
         layer.close(loadT);
         var tBody = '';
         var sBody = '';
@@ -1780,7 +1780,7 @@ function GetSList(isdisplay) {
         }
 
         $(".softtype").html(tBody);
-        $("#softPage").html(rdata.page);
+        $("#softPage").html(rdata.list.page);
         $("#softPage .Pcount").css({ "position": "absolute", "left": "0" })
 
         $(".task").text(rdata.data[rdata.length - 1]);
@@ -1935,7 +1935,7 @@ function SoftUpdate(name, version, update) {
     SafeMessage('更新[' + name + ']', '更新过程可能会导致服务中断,您真的现在就将[' + name + ']更新到[' + update + ']吗?', function() {
         var data = "name=" + name + "&version=" + version + "&type=0&upgrade=" + update;
         var loadT = layer.msg('正在更新[' + name + '-' + version + '],请稍候...', { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.post('/plugin?action=install', data, function(rdata) {
+        $.post('/plugins/install', data, function(rdata) {
             if (rdata.status) {
                 GetTaskCount();
                 layer.msg('已添加到任务列表,请稍候...', { icon: 1 });
@@ -2037,7 +2037,7 @@ function AddVersion(name, ver, type, obj, title) {
             $(obj).text(lan.soft.install_the);
             var data = "name=" + name;
             var loadT = layer.msg(lan.soft.the_install, { icon: 16, time: 0, shade: [0.3, '#000'] });
-            $.post("/plugin?action=install", data, function(rdata) {
+            $.post("/plugins/install", data, function(rdata) {
                 layer.close(loadT);
                 layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
                 setTimeout(function() { GetSList() }, 2000)
@@ -2197,7 +2197,7 @@ function UninstallVersion(name, version, title) {
     layer.confirm(lan.soft.uninstall_confirm.replace('{1}', title).replace('{2}', version), { icon: 3, closeBtn: 2 }, function() {
         var data = 'name=' + name + '&version=' + version;
         var loadT = layer.msg(lan.public.the, { icon: 16, time: 0, shade: [0.3, '#000'] });
-        $.post('/plugin?action=unInstall', data, function(rdata) {
+        $.post('/plugins?action=unInstall', data, function(rdata) {
             layer.close(loadT)
             GetSList();
             layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
@@ -2325,7 +2325,7 @@ function toIndexDisplay(name, version) {
         status = $("#index_" + name + verinfo).prop("checked") ? "0" : "1";
     }
     var data = "name=" + name + "&status=" + status + "&version=" + version;
-    $.post("plugin?action=setPluginStatus", data, function(rdata) {
+    $.post("/plugins?action=setPluginStatus", data, function(rdata) {
         if (rdata.status) {
             layer.msg(rdata.msg, { icon: 1 })
         }
@@ -2335,7 +2335,7 @@ function toIndexDisplay(name, version) {
 //刷新缓存
 function flush_cache() {
     var loadT = layer.msg(lan.soft.get_list, { icon: 16, time: 0, shade: [0.3, '#000'] })
-    $.post('/plugin?action=flush_cache', {}, function(rdata) {
+    $.post('/plugins?action=flush_cache', {}, function(rdata) {
         layer.close(loadT)
         layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 });
     });