Merge branch 'dev/v4.8.83_dx' of qmx/jy into feature/v4.8.83

src/index.yaml

@@ -184,503 +184,503 @@ industryArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 37588
-          - secondQuarter: 47537
-          - thirdQuarter: 44969
-          - fourthQuarter: 38246
+            secondQuarter: 47537
+            thirdQuarter: 44969
+            fourthQuarter: 38246
       - area: 河南
         quarterArr:
           - firstQuarter: 5107
-          - secondQuarter: 7002
-          - thirdQuarter: 9423
-          - fourthQuarter: 9289
+            secondQuarter: 7002
+            thirdQuarter: 9423
+            fourthQuarter: 9289
       - area: 北京
         quarterArr:
           - firstQuarter: 8591
-          - secondQuarter: 12634
-          - thirdQuarter: 14005
-          - fourthQuarter: 12150
+            secondQuarter: 12634
+            thirdQuarter: 14005
+            fourthQuarter: 12150
       - area: 江苏
         quarterArr:
           - firstQuarter: 11404
-          - secondQuarter: 15346
-          - thirdQuarter: 16518
-          - fourthQuarter: 14523
+            secondQuarter: 15346
+            thirdQuarter: 16518
+            fourthQuarter: 14523
       - area: 湖北
         quarterArr:
           - firstQuarter: 9211
-          - secondQuarter: 13292
-          - thirdQuarter: 13539
-          - fourthQuarter: 13637
+            secondQuarter: 13292
+            thirdQuarter: 13539
+            fourthQuarter: 13637
       - area: 山东
         quarterArr:
           - firstQuarter: 10696
-          - secondQuarter: 18387
-          - thirdQuarter: 16995
-          - fourthQuarter: 16732
+            secondQuarter: 18387
+            thirdQuarter: 16995
+            fourthQuarter: 16732
       - area: 河北
         quarterArr:
           - firstQuarter: 4713
-          - secondQuarter: 5844
-          - thirdQuarter: 5807
-          - fourthQuarter: 4732
+            secondQuarter: 5844
+            thirdQuarter: 5807
+            fourthQuarter: 4732
       - area: 四川
         quarterArr:
           - firstQuarter: 7101
-          - secondQuarter: 11730
-          - thirdQuarter: 12218
-          - fourthQuarter: 10853
+            secondQuarter: 11730
+            thirdQuarter: 12218
+            fourthQuarter: 10853
       - area: 陕西
         quarterArr:
           - firstQuarter: 3950
-          - secondQuarter: 6025
-          - thirdQuarter: 6928
-          - fourthQuarter: 6849
+            secondQuarter: 6025
+            thirdQuarter: 6928
+            fourthQuarter: 6849
     industry: 信息技术
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 60029
-          - secondQuarter: 72589
-          - thirdQuarter: 62958
-          - fourthQuarter: 49048
+            secondQuarter: 72589
+            thirdQuarter: 62958
+            fourthQuarter: 49048
       - area: 河南
         quarterArr:
           - firstQuarter: 5341
-          - secondQuarter: 7035
-          - thirdQuarter: 6622
-          - fourthQuarter: 5549
+            secondQuarter: 7035
+            thirdQuarter: 6622
+            fourthQuarter: 5549
       - area: 北京
         quarterArr:
           - firstQuarter: 6352
-          - secondQuarter: 8897
-          - thirdQuarter: 9414
-          - fourthQuarter: 6977
+            secondQuarter: 8897
+            thirdQuarter: 9414
+            fourthQuarter: 6977
       - area: 江苏
         quarterArr:
           - firstQuarter: 11857
-          - secondQuarter: 14898
-          - thirdQuarter: 15141
-          - fourthQuarter: 13500
+            secondQuarter: 14898
+            thirdQuarter: 15141
+            fourthQuarter: 13500
       - area: 湖北
         quarterArr:
           - firstQuarter: 14518
-          - secondQuarter: 20741
-          - thirdQuarter: 20124
-          - fourthQuarter: 19911
+            secondQuarter: 20741
+            thirdQuarter: 20124
+            fourthQuarter: 19911
       - area: 山东
         quarterArr:
           - firstQuarter: 133107
-          - secondQuarter: 124809
-          - thirdQuarter: 46409
-          - fourthQuarter: 53874
+            secondQuarter: 124809
+            thirdQuarter: 46409
+            fourthQuarter: 53874
       - area: 河北
         quarterArr:
           - firstQuarter: 5680
