fix assignment

Author: 710leo

api/item.go

@@ -83,7 +83,7 @@ type GetItemResponse struct {
 func (this *Web) GetItem(hostname string, resp *GetItemResponse) error {
 	items, exists := g.DetectedItemMap.Get(hostname)
 	if !exists {
-		resp.Message = "no found"
+		resp.Message = "no found item assigned to " + hostname
 	}
 	resp.Data = items
 	return nil

cron/fetcher.go

@@ -31,7 +31,7 @@ func getDetectedItem() {
 
 		for _, tmp := range ipIdcArr {
 			detectedItem := newDetectedItem(s, tmp.Ip, tmp.Idc)
-			key := utils.Getkey(tmp.Idc)
+			key := utils.Getkey(tmp.Idc, int(detectedItem.Sid))
 
 			if _, exists := detectedItemMap[key]; exists {
 				detectedItemMap[key] = append(detectedItemMap[key], &detectedItem)

model/strategy.go

@@ -1,8 +1,6 @@
 package model
 
 import (
-	"log"
-
 	. "github.com/urlooker/web/store"
 )
 
@@ -27,16 +25,13 @@ func GetAllStrategyCount(mine int, query, username string) (int64, error) {
 			return Orm.Where("url LIKE ? AND creator = ? ORDER BY id", "%"+query+"%", username).Count(new(Strategy))
 		} else {
 			num, err := Orm.Where("creator = ?", username).Count(new(Strategy))
-			log.Println(err)
 			return num, err
 		}
 	} else {
 		if query != "" {
 			return Orm.Where("url LIKE ? ORDER BY id", "%"+query+"%").Count(new(Strategy))
 		} else {
-			log.Println("orm:", Orm)
 			num, err := Orm.Count(new(Strategy))
-			log.Println(err)
 			return num, err
 		}
 	}

utils/utils.go

@@ -11,11 +11,10 @@ import (
 	"github.com/urlooker/web/g"
 )
 
-func Getkey(idc string) string {
+func Getkey(idc string, sid int) string {
 	keys := g.Config.MonitorMap[idc]
 	count := len(keys)
-	now := int(time.Now().Unix())
-	return keys[now%count]
+	return keys[sid%count]
 }
 
 func IsIP(ip string) bool {

views/chart/index.html

@@ -15,6 +15,7 @@
             <thead>
             <tr>
                 <th>Status</th>
+                <th>上报值</th>
                 <th>Url</th>
                 <th>Ip</th>
                 <th>返回码</th>
@@ -26,6 +27,7 @@
                 {{range .Events}}
                 <tr>
                 	<td width="20%">{{.Status}}</td>
+                    <td width="10%">{{.Results}}</td>
                     <td id="item_target" width="35%" style="word-wrap:break-word;word-break:break-all;">{{.Url}}</td>
                     <td width="10%">{{.Ip}}</td>
                     <td width="10%">{{.RespCode}}</td>

views/inc/nav.html

@@ -47,7 +47,7 @@
                         </li>
                         <li role="separator" class="divider"></li>
                         <li>
-                            <a href="/help" target="_blank">
+                            <a href="https://github.com/710leo/urlooker" target="_blank">
                                 <span class="glyphicon glyphicon-question-sign"></span>
                                 帮助
                             </a>

views/inc/nav_chart.html

@@ -55,7 +55,7 @@
                         </li>
                         <li role="separator" class="divider"></li>
                         <li>
-                            <a href="/help" target="_blank">
+                            <a href="https://github.com/710leo/urlooker" target="_blank">
                                 <span class="glyphicon glyphicon-question-sign"></span>
                                 帮助
                             </a>