Browse Source

修改包名

xyxie 1 year ago
parent
commit
1414628b0e

+ 2 - 2
.gitignore

@@ -4,8 +4,8 @@
 /*.DS_Store
 /routers/commentsRouter_controllers.go
 /*.tmp
-/hongze_data_crawler
-/hongze_data_crawler.exe
+/eta_crawler
+/eta_crawler.exe
 /binlog/*.log
 /static/file/*
 .DS_Store

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module hongze/hongze_data_crawler
+module eta/eta_crawler
 
 go 1.16
 

+ 2 - 2
main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	_ "hongze/hongze_data_crawler/routers"
+	_ "eta/eta_crawler/routers"
 
 	"github.com/beego/beego/v2/server/web"
 
-	"hongze/hongze_data_crawler/services"
+	"eta/eta_crawler/services"
 )
 
 func main() {

+ 1 - 1
models/base_from_eia_steo.go

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"eta/eta_crawler/utils"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/shopspring/decimal"
-	"hongze/hongze_data_crawler/utils"
 	"time"
 )
 

+ 1 - 1
models/base_from_national_statistics_index.go

@@ -1,9 +1,9 @@
 package models
 
 import (
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hongze_data_crawler/utils"
 	"strings"
 	"time"
 )

+ 1 - 1
models/db.go

@@ -1,7 +1,7 @@
 package models
 
 import (
-	"hongze/hongze_data_crawler/utils"
+	"eta/eta_crawler/utils"
 	"time"
 
 	_ "github.com/go-sql-driver/mysql"

+ 2 - 2
services/alarm_msg/alarm_msg.go

@@ -2,8 +2,8 @@ package alarm_msg
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/utils"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/utils"
 )
 
 var (
@@ -26,4 +26,4 @@ func SendAlarmMsg(msgBody string, level int) {
 		return
 	}
 	http.Post(AlarmMsgUrl, string(param))
-}
+}

+ 3 - 3
services/com_trade.go

@@ -3,11 +3,11 @@ package services
 import (
 	"context"
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"strconv"
 	"strings"
 	"time"

+ 7 - 7
services/commodity_coal_coastal.go

@@ -1,12 +1,12 @@
 package services
 
 import (
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"strconv"
 	"strings"
 	"time"
@@ -17,7 +17,7 @@ func FileCoalCoastal() {
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromCoalCoastal  Err:" + err.Error())
-			msg := "失败提醒"+"RefreshDataFromCoalCoastal ErrMsg:"+err.Error()
+			msg := "失败提醒" + "RefreshDataFromCoalCoastal ErrMsg:" + err.Error()
 			go alarm_msg.SendAlarmMsg(msg, 3)
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalCoastal ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
@@ -56,7 +56,7 @@ func FileCoalCoastal() {
 	//}
 
 	var xlFile *xlsx.File
-	exist,err := PathExists(path)
+	exist, err := PathExists(path)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -64,10 +64,10 @@ func FileCoalCoastal() {
 	if exist {
 		xlFile, err = xlsx.OpenFile(path)
 		if err != nil {
-			fmt.Println("OpenFile err:",err)
+			fmt.Println("OpenFile err:", err)
 			return
 		}
-	}else {
+	} else {
 		return
 	}
 

+ 17 - 17
services/commodity_coal_firm.go

@@ -1,12 +1,12 @@
 package services
 
 import (
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"os"
 	"strconv"
 	"strings"
@@ -30,9 +30,9 @@ func FileCoalFirm() {
 	dateMonth := int(time.Now().Month())
 	smonth = strconv.Itoa(dateMonth)
 	path := "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月).xlsx"
-	path = fmt.Sprintf(path,nyear,smonth)
+	path = fmt.Sprintf(path, nyear, smonth)
 	path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(2022年10月上旬).xlsx"
-	exist,err := PathExists(path)
+	exist, err := PathExists(path)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -40,8 +40,8 @@ func FileCoalFirm() {
 	fmt.Println(path)
 	if !exist {
 		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月中旬).xlsx"
-		path = fmt.Sprintf(path,nyear,smonth)
-		exist,err = PathExists(path)
+		path = fmt.Sprintf(path, nyear, smonth)
+		exist, err = PathExists(path)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -50,8 +50,8 @@ func FileCoalFirm() {
 	fmt.Println(path)
 	if !exist {
 		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月上旬).xlsx"
-		path = fmt.Sprintf(path,nyear,smonth)
-		exist,err = PathExists(path)
+		path = fmt.Sprintf(path, nyear, smonth)
+		exist, err = PathExists(path)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -63,8 +63,8 @@ func FileCoalFirm() {
 		dateMonth = dateMonth - 1
 		smonth = strconv.Itoa(dateMonth)
 		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月).xlsx"
-		path = fmt.Sprintf(path,nyear,smonth)
-		exist,err = PathExists(path)
+		path = fmt.Sprintf(path, nyear, smonth)
+		exist, err = PathExists(path)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -75,8 +75,8 @@ func FileCoalFirm() {
 		//本月三个文件都没有,去取上一个月的中旬
 		smonth = strconv.Itoa(dateMonth)
 		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月中旬).xlsx"
-		path = fmt.Sprintf(path,nyear,smonth)
-		exist,err = PathExists(path)
+		path = fmt.Sprintf(path, nyear, smonth)
+		exist, err = PathExists(path)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -87,8 +87,8 @@ func FileCoalFirm() {
 		//本月三个文件都没有,去取上一个月的上旬
 		smonth = strconv.Itoa(dateMonth)
 		path = "/home/code/python/coal_mail/emailFile/全国分企业煤炭产量旬度数据(%s年%s月上旬).xlsx"
-		path = fmt.Sprintf(path,nyear,smonth)
-		exist,err = PathExists(path)
+		path = fmt.Sprintf(path, nyear, smonth)
+		exist, err = PathExists(path)
 		if err != nil {
 			fmt.Println(err)
 			return
@@ -100,10 +100,10 @@ func FileCoalFirm() {
 	if exist {
 		xlFile, err = xlsx.OpenFile(path)
 		if err != nil {
-			fmt.Println("OpenFile err:",err)
+			fmt.Println("OpenFile err:", err)
 			return
 		}
-	}else {
+	} else {
 		return
 	}
 

+ 11 - 12
services/commodity_coal_inland.go

@@ -1,12 +1,12 @@
 package services
 
 import (
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"strconv"
 	"time"
 )
@@ -16,7 +16,7 @@ func FileCoalInland() () {
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromCoalInland Err:" + err.Error())
-			msg := "失败提醒"+"RefreshDataFromCoalInland ErrMsg:"+err.Error()
+			msg := "失败提醒" + "RefreshDataFromCoalInland ErrMsg:" + err.Error()
 			go alarm_msg.SendAlarmMsg(msg, 3)
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalInland ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
@@ -59,7 +59,7 @@ func FileCoalInland() () {
 	//	path = "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
 	//}
 	path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-	exist,err := PathExists(path)
+	exist, err := PathExists(path)
 	if err != nil {
 		fmt.Println(err)
 		return
@@ -68,10 +68,10 @@ func FileCoalInland() () {
 	if exist {
 		xlFile, err = xlsx.OpenFile(path)
 		if err != nil {
-			fmt.Println("OpenFile err:",err)
+			fmt.Println("OpenFile err:", err)
 			return
 		}
-	}else {
+	} else {
 		return
 	}
 
@@ -106,11 +106,11 @@ func FileCoalInland() () {
 
 	for _, sheet := range xlFile.Sheets {
 		sheetName = sheet.Name
-		fmt.Println("sheetName:",sheetName)
+		fmt.Println("sheetName:", sheetName)
 		var unit string
 		if sheetName == "可用天数" {
 			unit = "天"
-		}else {
+		} else {
 			unit = "万吨"
 		}
 		//遍历行读取
@@ -173,7 +173,7 @@ func FileCoalInland() () {
 							text := cell.String()
 							t, _ := time.ParseInLocation("01-02-06", text, time.Local)
 							dataTime = t.Format(utils.FormatDate)
-							if len(text) < 6{
+							if len(text) < 6 {
 								dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
 							}
 						}
@@ -202,7 +202,7 @@ func FileCoalInland() () {
 			codeMap[v.IndexName] = v.IndexCode
 			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				for i := 0; i<10; i++ {
+				for i := 0; i < 10; i++ {
 					v.IndexCode = v.IndexCode + strconv.Itoa(i)
 					codeMap[v.IndexName] = v.IndexCode
 					newId, err := models.AddBaseFromCoalmineMapping(v)
@@ -243,4 +243,3 @@ func FileCoalInland() () {
 	}
 	return
 }
-

+ 10 - 12
services/commodity_coal_mine.go

@@ -1,23 +1,23 @@
 package services
 
 import (
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/tealeg/xlsx"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"strconv"
 	"strings"
 	"time"
 )
 
-func FileCoalJsm() () {
+func FileCoalJsm() {
 	var err error
 	defer func() {
 		if err != nil {
 			fmt.Println("RefreshDataFromCoalJsm Err:" + err.Error())
-			msg := "失败提醒"+"RefreshDataFromCoalJsm ErrMsg:"+err.Error()
+			msg := "失败提醒" + "RefreshDataFromCoalJsm ErrMsg:" + err.Error()
 			go alarm_msg.SendAlarmMsg(msg, 3)
 			//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalJsm ErrMsg:"+err.Error(), utils.EmailSendToUsers)
 		}
@@ -26,7 +26,7 @@ func FileCoalJsm() () {
 	var exist bool
 	path := "/home/code/python/coal_mail/emailFile/442家晋陕蒙煤矿周度产量数据-%s.xlsx"
 	for i := 0; i < 10; i++ {
-		npath := fmt.Sprintf(path,time.Now().AddDate(0,0,-i).Format(utils.FormatDateUnSpace))
+		npath := fmt.Sprintf(path, time.Now().AddDate(0, 0, -i).Format(utils.FormatDateUnSpace))
 
 		fmt.Println(npath)
 		exist, err = PathExists(npath)
@@ -45,11 +45,10 @@ func FileCoalJsm() () {
 		if err != nil {
 			return
 		}
-	}else {
+	} else {
 		return
 	}
 
-
 	var province string
 	var description string
 	var exchange string
@@ -164,7 +163,6 @@ func FileCoalJsm() () {
 
 							item.IndexName = province + exchange
 
-
 							item.CreateTime = time.Now()
 							items = append(items, item)
 							break Loop2
@@ -201,9 +199,9 @@ func FileCoalJsm() () {
 						item.Description = description
 						item.Province = province
 						item.Source = "三省周度"
-						if exchange == "产量"{
+						if exchange == "产量" {
 							item.Unit = "万吨"
-						}else {
+						} else {
 							item.Unit = "百分比"
 						}
 						item.Frequency = "周度"
@@ -332,7 +330,7 @@ func FileCoalJsm() () {
 			codeCompanyMap[v.IndexName] = v.IndexCode
 			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				for i := 0; i<10; i++ {
+				for i := 0; i < 10; i++ {
 					v.IndexCode = v.IndexCode + strconv.Itoa(i)
 					codeCompanyMap[v.IndexName] = v.IndexCode
 					newId, err := models.AddBaseFromCoalmineMapping(v)

+ 3 - 3
services/commodity_trade_cffex.go

@@ -2,11 +2,11 @@ package services
 
 import (
 	"encoding/xml"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/utils"
 	"strings"
 	"time"
 )
@@ -40,7 +40,7 @@ func cffexIndexCodeGenerator(shortName, indexName, contractCode, suffix string)
 	strResult := ""
 	a := pinyin.NewArgs()
 	rows := pinyin.LazyPinyin(shortName, a)
-	for i:=0;i<len(rows);i++{
+	for i := 0; i < len(rows); i++ {
 		strResult += rows[i]
 	}
 	cffexIndexCode, _ := cffexIndexCodeMap[indexName]

+ 12 - 12
services/commodity_trade_dalian.go

@@ -2,12 +2,12 @@ package services
 
 import (
 	"bytes"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
 	"github.com/mozillazg/go-pinyin"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"io/ioutil"
 	"log"
 	"mime/multipart"
@@ -28,7 +28,7 @@ type SearchContractId struct {
 	ContractId string `description:"商品类型"`
 }
 
-//同步 N天 之内的数据
+// 同步 N天 之内的数据
 func SyncRankingFromDalianDo() {
 
 	for i := 7; i >= 0; i-- {
@@ -36,7 +36,7 @@ func SyncRankingFromDalianDo() {
 	}
 }
 
-//大连交易所持单排名
+// 大连交易所持单排名
 func SyncRankingFromDalianSearch(dayNum int) (err error) {
 	fmt.Println("start")
 	n := utils.GetRandInt(10, 120)
@@ -138,7 +138,7 @@ func SyncRankingFromDalianSearch(dayNum int) (err error) {
 	return err
 }
 
-//处理搜索条件初始
+// 处理搜索条件初始
 func DoSearch(body string) (exitProductMaps, exitContractIdMaps, varietyArrMaps map[int]string) {
 	var str string
 	str = body
@@ -203,7 +203,7 @@ func DoSearch(body string) (exitProductMaps, exitContractIdMaps, varietyArrMaps
 	return
 }
 
-//处理搜索条件
+// 处理搜索条件
 func DoSearchMap(body string) (items []*SearchContractId) {
 	var str string
 	str = body
@@ -238,7 +238,7 @@ func DoSearchMap(body string) (items []*SearchContractId) {
 	return items
 }
 
-//处理解析Html
+// 处理解析Html
 func DoHtml(body, name, contractId string, dateTime time.Time, listDataMap map[string]int, listIndexCodeMap map[string]string, listDataMapVal map[string]int) (err error) {
 	defer func() {
 		if err != nil {
@@ -422,7 +422,7 @@ func GetIndexCodeGeneratorPinYing(shortName, indexName, contractCode, suffix, ex
 	return indexCode
 }
 
-//大连交易所持单排名
+// 大连交易所持单排名
 func GetDalianHtmlBody(dayNum int, contractId, carietyCode, varietyName string) (body string, err error) {
 	defer func() {
 		if err != nil {
@@ -491,7 +491,7 @@ func GetDalianHtmlBody(dayNum int, contractId, carietyCode, varietyName string)
 	defer res.Body.Close()
 	htmlBody, err := ioutil.ReadAll(res.Body)
 	if err != nil {
-		msg := "失败提醒"+ "GetDalianHtmlBody ErrMsg:"+err.Error()+"获取指标失败:"+currDate+varietyName+contractId
+		msg := "失败提醒" + "GetDalianHtmlBody ErrMsg:" + err.Error() + "获取指标失败:" + currDate + varietyName + contractId
 		go alarm_msg.SendAlarmMsg(msg, 3)
 		//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetDalianHtmlBody ErrMsg:"+err.Error()+"获取指标失败:"+currDate+varietyName+contractId, utils.EmailSendToUsers)
 		return
@@ -500,7 +500,7 @@ func GetDalianHtmlBody(dayNum int, contractId, carietyCode, varietyName string)
 	return
 }
 
-//大连交易所持单排名
+// 大连交易所持单排名
 func SyncRankingFromDalian(dayNum int, searchList []*SearchList) (err error) {
 	fmt.Println("start")
 	defer func() {
@@ -586,7 +586,7 @@ func SyncRankingFromDalian(dayNum int, searchList []*SearchList) (err error) {
 			defer res.Body.Close()
 			body, err := ioutil.ReadAll(res.Body)
 			if err != nil {
-				msg := "失败提醒"+ "RefreshDataFromDalian ErrMsg:"+err.Error()+"获取指标失败:"+currDate+v.VarietyName+v2.ContractId
+				msg := "失败提醒" + "RefreshDataFromDalian ErrMsg:" + err.Error() + "获取指标失败:" + currDate + v.VarietyName + v2.ContractId
 				go alarm_msg.SendAlarmMsg(msg, 3)
 				//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromDalian ErrMsg:"+err.Error()+"获取指标失败:"+currDate+v.VarietyName+v2.ContractId, utils.EmailSendToUsers)
 				return err

+ 3 - 3
services/commodity_trade_ine.go

@@ -2,11 +2,11 @@ package services
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/utils"
 	"strings"
 	"time"
 )
@@ -52,7 +52,7 @@ func IneIndexCodeGenerator(shortName, indexName, contractCode, suffix string) st
 		//取公司全拼
 		a := pinyin.NewArgs()
 		rows := pinyin.LazyPinyin(shortName, a)
-		for i:=0;i<len(rows);i++{
+		for i := 0; i < len(rows); i++ {
 			strResult += rows[i]
 		}
 	} else {

+ 3 - 3
services/commodity_trade_shanghai.go

@@ -2,11 +2,11 @@ package services
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/utils"
 	"strings"
 	"time"
 )
@@ -52,7 +52,7 @@ func shIndexCodeGenerator(shortName, indexName, contractCode, suffix string) str
 		//取公司全拼
 		a := pinyin.NewArgs()
 		rows := pinyin.LazyPinyin(shortName, a)
-		for i:=0;i<len(rows);i++{
+		for i := 0; i < len(rows); i++ {
 			strResult += rows[i]
 		}
 	} else {

+ 7 - 7
services/commodity_trade_zhengzhou.go

@@ -1,10 +1,10 @@
 package services
 
 import (
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/mozillazg/go-pinyin"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/utils"
 	"log"
 	"strconv"
 	"strings"
@@ -18,7 +18,7 @@ var zIndexCodeMap = make(map[string]string)
 var zActionCodeMap = make(map[string]map[string]int)
 
 func zIndexCodeGenerator(shortName, indexName, contractCode, suffix string) string {
-	if shortName == "" || shortName == "-"{
+	if shortName == "" || shortName == "-" {
 		return ""
 	}
 	strResult := ""
@@ -26,7 +26,7 @@ func zIndexCodeGenerator(shortName, indexName, contractCode, suffix string) stri
 		//取公司全拼
 		a := pinyin.NewArgs()
 		rows := pinyin.LazyPinyin(shortName, a)
-		for i:=0;i<len(rows);i++{
+		for i := 0; i < len(rows); i++ {
 			strResult += rows[i]
 		}
 	} else {
@@ -48,9 +48,9 @@ func zIndexCodeGenerator(shortName, indexName, contractCode, suffix string) stri
 	return zIndexCode
 }
 
-//郑州商品交易所持单排名
+// 郑州商品交易所持单排名
 func SyncRankingFromZhengzhou() {
-	utils.FileLog.Info("SyncRankingFromZhengzhou start:"+time.Now().Format(utils.FormatDateTime))
+	utils.FileLog.Info("SyncRankingFromZhengzhou start:" + time.Now().Format(utils.FormatDateTime))
 	n := utils.GetRandInt(10, 120)
 	time.Sleep(time.Duration(n) * time.Second)
 	fmt.Println("start")
@@ -308,5 +308,5 @@ func SyncRankingFromZhengzhou() {
 		})
 	}
 	fmt.Println("end")
-	utils.FileLog.Info("SyncRankingFromZhengzhou end:"+time.Now().Format(utils.FormatDateTime))
+	utils.FileLog.Info("SyncRankingFromZhengzhou end:" + time.Now().Format(utils.FormatDateTime))
 }

+ 1 - 1
services/eia_steo.go

@@ -3,9 +3,9 @@ package services
 import (
 	"context"
 	"encoding/json"
+	"eta/eta_crawler/models"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
 	"reflect"
 	"strconv"
 	"time"

+ 3 - 3
services/national_data/classify.go

@@ -2,10 +2,10 @@ package national_data
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"net/url"
 	"time"
 )

+ 1 - 1
services/national_data/common.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"crypto/tls"
 	"encoding/json"
+	"eta/eta_crawler/utils"
 	"fmt"
-	"hongze/hongze_data_crawler/utils"
 	"io"
 	"io/ioutil"
 	"net/http"

+ 3 - 3
services/national_data/national_data.go

@@ -3,10 +3,10 @@ package national_data
 import (
 	"context"
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"strings"
 	"time"
 )

+ 3 - 3
services/source_changes_visitors_covid.go

@@ -4,13 +4,13 @@ import (
 	"context"
 	"encoding/csv"
 	"errors"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/services/alarm_msg"
+	"eta/eta_crawler/utils"
 	"fmt"
 	"github.com/chromedp/cdproto/browser"
 	"github.com/chromedp/chromedp"
 	"github.com/shopspring/decimal"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/services/alarm_msg"
-	"hongze/hongze_data_crawler/utils"
 	"io"
 	"os"
 	"path/filepath"

+ 1 - 1
services/sso_eic.go

@@ -2,9 +2,9 @@ package services
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/models"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hongze_data_crawler/models"
 	"strconv"
 	"time"
 )

+ 13 - 13
services/sso_eic_v2.go

@@ -2,9 +2,9 @@ package services
 
 import (
 	"encoding/json"
+	"eta/eta_crawler/models"
+	"eta/eta_crawler/utils"
 	"fmt"
-	"hongze/hongze_data_crawler/models"
-	"hongze/hongze_data_crawler/utils"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -12,8 +12,8 @@ import (
 )
 
 type EicData struct {
-	LastPage int     `json:"last_page"`
-	Total    int     `json:"total"`
+	LastPage int        `json:"last_page"`
+	Total    int        `json:"total"`
 	DataSet  string     `json:"dataset"`
 	GasDay   string     `json:"gas_day"`
 	Data     []Children `json:"data"`
@@ -65,7 +65,7 @@ func SyncStorageFromEicV2() {
 	for _, item := range allCode {
 		eicIndexCodeMapV2[item.IndexName] = item.IndexCode
 	}
-	for i :=10; i >= 0; i-- {
+	for i := 10; i >= 0; i-- {
 		baseUrl := "https://agsi.gie.eu/api?date=%s"
 		//t, _ := time.Parse(utils.FormatDate, "2022-08-15")
 		//st := t.AddDate(0, 0, i).Format(utils.FormatDate)
@@ -169,13 +169,13 @@ func SyncStorageFromEicV2() {
 
 			if existIndex, ok := existIndexMap[continentItem.GasDayStart+continentItem.EicCode]; !ok {
 				//新增
-				if continentItem.Status != "N"{
+				if continentItem.Status != "N" {
 					insertItems = append(insertItems, &continentItem)
 					existIndexMap[continentItem.GasDayStart+continentItem.EicCode] = &continentItem
 				}
 			} else if existIndex != nil && itemVerifyCode != (existIndex.GasInStorage+existIndex.Full+existIndex.Trend+existIndex.Injection+existIndex.Withdrawal) {
 				//更新
-				if continentItem.Status != "N"{
+				if continentItem.Status != "N" {
 					err := models.ModifyBaseFromEicIndexV2(continentItem.GasInStorage, continentItem.Full, continentItem.Trend, continentItem.Injection, continentItem.Withdrawal, existIndex.BaseFromEicIndexId)
 					if err != nil {
 						fmt.Println("data update err:", err)
@@ -251,13 +251,13 @@ func SyncStorageFromEicV2() {
 
 				if existIndex, ok := existIndexMap[countryItem.GasDayStart+countryItem.EicCode]; !ok {
 					//新增
-					if countryItem.Status != "N"{
+					if countryItem.Status != "N" {
 						insertItems = append(insertItems, &countryItem)
 						existIndexMap[countryItem.GasDayStart+countryItem.EicCode] = &countryItem
 					}
 				} else if existIndex != nil && itemVerifyCode != (existIndex.GasInStorage+existIndex.Full+existIndex.Trend+existIndex.Injection+existIndex.Withdrawal) {
 					//更新
-					if countryItem.Status != "N"{
+					if countryItem.Status != "N" {
 						err := models.ModifyBaseFromEicIndexV2(countryItem.GasInStorage, countryItem.Full, countryItem.Trend, countryItem.Injection, countryItem.Withdrawal, existIndex.BaseFromEicIndexId)
 						if err != nil {
 							fmt.Println("data update err:", err)
@@ -334,13 +334,13 @@ func SyncStorageFromEicV2() {
 
 					if existIndex, ok := existIndexMap[ssoItem.GasDayStart+ssoItem.EicCode]; !ok {
 						//新增
-						if ssoItem.Status != "N"{
+						if ssoItem.Status != "N" {
 							insertItems = append(insertItems, &ssoItem)
 							existIndexMap[ssoItem.GasDayStart+ssoItem.EicCode] = &ssoItem
 						}
 					} else if existIndex != nil && itemVerifyCode != (existIndex.GasInStorage+existIndex.Full+existIndex.Trend+existIndex.Injection+existIndex.Withdrawal) {
 						//更新
-						if ssoItem.Status != "N"{
+						if ssoItem.Status != "N" {
 							err := models.ModifyBaseFromEicIndexV2(ssoItem.GasInStorage, ssoItem.Full, ssoItem.Trend, ssoItem.Injection, ssoItem.Withdrawal, existIndex.BaseFromEicIndexId)
 							if err != nil {
 								fmt.Println("data update err:", err)
@@ -417,13 +417,13 @@ func SyncStorageFromEicV2() {
 
 						if existIndex, ok := existIndexMap[facItem.GasDayStart+facItem.EicCode]; !ok {
 							//新增
-							if facItem.Status != "N"{
+							if facItem.Status != "N" {
 								insertItems = append(insertItems, &facItem)
 								existIndexMap[facItem.GasDayStart+facItem.EicCode] = &facItem
 							}
 						} else if existIndex != nil && itemVerifyCode != (existIndex.GasInStorage+existIndex.Full+existIndex.Trend+existIndex.Injection+existIndex.Withdrawal) {
 							//更新
-							if facItem.Status != "N"{
+							if facItem.Status != "N" {
 								err := models.ModifyBaseFromEicIndexV2(facItem.GasInStorage, facItem.Full, facItem.Trend, facItem.Injection, facItem.Withdrawal, existIndex.BaseFromEicIndexId)
 								if err != nil {
 									fmt.Println("data update err:", err)

+ 22 - 0
utils/common.go

@@ -16,6 +16,7 @@ import (
 	"math"
 	"math/big"
 	"math/rand"
+	"net"
 	"net/http"
 	"os"
 	"os/exec"
@@ -964,3 +965,24 @@ func RangeRand(min, max int64) int64 {
 		return min + result.Int64()
 	}
 }
+
+func GetLocalIP() (ip string, err error) {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return
+	}
+	for _, addr := range addrs {
+		ipAddr, ok := addr.(*net.IPNet)
+		if !ok {
+			continue
+		}
+		if ipAddr.IP.IsLoopback() {
+			continue
+		}
+		if !ipAddr.IP.IsGlobalUnicast() {
+			continue
+		}
+		return ipAddr.IP.String(), nil
+	}
+	return
+}

+ 9 - 4
utils/config.go

@@ -10,7 +10,6 @@ var (
 	RunMode        string //运行模式
 	MYSQL_URL      string //数据库连接
 	MYSQL_URL_DATA string
-
 )
 
 func init() {
@@ -20,9 +19,15 @@ func init() {
 	}
 	RunMode = tmpRunMode
 	if RunMode == "" {
-		RunMode = "release"
-		configPath := `/home/code/config/hongze_data_crawler/conf/app.conf`
-		err := web.LoadAppConfig("ini", configPath)
+		localIp, err := GetLocalIP()
+		fmt.Println("localIp:", localIp)
+		if localIp == "10.0.0.123" {
+			RunMode = "debug"
+		} else {
+			RunMode = "release"
+		}
+		configPath := `/home/code/config/eta_crawler/conf/app.conf`
+		err = web.LoadAppConfig("ini", configPath)
 		if err != nil {
 			fmt.Println("web.LoadAppConfig Err:" + err.Error())
 		}

+ 1 - 1
utils/logs.go

@@ -11,7 +11,7 @@ var Binlog *logs.BeeLogger
 
 func init() {
 	FileLog = logs.NewLogger(1000000)
-	FileLog.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/hongze_data_crawler.log"}`)
+	FileLog.SetLogger(logs.AdapterFile, `{"filename":"./rdlucklog/eta_crawler.log"}`)
 	FileLog.EnableFuncCallDepth(true)
 
 	//初始化binlog日志