xg

src/config.json

@@ -26,7 +26,7 @@
     },
     "jy": {
         "addr":"172.20.45.129:27002",
-        "db": "qfw",
+        "db": "jyqyfw",
         "history": "usermail_history",
         "pushcoll": "usermail",
         "user": "user",

src/crons/repeat_data.go

@@ -1,14 +1,14 @@
 package crons
 
 import (
+	"dataValidation/util"
 	"fmt"
 	"go.mongodb.org/mongo-driver/bson"
-	qu "qfw/util"
-	"qfw/util/redis"
+	qu "jygit.jydev.jianyu360.cn/data_processing/common_utils"
+	"jygit.jydev.jianyu360.cn/data_processing/common_utils/redis"
 	"strings"
 	"sync"
 	"time"
-	"util"
 )
 
 var (

src/front/group.go

@@ -1,7 +1,7 @@
 package front
 
 import (
-	"crons"
+	"dataValidation/crons"
 	"dataValidation/util"
 	"encoding/json"
 	"fmt"
@@ -11,15 +11,14 @@ import (
 	"io"
 	qu "jygit.jydev.jianyu360.cn/data_processing/common_utils"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
+	"jygit.jydev.jianyu360.cn/data_processing/common_utils/redis"
 	"math"
 	"os"
-	"qfw/util/redis"
 	"sort"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
-	"util"
 )
 
 // GroupTaskListByGroup 用户组权限用户组任务列表
@@ -188,7 +187,7 @@ func (f *Front) GroupUserTaskList() {
 		}
 		qu.Debug("Query：", query)
 		count := util.Mgo.Count(util.TASKCOLLNAME, query)
-		list, _ := util.Mgo.Find(util.TASKCOLLNAME, query, map[string]interface{}{"_id": -1}, nil, false, start, limit)
+		list, _ := util.Mgo.Find(util.TASKCOLLNAME, query, map[string]interface{}{"_id": -1}, nil, false, int(start), int(limit))
 		for _, l := range *list {
 			if status := qu.ObjToString(l["s_status"]); status == "进行中" { //更新任务进度
 				giveNum := qu.IntAll(l["i_givenum"])

src/util/config.go

@@ -6,6 +6,7 @@ import (
 	qu "jygit.jydev.jianyu360.cn/data_processing/common_utils"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/elastic"
 	"jygit.jydev.jianyu360.cn/data_processing/common_utils/mongodb"
+	"jygit.jydev.jianyu360.cn/data_processing/common_utils/redis"
 	"sort"
 	"sync"
 )

src/web/templates/login.html

@@ -45,11 +45,11 @@
         <input id="pwd" type="password" class="form-control" placeholder="请输入密码">
         <span class="glyphicon glyphicon-lock form-control-feedback"></span>
       </div>
-      <div class="form-group has-feedback">
-        <input id="verifyImgCode" class="form-control" placeholder="请输入验证码">
-        <img style="cursor:pointer ;z-index: 5;position: absolute;right: 1px;width: 100px;top: 1px"
-          alt="点击刷新验证码" src="/code" id="verifyImg">
-      </div>
+<!--      <div class="form-group has-feedback">-->
+<!--        <input id="verifyImgCode" class="form-control" placeholder="请输入验证码">-->
+<!--        <img style="cursor:pointer ;z-index: 5;position: absolute;right: 1px;width: 100px;top: 1px"-->
+<!--          alt="点击刷新验证码" src="/code" id="verifyImg">-->
+<!--      </div>-->
 
       <div class="row">
         <!-- /.col -->