瀏覽代碼

fix:签名方式变更

Roc 1 年之前
父節點
當前提交
312bb84045

+ 25 - 9
go.mod

@@ -1,21 +1,37 @@
 module hongze/hongze_task_trial
 
-go 1.16
+go 1.19
 
 require (
-	github.com/PuerkitoBio/goquery v1.8.0
-	github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 // indirect
-	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/beego/beego/v2 v2.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/rdlucklib/rdluck_tools v1.0.2
-	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1
-	github.com/tealeg/xlsx v1.0.5
-	github.com/wenzhenxi/gorsa v0.0.0-20210524035706-528c7050d703
 	github.com/yidane/formula v0.0.0-20210902154546-0782e1736717
-	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )
+
+require (
+	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mitchellh/mapstructure v1.4.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.26.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
+	golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 // indirect
+	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)

+ 0 - 17
go.sum

@@ -3,8 +3,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Knetic/govaluate v3.0.0+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U=
-github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
@@ -16,10 +14,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
-github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible h1:ht2+VfbXtNLGhCsnTMc6/N26nSTBK6qdhktjYyjJQkk=
-github.com/aliyun/aliyun-oss-go-sdk v2.2.0+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
-github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
-github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02 h1:o2oaBQGTzO+xNh12e7xWkphNe7H2DTiWv1ml9a2P9PQ=
 github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211218165449-dd623ecc2f02/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
@@ -33,8 +27,6 @@ github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
-github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
 github.com/beego/beego/v2 v2.0.2 h1:Mx2MWMHJN1oFBHewHWyIhR25tXB9IPceIK8X7OuMdZM=
 github.com/beego/beego/v2 v2.0.2/go.mod h1:4pxstbxq+2qE8IUzFsVK8X9BsqfRjbp7ohbapTrTLho=
 github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
@@ -334,8 +326,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
@@ -369,15 +359,11 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v0.0.0-20160425020131-cfa635847112/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
 github.com/syndtr/goleveldb v0.0.0-20181127023241-353a9fca669c/go.mod h1:Z4AUp2Km+PwemOoO/VB5AOx9XSsIItzFjoJlOSiYmn0=
-github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
-github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
-github.com/wenzhenxi/gorsa v0.0.0-20210524035706-528c7050d703 h1:Tiqr9EWpYopXZf668mgTNWguzE6ssRIEviULO3gSWnU=
-github.com/wenzhenxi/gorsa v0.0.0-20210524035706-528c7050d703/go.mod h1:nfhBTKji6rC8lrjyikx8NJ85JHg6ZQam0a9Je+2RVOg=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yidane/formula v0.0.0-20210902154546-0782e1736717 h1:9CTJJpdISGxMAELfVlprj5kZEsJEaNAWiobv8ZAd72U=
 github.com/yidane/formula v0.0.0-20210902154546-0782e1736717/go.mod h1:9/dQiKiN04yPMdgsuFmKGuI2Hdp6OmFV9gSWS1col6g=
@@ -488,7 +474,6 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -501,8 +486,6 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M=
-golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

+ 21 - 15
services/alarm_msg/alarm_msg.go

@@ -6,15 +6,17 @@ import (
 	"hongze/hongze_task_trial/utils"
 )
 
-var (
-	AlarmMsgUrl = "http://127.0.0.1:8606/api/alarm/send"
-)
-
-//projectName-项目名称
-//runMode-运行模式
-//msgBody-消息内容
-//level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
+// SendAlarmMsg
+// projectName-项目名称
+// runMode-运行模式
+// msgBody-消息内容
+// level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
 func SendAlarmMsg(msgBody string, level int) {
+	// 未配置
+	if utils.AlarmMsgUrl == `` {
+		return
+	}
+
 	params := make(map[string]interface{})
 	params["ProjectName"] = utils.APPNAME
 	params["RunMode"] = utils.RunMode
@@ -25,16 +27,20 @@ func SendAlarmMsg(msgBody string, level int) {
 		utils.FileLog.Info("SendAlarmMsg json.Marshal Err:" + err.Error())
 		return
 	}
-	http.Post(AlarmMsgUrl, string(param))
+	http.Post(utils.AlarmMsgUrl, string(param))
 }
 
 // SendAlarmMsgWithEmail 指定邮箱通知
