zhangjinkun 6 жил өмнө
parent
commit
e23062b3e7

+ 2 - 2
src/jy/cluster/aliecs.go

@@ -41,10 +41,10 @@ func RunInstances(TaskName string, num, hours int) {
 				//[]string{"SecurityGroupId", "sg-bp16x3td2evrejhkshp7"},
 				[]string{"VSwitchId", qu.ObjToString(esconfig["VSwitchId"])},
 				[]string{"InternetMaxBandwidthIn", "50"},
-				[]string{"InternetMaxBandwidthOut", "5"},
+				[]string{"InternetMaxBandwidthOut", "0"},
 				[]string{"InstanceChargeType", "PostPaid"},
 				[]string{"SpotStrategy", "SpotWithPriceLimit"},
-				[]string{"SpotPriceLimit", "2.99"},
+				[]string{"SpotPriceLimit", "1.99"},
 				[]string{"InstanceName", "extract"},
 				[]string{"UniqueSuffix", "true"},
 				[]string{"Password", Password},

+ 1 - 1
src/jy/cluster/distributed.go

@@ -91,7 +91,7 @@ func RangeIdsByDate(table string, escnum int, start time.Time) map[string][]stri
 			count := DB.Count(table, query)
 			start = end
 			log.Printf("i:%d count:%d", i, count)
-			if count >= 500000 || start.Unix() > time.Now().Unix() {
+			if count >= 200000 || start.Unix() > time.Now().Unix() {
 				idsnum = count
 				break
 			}

+ 1 - 1
src/jy/pretreated/analytable.go

@@ -1995,7 +1995,7 @@ func (tn *Table) assemblePackage(k1, v1, key string) {
 		k2, w1, v2, _, bf := CommonDataAnaly(k1, "中标情况", "", v1)
 		if bf {
 			for pos, k3 := range k2 {
-				if bp.TableKV.Kv[k3] == "" || w1[pos] > bp.TableKV.KvTag[k3].Weight {
+				if bp.TableKV.Kv != nil && (bp.TableKV.Kv[k3] == "" || w1[pos] > bp.TableKV.KvTag[k3].Weight) {
 					bp.TableKV.Kv[k3] = v2
 					bp.TableKV.KvTag[k3] = &u.Tag{Value: v2, Weight: w1[pos]}
 				}

+ 1 - 1
src/jy/pretreated/tablev2.go

@@ -162,7 +162,7 @@ func NewTD(Goquery *goquery.Selection, tr *TR, table *Table) *TD {
 						bp := tb1.Map[k].(*u.BlockPackage)
 						if v1.TableKV != nil && v1.TableKV.Kv != nil {
 							for k2, v2 := range v1.TableKV.Kv {
-								if bp.TableKV.Kv[k2] == "" {
+								if bp.TableKV.Kv != nil && bp.TableKV.Kv[k2] == "" {
 									bp.TableKV.Kv[k2] = v2
 									bp.Text += fmt.Sprintf("%v:%v\n", k2, v2)
 								}