-          - secondQuarter: 6376
-          - thirdQuarter: 5744
-          - fourthQuarter: 4618
+            secondQuarter: 6376
+            thirdQuarter: 5744
+            fourthQuarter: 4618
       - area: 四川
         quarterArr:
           - firstQuarter: 9328
-          - secondQuarter: 12639
-          - thirdQuarter: 12146
-          - fourthQuarter: 9450
+            secondQuarter: 12639
+            thirdQuarter: 12146
+            fourthQuarter: 9450
       - area: 陕西
         quarterArr:
           - firstQuarter: 3862
-          - secondQuarter: 6642
-          - thirdQuarter: 6799
-          - fourthQuarter: 5968
+            secondQuarter: 6642
+            thirdQuarter: 6799
+            fourthQuarter: 5968
     industry: 服务采购
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 69553
-          - secondQuarter: 96976
-          - thirdQuarter: 82592
-          - fourthQuarter: 68195
+            secondQuarter: 96976
+            thirdQuarter: 82592
+            fourthQuarter: 68195
       - area: 河南
         quarterArr:
           - firstQuarter: 7809
-          - secondQuarter: 12327
-          - thirdQuarter: 14705
-          - fourthQuarter: 14721
+            secondQuarter: 12327
+            thirdQuarter: 14705
+            fourthQuarter: 14721
       - area: 北京
         quarterArr:
           - firstQuarter: 3679
-          - secondQuarter: 6218
-          - thirdQuarter: 7792
-          - fourthQuarter: 6304
+            secondQuarter: 6218
+            thirdQuarter: 7792
+            fourthQuarter: 6304
       - area: 江苏
         quarterArr:
           - firstQuarter: 8911
-          - secondQuarter: 12066
-          - thirdQuarter: 12907
-          - fourthQuarter: 10532
+            secondQuarter: 12066
+            thirdQuarter: 12907
+            fourthQuarter: 10532
       - area: 湖北
         quarterArr:
           - firstQuarter: 15318
-          - secondQuarter: 23237
-          - thirdQuarter: 25002
-          - fourthQuarter: 27866
+            secondQuarter: 23237
+            thirdQuarter: 25002
+            fourthQuarter: 27866
       - area: 山东
         quarterArr:
           - firstQuarter: 22094
-          - secondQuarter: 51520
-          - thirdQuarter: 36310
-          - fourthQuarter: 40360
+            secondQuarter: 51520
+            thirdQuarter: 36310
+            fourthQuarter: 40360
       - area: 河北
         quarterArr:
           - firstQuarter: 5923
-          - secondQuarter: 8513
-          - thirdQuarter: 7514
-          - fourthQuarter: 7097
+            secondQuarter: 8513
+            thirdQuarter: 7514
+            fourthQuarter: 7097
       - area: 四川
         quarterArr:
           - firstQuarter: 8246
-          - secondQuarter: 14750
-          - thirdQuarter: 15428
-          - fourthQuarter: 13677
+            secondQuarter: 14750
+            thirdQuarter: 15428
+            fourthQuarter: 13677
       - area: 陕西
         quarterArr:
           - firstQuarter: 4375
-          - secondQuarter: 7868
-          - thirdQuarter: 8601
-          - fourthQuarter: 8258
+            secondQuarter: 7868
+            thirdQuarter: 8601
+            fourthQuarter: 8258
     industry: 行政办公
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 1137
-          - secondQuarter: 1457
-          - thirdQuarter: 1334
-          - fourthQuarter: 1158
+            secondQuarter: 1457
+            thirdQuarter: 1334
+            fourthQuarter: 1158
       - area: 河南
         quarterArr:
           - firstQuarter: 347
-          - secondQuarter: 461
-          - thirdQuarter: 574
-          - fourthQuarter: 431
+            secondQuarter: 461
+            thirdQuarter: 574
+            fourthQuarter: 431
       - area: 北京
         quarterArr:
           - firstQuarter: 527
-          - secondQuarter: 809
-          - thirdQuarter: 956
-          - fourthQuarter: 801
+            secondQuarter: 809
+            thirdQuarter: 956
+            fourthQuarter: 801
       - area: 江苏
         quarterArr:
           - firstQuarter: 853
