getGljItems timeout设置

modules/std_glj_lib/models/gljModel.js

@@ -88,22 +88,13 @@ class GljDao  extends OprDao{
     }
 
     async getGljItemsByRep(repositoryId,callback = null){
-   /*     let me = this;
-        if (callback === null) {
-            return gljModel.find({"repositoryId": repositoryId});
-        } else {
-            gljModel.find({"repositoryId": repositoryId},function(err,data){
-                if(err) callback(true, "")
-                else {
-                    me.sortToNumber(data);
-                    callback(false,data);
-                }
-            })
-        }*/
-
-        let me = this;
-        let rst = [];
-        //批量获取异步
+        try {
+            let rst = await gljModel.find({repositoryId: repositoryId});
+            callback(0, rst);
+        } catch (err) {
+            callback(1, null);
+        }
+        /*//批量获取异步
         let functions = [];
         let count = await gljModel.find({repositoryId: repositoryId, $or: [{deleted: null}, {deleted: false}]}).count();
         let findCount = Math.ceil(count/500);
@@ -125,7 +116,7 @@ class GljDao  extends OprDao{
                 me.sortToNumber(rst);
                 callback(0, rst);
             }
-        });
+        });*/
     }
 
     getGljItemByType (repositoryId, type, callback){

web/maintain/std_glj_lib/js/glj.js

@@ -375,7 +375,7 @@ let repositoryGljObj = {
             data:{"repositoryId": repId},
             dataType:"json",
             cache:false,
-            timeout:20000,
+            timeout:240000,
             success:function(result){
                 if(!result.error) {
                     me.gljList = result.data;
@@ -388,7 +388,7 @@ let repositoryGljObj = {
                 }
             },
             error:function(err){
-                alert(err.responseJSON.error);
+                alert(err);
             }
         })
     },