-//projectName-项目名称
-//runMode-运行模式
-//msgBody-消息内容
-//email-需要发送的邮箱
-//level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
+// projectName-项目名称
+// runMode-运行模式
+// msgBody-消息内容
+// email-需要发送的邮箱
+// level:消息基本,1:提示消息,2:警告消息,3:严重错误信息,默认为1 提示消息
 func SendAlarmMsgWithEmail(msgBody, email string, level int) {
+	// 未配置
+	if utils.AlarmMsgUrl == `` {
+		return
+	}
 	params := make(map[string]interface{})
 	params["ProjectName"] = utils.APPNAME
 	params["RunMode"] = utils.RunMode
@@ -46,5 +52,5 @@ func SendAlarmMsgWithEmail(msgBody, email string, level int) {
 		utils.FileLog.Info("SendAlarmMsg json.Marshal Err:" + err.Error())
 		return
 	}
-	http.Post(AlarmMsgUrl, string(param))
+	http.Post(utils.AlarmMsgUrl, string(param))
 }

+ 1 - 2
services/changes_visitors_covid.go

@@ -23,8 +23,7 @@ func SyncChangesVisitorsCovid() (err error) {
 	data["Source"] = utils.DATA_SOURCE_GOOGLE_TRAVEL
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 0 - 88
services/data/base_edb_lib.go

@@ -10,54 +10,6 @@ import (
 	"strings"
 )
 
-// 新增指标数据
-func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err error) {
-	param := make(map[string]interface{})
-	param["EdbCode"] = edbCode
-	urlStr := ``
-	switch source {
-	case utils.DATA_SOURCE_THS:
-		urlStr = "ths/add"
-	case utils.DATA_SOURCE_WIND:
-		urlStr = "wind/add"
-	case utils.DATA_SOURCE_PB:
-		urlStr = "pb/add"
-	case utils.DATA_SOURCE_PB_FINANCE:
-		urlStr = "pb_finance/add"
-	case utils.DATA_SOURCE_MANUAL:
-		urlStr = "manual/add"
-	case utils.DATA_SOURCE_LZ:
-		urlStr = "lz/add"
-	case utils.DATA_SOURCE_YS:
-		urlStr = "smm/add"
-	case utils.DATA_SOURCE_GL:
-		urlStr = "mysteel/add"
-	case utils.DATA_SOURCE_ZZ:
-		urlStr = "zz/add"
-	case utils.DATA_SOURCE_DL:
-		urlStr = "dl/add"
-	case utils.DATA_SOURCE_SH:
-		urlStr = "sh/add"
-	case utils.DATA_SOURCE_CFFEX:
-		urlStr = "cffex/add"
-	case utils.DATA_SOURCE_SHFE:
-		urlStr = "shfe/add"
-	case utils.DATA_SOURCE_GIE:
-		urlStr = "gie/add"
-	case utils.DATA_SOURCE_LT:
-		urlStr = "lt/add"
-	case utils.DATA_SOURCE_COAL:
-		urlStr = "coal/add"
-	default:
-	}
-	if urlStr == "" {
-		err = fmt.Errorf("未实现该指标的刷新接口,请联系管理员")
-		return
-	}
-	resp, err = postRefreshEdbData(param, urlStr)
-	return
-}
-
 // RefreshEdbData 刷新指标数据
 func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
@@ -119,34 +71,8 @@ func RefreshPredictEdbCalculateData(edbInfoId int, edbCode, startDate string) (r
 	return
 }
 
-// ExecPythonCode 执行python代码
-func ExecPythonCode(pythonCode string) (resp *models.BaseResponse, err error) {
-	param := make(map[string]interface{})
-	param["PythonCode"] = pythonCode
-	urlStr := `/python/exec`
-	resp, err = postRefreshEdbData(param, urlStr)
-	return
-}
-
-// AddPythonEdbData 新增python指标
-func AddPythonEdbData(param string) (resp *models.BaseResponse, err error) {
-	urlStr := ``
-	urlStr = "python/add"
-	resp, err = postAddEdbData(param, urlStr)
-	return
-}
-
-// EditPythonEdbData 编辑python指标
-func EditPythonEdbData(param string) (resp *models.BaseResponse, err error) {
-	urlStr := ``
-	urlStr = "python/edit"
-	resp, err = postAddEdbData(param, urlStr)
-	return
-}
-
 // postRefreshEdbData 刷新指标数据
 func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