-          - secondQuarter: 1150
-          - thirdQuarter: 1236
-          - fourthQuarter: 964
+            secondQuarter: 1150
+            thirdQuarter: 1236
+            fourthQuarter: 964
       - area: 湖北
         quarterArr:
           - firstQuarter: 459
-          - secondQuarter: 586
-          - thirdQuarter: 652
-          - fourthQuarter: 547
+            secondQuarter: 586
+            thirdQuarter: 652
+            fourthQuarter: 547
       - area: 山东
         quarterArr:
           - firstQuarter: 648
-          - secondQuarter: 1142
-          - thirdQuarter: 1125
-          - fourthQuarter: 1102
+            secondQuarter: 1142
+            thirdQuarter: 1125
+            fourthQuarter: 1102
       - area: 河北
         quarterArr:
           - firstQuarter: 308
-          - secondQuarter: 422
-          - thirdQuarter: 407
-          - fourthQuarter: 329
+            secondQuarter: 422
+            thirdQuarter: 407
+            fourthQuarter: 329
       - area: 四川
         quarterArr:
           - firstQuarter: 433
-          - secondQuarter: 698
-          - thirdQuarter: 692
-          - fourthQuarter: 593
+            secondQuarter: 698
+            thirdQuarter: 692
+            fourthQuarter: 593
       - area: 陕西
         quarterArr:
           - firstQuarter: 252
-          - secondQuarter: 375
-          - thirdQuarter: 516
-          - fourthQuarter: 438
+            secondQuarter: 375
+            thirdQuarter: 516
+            fourthQuarter: 438
     industry: 弱电安防
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 77910
-          - secondQuarter: 102403
-          - thirdQuarter: 100886
-          - fourthQuarter: 76437
+            secondQuarter: 102403
+            thirdQuarter: 100886
+            fourthQuarter: 76437
       - area: 河南
         quarterArr:
           - firstQuarter: 15269
-          - secondQuarter: 20334
-          - thirdQuarter: 21529
-          - fourthQuarter: 16354
+            secondQuarter: 20334
+            thirdQuarter: 21529
+            fourthQuarter: 16354
       - area: 北京
         quarterArr:
           - firstQuarter: 10557
-          - secondQuarter: 20155
-          - thirdQuarter: 28390
-          - fourthQuarter: 17564
+            secondQuarter: 20155
+            thirdQuarter: 28390
+            fourthQuarter: 17564
       - area: 江苏
         quarterArr:
           - firstQuarter: 28858
-          - secondQuarter: 37495
-          - thirdQuarter: 37819
-          - fourthQuarter: 30337
+            secondQuarter: 37495
+            thirdQuarter: 37819
+            fourthQuarter: 30337
       - area: 湖北
         quarterArr:
           - firstQuarter: 20369
-          - secondQuarter: 27262
-          - thirdQuarter: 29323
-          - fourthQuarter: 21413
+            secondQuarter: 27262
+            thirdQuarter: 29323
+            fourthQuarter: 21413
       - area: 山东
         quarterArr:
           - firstQuarter: 31881
-          - secondQuarter: 41197
-          - thirdQuarter: 34228
-          - fourthQuarter: 26156
+            secondQuarter: 41197
+            thirdQuarter: 34228
+            fourthQuarter: 26156
       - area: 河北
         quarterArr:
           - firstQuarter: 66598
-          - secondQuarter: 42512
-          - thirdQuarter: 22753
-          - fourthQuarter: 15983
+            secondQuarter: 42512
+            thirdQuarter: 22753
+            fourthQuarter: 15983
       - area: 四川
         quarterArr:
           - firstQuarter: 21925
-          - secondQuarter: 29653
-          - thirdQuarter: 30201
-          - fourthQuarter: 22670
+            secondQuarter: 29653
+            thirdQuarter: 30201
+            fourthQuarter: 22670
       - area: 陕西
         quarterArr:
           - firstQuarter: 10028
-          - secondQuarter: 15798
-          - thirdQuarter: 20436
-          - fourthQuarter: 15296
+            secondQuarter: 15798
+            thirdQuarter: 20436
+            fourthQuarter: 15296
     industry: 建筑工程
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 10680
-          - secondQuarter: 13009
-          - thirdQuarter: 12454
-          - fourthQuarter: 9943
+            secondQuarter: 13009
+            thirdQuarter: 12454
+            fourthQuarter: 9943
       - area: 河南
         quarterArr:
           - firstQuarter: 3632
