Merge branch 'master' of https://code.fnuoos.com/EggPlanet/egg_admin

app/task/svc/svc_egg_energy_deal_fund_data.go

@@ -19,11 +19,18 @@ func EggEnergyDealFundData(eg *xorm.Engine) {
 	fmt.Println("egg_energy_deal_fund_data...")
 	defer func() {
 		if err := recover(); err != nil {
-			fmt.Println(err)
+			fmt.Println("DealFundDataGetRabbitChannel_ERR:::::", err)
 			return
 		}
 	}()
 
+	ch, err := rabbit.Cfg.Pool.GetChannel()
+	if err != nil {
+		fmt.Println("DealFundDataGetRabbitChannel_ERR:::::", err.Error())
+		return
+	}
+	defer ch.Release()
+
 	// 悲观锁防止串行
 	getString, _ := cache.GetString(EggEnergyDealFundDataKey)
 	if getString != "" {
@@ -41,13 +48,6 @@ func EggEnergyDealFundData(eg *xorm.Engine) {
 		return
 	}
 
-	ch, err := rabbit.Cfg.Pool.GetChannel()
-	if err != nil {
-		fmt.Println("DealFundDataGetRabbitChannel_ERR:::::", err.Error())
-		return
-	}
-	defer ch.Release()
-
 	now := time.Now()
 	fundDataRecordsDb := implement.NewEggEnergyFundDataRecordsDb(eg)
 	for _, data := range fundDataList {

app/task/svc/svc_egg_energy_deal_platform_revenue_data.go

@@ -19,11 +19,18 @@ func EggEnergyDealPlatformRevenueData(eg *xorm.Engine) {
 	fmt.Println("egg_energy_deal_platform_revenue_data...")
 	defer func() {
 		if err := recover(); err != nil {
-			fmt.Println(err)
+			fmt.Println("EggEnergyDealPlatformRevenueDataGetRabbitChannel_ERR:::::", err)
 			return
 		}
 	}()
 
+	ch, err := rabbit.Cfg.Pool.GetChannel()
+	if err != nil {
+		fmt.Println("EggEnergyDealPlatformRevenueDataGetRabbitChannel_ERR:::::", err.Error())
+		return
+	}
+	defer ch.Release()
+
 	// 悲观锁防止串行
 	getString, _ := cache.GetString(EggEnergyDealPlatformRevenueDataKey)
 	if getString != "" {
@@ -41,13 +48,6 @@ func EggEnergyDealPlatformRevenueData(eg *xorm.Engine) {
 		return
 	}
 
-	ch, err := rabbit.Cfg.Pool.GetChannel()
-	if err != nil {
-		fmt.Println("EggEnergyDealPlatformRevenueDataGetRabbitChannel_ERR:::::", err.Error())
-		return
-	}
-	defer ch.Release()
-
 	now := time.Now()
 	recordsDb := implement.NewPlatformRevenueDataRecordsDb(eg)
 	for _, data := range platformRevenueDataList {