-	utils.EDB_LIB_URL = "http://127.0.0.1:8300/edbapi/"
 	postUrl := utils.EDB_LIB_URL + urlStr
 	postData, err := json.Marshal(param)
 	if err != nil {
@@ -163,20 +89,6 @@ func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *mode
 	return resp, nil
 }
 
-// postAddEdbData 新增指标数据
-func postAddEdbData(paramStr string, urlStr string) (resp *models.BaseResponse, err error) {
-	postUrl := utils.EDB_LIB_URL + urlStr
-	result, err := HttpPost(postUrl, paramStr, "application/json")
-	if err != nil {
-		return
-	}
-	err = json.Unmarshal(result, &resp)
-	if err != nil {
-		return
-	}
-	return resp, nil
-}
-
 func HttpPost(url, postData string, params ...string) ([]byte, error) {
 	body := ioutil.NopCloser(strings.NewReader(postData))
 	client := &http.Client{}

+ 0 - 268
services/data/edb_info.go

@@ -268,279 +268,11 @@ func RefreshDataFromManual(wg *sync.WaitGroup) (err error) {
 	return err
 }
 
-// RefreshDataFromSh 刷新上期所数据
-func RefreshDataFromSh(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromSh Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromSh ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_SH)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromDl 刷新大商所数据
-func RefreshDataFromDl(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromDl Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromDl ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_DL)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromShfe 刷新上期能源数据
-func RefreshDataFromShfe(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromShfe Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromShfe ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_SHFE)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromCffex 刷新中金所数据
-func RefreshDataFromCffex(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromCffex Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromCffex ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_CFFEX)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
-// RefreshDataFromZz 刷新郑商所数据
-func RefreshDataFromZz(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromZz Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromZz ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_ZZ)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-	}
-	return err
-}
-
 func ResetEdbInfoIsUpdate(cont context.Context) (err error) {
 	go data_manage.ResetEdbInfoIsUpdate()
 	return nil
 }
 