-          - secondQuarter: 4388
-          - thirdQuarter: 4342
-          - fourthQuarter: 3331
+            secondQuarter: 4388
+            thirdQuarter: 4342
+            fourthQuarter: 3331
       - area: 北京
         quarterArr:
           - firstQuarter: 3443
-          - secondQuarter: 5079
-          - thirdQuarter: 5804
-          - fourthQuarter: 4468
+            secondQuarter: 5079
+            thirdQuarter: 5804
+            fourthQuarter: 4468
       - area: 江苏
         quarterArr:
           - firstQuarter: 7049
-          - secondQuarter: 8339
-          - thirdQuarter: 7610
-          - fourthQuarter: 6650
+            secondQuarter: 8339
+            thirdQuarter: 7610
+            fourthQuarter: 6650
       - area: 湖北
         quarterArr:
           - firstQuarter: 5261
-          - secondQuarter: 6425
-          - thirdQuarter: 6259
-          - fourthQuarter: 4801
+            secondQuarter: 6425
+            thirdQuarter: 6259
+            fourthQuarter: 4801
       - area: 山东
         quarterArr:
           - firstQuarter: 5960
-          - secondQuarter: 8703
-          - thirdQuarter: 8462
-          - fourthQuarter: 7197
+            secondQuarter: 8703
+            thirdQuarter: 8462
+            fourthQuarter: 7197
       - area: 河北
         quarterArr:
           - firstQuarter: 11906
-          - secondQuarter: 8907
-          - thirdQuarter: 5471
-          - fourthQuarter: 3921
+            secondQuarter: 8907
+            thirdQuarter: 5471
+            fourthQuarter: 3921
       - area: 四川
         quarterArr:
           - firstQuarter: 4600
-          - secondQuarter: 6305
-          - thirdQuarter: 6138
-          - fourthQuarter: 4879
+            secondQuarter: 6305
+            thirdQuarter: 6138
+            fourthQuarter: 4879
       - area: 陕西
         quarterArr:
           - firstQuarter: 2638
-          - secondQuarter: 3685
-          - thirdQuarter: 4174
-          - fourthQuarter: 3203
+            secondQuarter: 3685
+            thirdQuarter: 4174
+            fourthQuarter: 3203
     industry: 水利水电
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 6165
-          - secondQuarter: 7124
-          - thirdQuarter: 6342
-          - fourthQuarter: 5190
+            secondQuarter: 7124
+            thirdQuarter: 6342
+            fourthQuarter: 5190
       - area: 河南
         quarterArr:
           - firstQuarter: 1826
-          - secondQuarter: 2117
-          - thirdQuarter: 2119
-          - fourthQuarter: 1401
+            secondQuarter: 2117
+            thirdQuarter: 2119
+            fourthQuarter: 1401
       - area: 北京
         quarterArr:
           - firstQuarter: 1233
-          - secondQuarter: 1476
-          - thirdQuarter: 1694
-          - fourthQuarter: 1608
+            secondQuarter: 1476
+            thirdQuarter: 1694
+            fourthQuarter: 1608
       - area: 江苏
         quarterArr:
           - firstQuarter: 2582
-          - secondQuarter: 3053
-          - thirdQuarter: 3107
-          - fourthQuarter: 2790
+            secondQuarter: 3053
+            thirdQuarter: 3107
+            fourthQuarter: 2790
       - area: 湖北
         quarterArr:
           - firstQuarter: 1995
-          - secondQuarter: 2394
-          - thirdQuarter: 2238
-          - fourthQuarter: 1879
+            secondQuarter: 2394
+            thirdQuarter: 2238
+            fourthQuarter: 1879
       - area: 山东
         quarterArr:
           - firstQuarter: 2493
-          - secondQuarter: 3384
-          - thirdQuarter: 3346
-          - fourthQuarter: 2966
+            secondQuarter: 3384
+            thirdQuarter: 3346
+            fourthQuarter: 2966
       - area: 河北
         quarterArr:
           - firstQuarter: 2174
-          - secondQuarter: 1955
-          - thirdQuarter: 1886
-          - fourthQuarter: 1459
+            secondQuarter: 1955
+            thirdQuarter: 1886
+            fourthQuarter: 1459
       - area: 四川
         quarterArr:
           - firstQuarter: 2490
-          - secondQuarter: 2686
-          - thirdQuarter: 2871
-          - fourthQuarter: 2782
+            secondQuarter: 2686
+            thirdQuarter: 2871
+            fourthQuarter: 2782
       - area: 陕西
         quarterArr:
           - firstQuarter: 1225
-          - secondQuarter: 1188
-          - thirdQuarter: 1332
-          - fourthQuarter: 1162
+            secondQuarter: 1188
+            thirdQuarter: 1332
+            fourthQuarter: 1162
     industry: 医疗卫生
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 6269
-          - secondQuarter: 8241
-          - thirdQuarter: 7401
-          - fourthQuarter: 6372
+            secondQuarter: 8241
+            thirdQuarter: 7401
+            fourthQuarter: 6372
       - area: 河南
         quarterArr:
           - firstQuarter: 1905
-          - secondQuarter: 2753
-          - thirdQuarter: 2761
-          - fourthQuarter: 2249
+            secondQuarter: 2753
+            thirdQuarter: 2761
+            fourthQuarter: 2249
       - area: 北京
         quarterArr:
           - firstQuarter: 1113
-          - secondQuarter: 1968
-          - thirdQuarter: 2667
-          - fourthQuarter: 2071
+            secondQuarter: 1968
+            thirdQuarter: 2667
+            fourthQuarter: 2071
       - area: 江苏
         quarterArr:
           - firstQuarter: 3034
-          - secondQuarter: 4147
-          - thirdQuarter: 4236
-          - fourthQuarter: 3413
+            secondQuarter: 4147
+            thirdQuarter: 4236
+            fourthQuarter: 3413
       - area: 湖北
         quarterArr:
           - firstQuarter: 2640
-          - secondQuarter: 3669
-          - thirdQuarter: 3808
-          - fourthQuarter: 3258
+            secondQuarter: 3669
+            thirdQuarter: 3808
+            fourthQuarter: 3258
       - area: 山东
         quarterArr:
           - firstQuarter: 51928
-          - secondQuarter: 35797
-          - thirdQuarter: 5690
-          - fourthQuarter: 5180
+            secondQuarter: 35797
+            thirdQuarter: 5690
+            fourthQuarter: 5180
       - area: 河北
         quarterArr:
           - firstQuarter: 5180
-          - secondQuarter: 2670
-          - thirdQuarter: 2101
-          - fourthQuarter: 1693
+            secondQuarter: 2670
+            thirdQuarter: 2101
+            fourthQuarter: 1693
       - area: 四川
         quarterArr:
           - firstQuarter: 2361
-          - secondQuarter: 3202
-          - thirdQuarter: 3077
-          - fourthQuarter: 2689
+            secondQuarter: 3202
+            thirdQuarter: 3077
+            fourthQuarter: 2689
       - area: 陕西
         quarterArr:
           - firstQuarter: 1110
-          - secondQuarter: 1824
-          - thirdQuarter: 2428
-          - fourthQuarter: 1833
+            secondQuarter: 1824
+            thirdQuarter: 2428
+            fourthQuarter: 1833
     industry: 交通工程
   - areaArr:
       - area: 广东
         quarterArr:
           - firstQuarter: 12523
-          - secondQuarter: 13059
-          - thirdQuarter: 11343
-          - fourthQuarter: 9738
+            secondQuarter: 13059
+            thirdQuarter: 11343
+            fourthQuarter: 9738
       - area: 河南
         quarterArr:
           - firstQuarter: 3748
-          - secondQuarter: 4367
-          - thirdQuarter: 4587
-          - fourthQuarter: 4053
+            secondQuarter: 4367
+            thirdQuarter: 4587
+            fourthQuarter: 4053
       - area: 北京
         quarterArr:
           - firstQuarter: 2867
-          - secondQuarter: 4688
-          - thirdQuarter: 5616
-          - fourthQuarter: 3975
+            secondQuarter: 4688
+            thirdQuarter: 5616
+            fourthQuarter: 3975
       - area: 江苏
         quarterArr:
           - firstQuarter: 5994
-          - secondQuarter: 7676
-          - thirdQuarter: 6863
-          - fourthQuarter: 6163
+            secondQuarter: 7676
+            thirdQuarter: 6863
+            fourthQuarter: 6163
       - area: 湖北
         quarterArr:
           - firstQuarter: 6662
-          - secondQuarter: 8626
-          - thirdQuarter: 8208
-          - fourthQuarter: 7651
+            secondQuarter: 8626
+            thirdQuarter: 8208
+            fourthQuarter: 7651
       - area: 山东
         quarterArr:
           - firstQuarter: 41221