-// RefreshDataFromEic 刷欧洲天然气数据
-func RefreshDataFromEic(wg *sync.WaitGroup) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("RefreshDataFromEic Err:" + err.Error())
-			go alarm_msg.SendAlarmMsg("RefreshDataFromEic ErrMsg:"+err.Error(), 3)
-		}
-		wg.Done()
-	}()
-	var condition string
-	var pars []interface{}
-	condition += " AND source=? "
-	pars = append(pars, utils.DATA_SOURCE_GIE)
-	items, err := data_manage.GetEdbInfoByCondition(condition, pars, 0)
-	if err != nil {
-		return errors.New("GetEdbInfoByCondition:" + err.Error())
-	}
-
-	for _, v := range items {
-		startDate := ""
-		if v.Frequency == "日度" {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		} else if v.Frequency == "周度" {
-			startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-		} else if v.Frequency == "月度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "季度" {
-			startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-		} else if v.Frequency == "年度" {
-			startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-		} else {
-			startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-		}
-
-		resp, err := RefreshEdbData(v.EdbInfoId, v.Source, v.EdbCode, startDate)
-		if err != nil {
-			return errors.New("RefreshEdbData Err:" + err.Error())
-		}
-		if resp.Ret != 200 {
-			return errors.New("RefreshEdbData Err:" + resp.Msg + ";ErrMsg:" + resp.ErrMsg)
-		}
-
-	}
-	return err
-}
-
 // RefreshDataFromEic 刷新谷歌出行数据
 func RefreshDataFromGoogleTravel(wg *sync.WaitGroup) (err error) {
 	defer func() {

+ 2 - 4
services/eia_steo.go

@@ -23,8 +23,7 @@ func SyncEiaSteoIndex() (err error) {
 	data["Source"] = utils.DATA_SOURCE_EIA_STEO
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 
@@ -76,10 +75,9 @@ func SyncEiaSteoIndexData() (err error) {
 		data["Source"] = utils.DATA_SOURCE_EIA_STEO
 		data["StartDate"] = startDate
 		data["IndexCode"] = zv.IndexCode
-		bytesData, _ := json.Marshal(data)
 
 		var result string
-		result, err = HttpPost(method, bytesData)
+		result, err = HttpPost(method, data)
 		utils.FileLog.Info(result)
 		fmt.Println(result)
 

+ 115 - 3
services/hz_data_api.go

@@ -2,21 +2,36 @@ package services
 
 import (
 	"bytes"
+	"crypto/md5"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_task_trial/utils"
 	"io/ioutil"
 	"net/http"
+	"reflect"
+	"sort"
+	"strings"
+	"time"
 )
 
 const (
 	HZ_DATA_API = "https://hzdataapi.hzinsights.com/hzdataapi/"
 )
 
-func HttpPost(method string, postData []byte) (result string, err error) {
+func HttpPost(method string, postDataMap map[string]interface{}) (result string, err error) {
+	bytesData, err := handlePostData(postDataMap)
+	if err != nil {
+		return
+	}
+
 	client := &http.Client{}
-	req, err := http.NewRequest("POST", HZ_DATA_API+method, bytes.NewReader(postData))
+	req, err := http.NewRequest("POST", HZ_DATA_API+method, bytes.NewReader(bytesData))
 	if err != nil {
 		return "", err
 	}
-	req.Header.Set("authorization", "252a2d54f9092a385228bd07812dd5d0")
+	req.Header.Set("content-type", "application/json")
 	resp, err := client.Do(req)
 	if err != nil {
 		return "", err
@@ -28,3 +43,100 @@ func HttpPost(method string, postData []byte) (result string, err error) {
 	result = string(body)
 	return
 }
+
+// handlePostData 处理post请求数据
+func handlePostData(postDataMap map[string]interface{}) (bytesData []byte, err error) {
+	postDataMap["nonce_str"] = utils.GetRandString(16) // 随机字符串
+	postDataMap["timestamp"] = time.Now().Unix()       //当前格林威治时间,int64类型
+	postDataMap["appid"] = utils.APPID                 //当前格林威治时间,int64类型
+	// 待签名数据
+	signData := convertParamInterface(postDataMap)
+	sign, err := getSignData(signData)
+	if err != nil {
+		return
+	}
+	postDataMap["sign"] = sign //签名
+
+	bytesData, err = json.Marshal(postDataMap)
+
+	return
+}
+
+// 将请求传入的数据格式转换成签名需要的格式(目前只能处理简单的类型,数组、对象暂不支持)
+func convertParamInterface(params map[string]interface{}) (signData map[string]string) {
+	signData = make(map[string]string)
+	for key := range params {
+		val := ``
+		//fmt.Println("key", key, ";val:", params[key], ";type:", reflect.TypeOf(params[key]))
+		//signData[key] = params[key][0]
+		tmpVal := params[key]
+		switch reflect.TypeOf(tmpVal).Kind() {
+		case reflect.String:
+			val = fmt.Sprint(tmpVal)
+		case reflect.Int, reflect.Int16, reflect.Int64, reflect.Int32, reflect.Int8:
+			val = fmt.Sprint(tmpVal)
+		case reflect.Uint, reflect.Uint32, reflect.Uint16, reflect.Uint8, reflect.Uint64:
+			val = fmt.Sprint(tmpVal)
+		case reflect.Bool:
+			val = fmt.Sprint(tmpVal)
+		case reflect.Float64:
+			decimalNum := decimal.NewFromFloat(tmpVal.(float64))
+			val = decimalNum.String()
+			//val = strconv.FormatFloat(tmpVal.(float64), 'E', -1, 64) //float64
+		case reflect.Float32:
+			decimalNum := decimal.NewFromFloat32(tmpVal.(float32))
+			val = decimalNum.String()
+		}
+		signData[key] = val
+	}
+	return signData
+}
+
+// getSignData 获取参数签名
+func getSignData(postData map[string]string) (sign string, err error) {
+	appid := utils.APPID
+	if appid == "" {
+		err = errors.New("参数异常,缺少appid")
+		return
+	}
+
+	secret := utils.SECRET
+	if secret == "" {
+		err = errors.New("参数异常,缺少secret")
+		return
+	}
+
+	if postData["nonce_str"] == "" {
+		err = errors.New("参数异常,缺少随机字符串")
+		return
+	}
+	if postData["timestamp"] == "" {
+		err = errors.New("参数异常,缺少时间戳")
+		return
+	}
+
+	//先取出除sign外的所有的提交的参数key
+	var keys []string
+	for k := range postData {
+		if k != "sign" {
+			keys = append(keys, k)
+		}
+	}
+
+	//1,根据参数名称的ASCII码表的顺序排序
+	sort.Strings(keys)
+
+	//2 根据排序后的参数名称,取出对应的值,并拼接字符串
+	var signStr string
+	for _, v := range keys {
+		signStr += v + "=" + postData[v] + "&"
+	}
+	//3,全转小写(md5(拼装的字符串后+分配给你的app_secret))
+	//sign := strings.ToLower(fmt.Sprintf("%x", md5.Sum([]byte(strings.Trim(signStr, "&")+key))))
+
+	//md5.Sum([]byte(signStr+"key="+key))  这是md5加密出来后的每个字符的ascall码,需要再转换成对应的字符
+	//3,全转大写(md5(拼装的字符串后+分配给你的app_secret))
+	sign = strings.ToUpper(fmt.Sprintf("%x", md5.Sum([]byte(signStr+"secret="+secret))))
+
+	return
+}

+ 1 - 2
services/trade_cffex.go

@@ -23,8 +23,7 @@ func SyncRankingFromCffex() (err error) {
 	data["Source"] = utils.DATA_SOURCE_CFFEX
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 1 - 2
services/trade_dalian.go

@@ -23,8 +23,7 @@ func SyncRankingFromDalian() (err error) {
 	data["Source"] = utils.DATA_SOURCE_DL
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 1 - 2
services/trade_ine.go

@@ -23,8 +23,7 @@ func SyncRankingFromIne() (err error) {
 	data["Source"] = utils.DATA_SOURCE_SHFE
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 1 - 2
services/trade_shanghai.go

@@ -23,8 +23,7 @@ func SyncRankingFromShanghai() (err error) {
 	data["Source"] = utils.DATA_SOURCE_SH
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 1 - 2
services/trade_zhengzhou.go

@@ -25,8 +25,7 @@ func SyncRankingFromZhengzhou() (err error) {
 	data["Source"] = utils.DATA_SOURCE_ZZ
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
-	bytesData, _ := json.Marshal(data)
-	result, err := HttpPost(method, bytesData)
+	result, err := HttpPost(method, data)
 	utils.FileLog.Info(result)
 	fmt.Println(result)
 

+ 18 - 26
utils/common.go

@@ -21,7 +21,7 @@ import (
 	"time"
 )
 
-//随机数种子
+// 随机数种子
 var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func GetRandString(size int) string {
@@ -58,13 +58,13 @@ func StringsToJSON(str string) string {
 	return jsons
 }
 
-//序列化
+// 序列化
 func ToString(v interface{}) string {
 	data, _ := json.Marshal(v)
 	return string(data)
 }
 
-//md5加密
+// md5加密
 func MD5(data string) string {
 	m := md5.Sum([]byte(data))
 	return hex.EncodeToString(m[:])
@@ -99,7 +99,7 @@ func GetToday(format string) string {
 	return today
 }
 
-//获取今天剩余秒数
+// 获取今天剩余秒数
 func GetTodayLastSecond() time.Duration {
 	today := GetToday(FormatDate) + " 23:59:59"
 	end, _ := time.ParseInLocation(FormatDateTime, today, time.Local)
@@ -121,7 +121,7 @@ func GetBrithDate(idcard string) string {
 	return GetToday(FormatDate)
 }
 
-//处理性别
+// 处理性别
 func WhichSexByIdcard(idcard string) string {
 	var sexs = [2]string{"女", "男"}
 	length := len(idcard)
@@ -135,7 +135,7 @@ func WhichSexByIdcard(idcard string) string {
 	return "男"
 }
 
-//截取小数点后几位
+// 截取小数点后几位
 func SubFloatToString(f float64, m int) string {
 	n := strconv.FormatFloat(f, 'f', -1, 64)
 	if n == "" {
@@ -154,14 +154,14 @@ func SubFloatToString(f float64, m int) string {
 	return newn[0] + "." + newn[1][:m]
 }
 
-//截取小数点后几位
+// 截取小数点后几位
 func SubFloatToFloat(f float64, m int) float64 {
 	newn := SubFloatToString(f, m)
 	newf, _ := strconv.ParseFloat(newn, 64)
 	return newf
 }
 
-//获取相差时间-年
+// 获取相差时间-年
 func GetYearDiffer(start_time, end_time string) int {
 	t1, _ := time.ParseInLocation("2006-01-02", start_time, time.Local)
 	t2, _ := time.ParseInLocation("2006-01-02", end_time, time.Local)
@@ -172,7 +172,7 @@ func GetYearDiffer(start_time, end_time string) int {
 	return age
 }
 
-//获取相差时间-秒
+// 获取相差时间-秒
 func GetSecondDifferByTime(start_time, end_time time.Time) int64 {
 	diff := end_time.Unix() - start_time.Unix()
 	return diff
@@ -199,38 +199,30 @@ func StrListToString(strList []string) (str string) {
 	return ""
 }
 
-//Token
-func GetToken() string {
-	randStr := GetRandString(64)
-	token := MD5(randStr + Md5Key)
-	tokenLen := 64 - len(token)
-	return strings.ToUpper(token + GetRandString(tokenLen))
-}
-
-//数据没有记录
+// 数据没有记录
 func ErrNoRow() string {
 	return "<QuerySeter> no row found"
 }
 
-//校验邮箱格式
+// 校验邮箱格式
 func ValidateEmailFormatat(email string) bool {
 	reg := regexp.MustCompile(RegularEmail)
 	return reg.MatchString(email)
 }
 
-//验证是否是手机号
+// 验证是否是手机号
 func ValidateMobileFormatat(mobileNum string) bool {
 	reg := regexp.MustCompile(RegularMobile)
 	return reg.MatchString(mobileNum)
 }
 
-//判断文件是否存在
+// 判断文件是否存在
 func FileIsExist(filePath string) bool {
 	_, err := os.Stat(filePath)
 	return err == nil || os.IsExist(err)
 }
 
-//获取图片扩展名
+// 获取图片扩展名
 func GetImgExt(file string) (ext string, err error) {
 	var headerByte []byte
 	headerByte = make([]byte, 8)
@@ -273,7 +265,7 @@ func GetImgExt(file string) (ext string, err error) {
 	return ext, nil
 }
 
-//保存图片
+// 保存图片
 func SaveImage(path string, img image.Image) (err error) {
 	//需要保持的文件
 	imgfile, err := os.Create(path)
@@ -283,7 +275,7 @@ func SaveImage(path string, img image.Image) (err error) {
 	return err
 }
 
-//保存base64数据为文件
+// 保存base64数据为文件
 func SaveBase64ToFile(content, path string) error {
 	data, err := base64.StdEncoding.DecodeString(content)
 	if err != nil {
@@ -413,7 +405,7 @@ func GetWilsonScore(p, n float64) float64 {
 	return toFixed(((p+1.9208)/(p+n)-1.96*math.Sqrt(p*n/(p+n)+0.9604)/(p+n))/(1+3.8416/(p+n)), 2)
 }
 
-//将中文数字转化成数字,比如 第三百四十五章,返回第345章 不支持一亿及以上
+// 将中文数字转化成数字,比如 第三百四十五章,返回第345章 不支持一亿及以上
 func ChangeWordsToNum(str string) (numStr string) {
 	words := ([]rune)(str)
 	num := 0
@@ -866,7 +858,7 @@ func GetLocalIP() (ip string, err error) {
 	return
 }
 
-//富文本字段过滤处理
+// 富文本字段过滤处理
 func GetRichText(content string) (contentSub string) {
 	contentSub = strings.Replace(content, "<p data-f-id=\"pbf\" style=\"text-align: center; font-size: 14px; margin-top: 30px; opacity: 0.65; font-family: sans-serif;\">Powered by <a href=\"https://www.froala.com/wysiwyg-editor?pb=1\" title=\"Froala Editor\">Froala Editor</a></p>", "", -1)
 	return

+ 50 - 5
utils/config.go

@@ -11,9 +11,27 @@ var (
 	MYSQL_URL string //数据库连接
 )
 
+var SystemType string // 系统类型; hz:弘则;trial:试用平台;custom:客户
+
+var (
+	APPNAME                        string //项目中文名称
+	EmailSendToUsers               string // 邮件提醒人员
+	RefreshEdbInfoEmailSendToUsers string // 刷新完成通知邮件人员
+	// AlarmMsgUrl 报警服务地址
+	AlarmMsgUrl string
+)
+
 // 经济数据库
 var (
-	EDB_LIB_URL string
+	EDB_LIB_URL         string
+	APP_EDB_LIB_NAME_EN string
+	EDB_LIB_Md5_KEY     string
+)
+
+// 公共数据服务接口参数
+var (
+	APPID  string
+	SECRET string
 )
 
 func init() {
@@ -45,9 +63,36 @@ func init() {
 	beego.Info(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
 
-	if RunMode == "release" {
-		EDB_LIB_URL = "http://127.0.0.1:8300/edbapi/"
-	} else {
-		EDB_LIB_URL = "http://127.0.0.1:8300/edbapi/"
+	// 系统类型
+	systemType, err := web.AppConfig.String("system_type")
+	if err != nil {
+		panic(any("配置文件读取system_type错误 " + err.Error()))
 	}
+	SystemType = systemType
+
+	// 项目中文名称
+	appNameCn, err := web.AppConfig.String("app_name_cn")
+	if err != nil {
+		panic(any("配置文件读取app_name_cn错误 " + err.Error()))
+	}
+	APPNAME = appNameCn
+
+	// 邮件提醒人员
+	EmailSendToUsers = config["email_send_to_users"]
+
+	// 刷新完成通知邮件人员
+	RefreshEdbInfoEmailSendToUsers = config["refresh_edb_info_email_send_to_users"]
+
+	// 报警服务地址
+	AlarmMsgUrl = config["alarm_msg_url"]
+
+	// 公共指标库相关
+	{
+		EDB_LIB_URL = config["edb_lib_url"]
+		APP_EDB_LIB_NAME_EN = config["app_edb_lib_name_en"]
+		EDB_LIB_Md5_KEY = config["edb_lib_md5_key"]
+	}
+
+	APPID = config["appid"]
+	SECRET = config["secret"]
 }

+ 0 - 41
utils/constants.go

@@ -1,9 +1,5 @@
 package utils
 
-const (
-	Md5Key = "Ks@h64WJ#tcVgG8$&WlNfqvLAtMgpxWN"
-)
-
 // 常量定义
 const (
 	FormatTime             = "15:04:05"                //时间格式
@@ -20,23 +16,12 @@ const (
 	PageSize30             = 30
 )
 
-const (
-	APPNAME          = "弘则-task"
-	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;512188925@qq.com"
-	//RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com;jhwang@hzinsights.com;lnyan@hzinsights.com;vwang@hzinsights.com"
-	RefreshEdbInfoEmailSendToUsers = "317699326@qq.com;984198890@qq.com;jhwang@hzinsights.com;lnyan@hzinsights.com"
-)
-
 // 手机号,电子邮箱正则
 const (
 	RegularMobile = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(18[0-9])|(17[0-9])|(16[0-9])|(19[0-9]))\\d{8}$" //手机号码
 	RegularEmail  = `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`                                             //匹配电子邮箱
 )
 
-const (
-	EmailSendToHzUsers = "317699326@qq.com"
-)
-
 // 数据来源渠道
 const (
 	DATA_SOURCE_THS                          = iota + 1 //同花顺
@@ -100,34 +85,8 @@ const (
 	Hz_Data_LT_Url = "http://dataek.hzinsights.com:8040/"   //路透社接口地址
 )
 
-var Hz_Data_WIND_Url_List = []string{"http://datawind.hzinsights.com:8040/", "http://datawind2.hzinsights.com:8040/"}
-
 // 数据刷新频率
 const (
 	DATA_REFRESH        = 7 //7个单位,日/周/月/季度/年
 	DATA_END_DATE_LIMIT = 4 //数据结束日期为,当前日期,加上4年时间
 )
-
-// EDB_LIB
-var (
-	APP_EDB_LIB_NAME_EN = "hongze_edb_lib"
-	EDB_LIB_Md5_KEY     = "GuRaB6dY1bXOJcwG"
-)
-
-// 研报类型标识
-var (
-	REPORT_TYPE_DAY      = "day"
-	REPORT_TYPE_WEEK     = "week"
-	REPORT_TYPE_TWO_WEEK = "two_week"
-	REPORT_TYPE_MONTH    = "month"
-	REPORT_TYPE_OTHER    = "other"
-)
-
-const (
-	SendTemplateMsgAuthorization = "dc855fce962a639faa779cbdd4cd332f"
-)
-
-// 模板消息推送类型
-const (
-	TEMPLATE_MSG_YB_VOICE_BROADCAST = 20 //研报语音播报
-)