-          - secondQuarter: 35429
-          - thirdQuarter: 25850
-          - fourthQuarter: 30742
+            secondQuarter: 35429
+            thirdQuarter: 25850
+            fourthQuarter: 30742
       - area: 河北
         quarterArr:
           - firstQuarter: 5040
-          - secondQuarter: 5394
-          - thirdQuarter: 4712
-          - fourthQuarter: 4005
+            secondQuarter: 5394
+            thirdQuarter: 4712
+            fourthQuarter: 4005
       - area: 四川
         quarterArr:
           - firstQuarter: 6333
-          - secondQuarter: 7427
-          - thirdQuarter: 6764
-          - fourthQuarter: 6057
+            secondQuarter: 7427
+            thirdQuarter: 6764
+            fourthQuarter: 6057
       - area: 陕西
         quarterArr:
           - firstQuarter: 2993
-          - secondQuarter: 4192
-          - thirdQuarter: 4749
-          - fourthQuarter: 3959
+            secondQuarter: 4192
+            thirdQuarter: 4749
+            fourthQuarter: 3959
     industry: 机械设备

src/jfw/config/config.go

@@ -29,24 +29,22 @@ var (
 	Middleground         *middleground.Middleground
 	HotWinnerConfig      HotConfig
 	HotBuyerConfig       HotConfig
-	IndustryTrendConfig  IndustryTrend
+	IndustryTrendConfig  []IndustryTrend
 	IpList               *ipmatch.WhiteIp
 	IpInitLock           sync.RWMutex //锁
 )
 
 type IndustryTrend struct {
-	IndustryArr []struct {
-		AreaArr []struct {
-			Area       string `json:"area"`
-			QuarterArr []struct {
-				FirstQuarter  int `json:"firstQuarter,omitempty"`
-				SecondQuarter int `json:"secondQuarter,omitempty"`
-				ThirdQuarter  int `json:"thirdQuarter,omitempty"`
-				FourthQuarter int `json:"fourthQuarter,omitempty"`
-			} `json:"quarterArr"`
-		} `json:"areaArr"`
-		Industry string `json:"industry"`
-	} `json:"industryArr"`
+	AreaArr []struct {
+		Area       string `json:"area"`
+		QuarterArr []struct {
+			FirstQuarter  int `json:"firstQuarter,omitempty"`
+			SecondQuarter int `json:"secondQuarter,omitempty"`
+			ThirdQuarter  int `json:"thirdQuarter,omitempty"`
+			FourthQuarter int `json:"fourthQuarter,omitempty"`
+		} `json:"quarterArr"`
+	} `json:"areaArr"`
+	Industry string `json:"industry"`
 }
 
 type HotConfig struct {
@@ -65,7 +63,6 @@ func init() {
 	util.ReadConfig(&Sysconfig)
 	util.ReadConfig("./export.json", &ExportConfig)
 	IpInit()
-	util.ReadConfig("./dataService.json", &IndustryTrendConfig)
 	//log.Println("sysconfig:", Sysconfig)
 	WeixinConfig, _ = Sysconfig["wxJianyu"].(map[string]interface{})
 	Wxoauth = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=` + util.ObjToString(WeixinConfig["appid"]) + `&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect`
@@ -87,6 +84,9 @@ func init() {
 	//PC端商机管理配置
 	util.ReadConfig("./entnichePc.json", &EntnichePcConf)
 	var ctx = gctx.New()
+	// 获取配置数据
+	_ = g.Cfg("index").MustGet(ctx, "industryArr").Structs(&IndustryTrendConfig)
+
 	Middleground = middleground.NewMiddleground(g.Cfg().MustGet(ctx, "etcd.hosts").Strings()).
 		RegUserCenter(g.Cfg().MustGet(ctx, "userCenterKey").String()).
 		RegPowerCheckCenter(g.Cfg().MustGet(ctx, "powerCheckCenterKey").String()).

src/jfw/front/dataServiceArea.go

@@ -14,7 +14,7 @@ import (
 )
 
 // HotIndustryAndRegion 热门行业/地区年度招标趋势
-func HomeBiddingTrends() config.IndustryTrend {
+func HomeBiddingTrends() []config.IndustryTrend {
 	return config.IndustryTrendConfig
 }