commit message:```

删除多个未使用的函数和服务

移除了多个文件中未被调用的函数和服务，包括：
- edb_refresh.go 中的 ConfigRefreshData 函数- edb_relation.go 中的 GetCalculateEdbByFromEdbInfo 函数
- elastic.go 中的 EsAddOrEditSmartReport 函数
- hz_data_api.go 中的整个文件
- oss.go 中的 UploadAliyun 和 UploadVideoAliyun 函数
- report.go 中的 PublishReportTest 函数
- task.go 中的 TaskInit 函数
- wx_template_msg.go 中的未使用的 WxSendTemplateMsg调用
```

services/edb_refresh.go

@@ -12,59 +12,6 @@ import (
 	"time"
 )
 
-// ConfigRefreshData
-// @Description:  配置刷新数据
-// @author: Roc
-// @datetime 2024-01-10 13:55:05
-// @param cont context.Context
-// @return err error
-//func ConfigRefreshData(cont context.Context) (err error) {
-//	errMsgList := make([]string, 0)
-//	defer func() {
-//		if err != nil {
-//			fmt.Println(err)
-//		}
-//	}()
-//	// 一期是只做wind、同花顺、钢联、有色
-//
-//	now := time.Now()
-//	//now = time.Date(2023, 12, 31, 19, 10, 59, 0, time.Local)
-//	//now = time.Date(2023, 12, 31, 16, 50, 59, 0, time.Local)
-//	defaultSourceEdbInfoListMap, err := getDefaultRefreshData(now)
-//	if err != nil {
-//		errMsgList = append(errMsgList, "获取默认刷新数据失败，Err:"+err.Error())
-//	}
-//	sourceEdbInfoListMap, err := getConfigRefreshData(now)
-//	if err != nil {
-//		errMsgList = append(errMsgList, "获取指标配置刷新数据失败，Err:"+err.Error())
-//	}
-//
-//	// 将两个合并
-//	allSourceEdbInfoListMap := mergeMaps(defaultSourceEdbInfoListMap, sourceEdbInfoListMap)
-//	wgNum := len(allSourceEdbInfoListMap)
-//	if wgNum <= 0 {
-//		return
-//	}
-//	wg := sync.WaitGroup{}
-//	wg.Add(wgNum)
-//
-//	for _, edbList := range allSourceEdbInfoListMap {
-//		if edbList == nil {
-//			wg.Done()
-//			continue
-//		}
-//		if len(edbList) != 0 {
-//			go BaseRefreshData(&wg, edbList[0].Source, edbList[0].SubSource, edbList)
-//		}
-//	}
-//
-//	wg.Wait()
-//
-//	fmt.Println("Refresh End")
-//
-//	return
-//}
-
 // Function to merge two maps
 func mergeMaps(dst map[string][]*edb_refresh.EdbInfoListAndRefreshConfig, src map[string][]*edb_refresh.EdbInfoListAndRefreshConfig) (newMap map[string][]*edb_refresh.EdbInfoListAndRefreshConfig) {
 	if dst == nil {

services/edb_relation.go

@@ -1152,51 +1152,3 @@ func getCalculateEdbInfoByEdbInfoId(allEdbMappingMap map[int][]*data_manage.EdbI
 
 	return
 }
-
-// GetCalculateEdbByFromEdbInfo 找到依赖于该基础指标的所有计算指标
-func GetCalculateEdbByFromEdbInfo(edbInfoIds []int, calculateEdbIds []int, hasFind map[int]struct{}) (newCalculateEdbIds []int, err error) {
-	if len(edbInfoIds) == 0 {
-		return
-	}
-	newCalculateEdbIds = calculateEdbIds
-	newEdbInfoIds := make([]int, 0)
-	for _, v := range edbInfoIds {
-		if _, ok := hasFind[v]; ok {
-			continue
-		}
-		newEdbInfoIds = append(newEdbInfoIds, v)
-	}
-	if len(newEdbInfoIds) == 0 {
-		return
-	}
-	var condition string
-	var pars []interface{}
-	// 关联指标
-	condition += ` AND b.from_edb_info_id in (` + utils.GetOrmInReplace(len(newEdbInfoIds)) + `)`
-	pars = append(pars, newEdbInfoIds)
-
-	//获取关联图表列表
-	list, err := data_manage.GetRelationEdbInfoListMappingByCondition(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		err = fmt.Errorf("获取关联指标信息失败,Err:%s", err.Error())
-		return
-	}
-	calculateEdbIdsTmp := make([]int, 0)
-	for _, mapping := range list {
-		if mapping.EdbType == 2 && mapping.EdbInfoType == 0 { // 如果指标库里的计算指标，则加入，否则继续找
-			newCalculateEdbIds = append(newCalculateEdbIds, mapping.EdbInfoId)
-			calculateEdbIdsTmp = append(calculateEdbIdsTmp, mapping.EdbInfoId)
-		}
-	}
-	for _, v := range newEdbInfoIds {
-		hasFind[v] = struct{}{}
-	}
-	if len(calculateEdbIdsTmp) > 0 {
-		newCalculateEdbIds, err = GetCalculateEdbByFromEdbInfo(calculateEdbIdsTmp, newCalculateEdbIds, hasFind)
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}

services/elastic.go

@@ -150,62 +150,3 @@ func EsAddOrEditEnglishReport(indexName, docId string, item *models.ElasticEngli
 	}
 	return
 }
-
-// EsAddOrEditSmartReport 新增编辑es智能研报
-func EsAddOrEditSmartReport(indexName, docId string, item *models.ElasticSmartReport) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("EsAddOrEditSmartReport Err:", err.Error())
-		}
-	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
-	// docId为报告ID
-	searchById, err := client.Get().Index(indexName).Id(docId).Do(context.Background())
-	if err != nil && !strings.Contains(err.Error(), "404") {
-		fmt.Println("Get Err" + err.Error())
-		return
-	}
-	if searchById != nil && searchById.Found {
-		resp, err := client.Update().Index(indexName).Id(docId).Doc(map[string]interface{}{
-			"SmartReportId":      item.SmartReportId,
-			"Title":              item.Title,
-			"Abstract":           item.Abstract,
-			"BodyContent":        item.BodyContent,
-			"PublishTime":        item.PublishTime,
-			"PublishState":       item.PublishState,
-			"Author":             item.Author,
-			"ClassifyIdFirst":    item.ClassifyIdFirst,
-			"ClassifyNameFirst":  item.ClassifyNameFirst,
-			"ClassifyIdSecond":   item.ClassifyIdSecond,
-			"ClassifyNameSecond": item.ClassifyNameSecond,
-			"StageStr":           item.StageStr,
-			"Frequency":          item.Frequency,
-		}).Do(context.Background())
-		if err != nil {
-			return err
-		}
-		//fmt.Println(resp.Status, resp.Result)
-		if resp.Status == 0 {
-			fmt.Println("修改成功" + docId)
-			err = nil
-		} else {
-			fmt.Println("EditData", resp.Status, resp.Result)
-		}
-	} else {
-		resp, err := client.Index().Index(indexName).Id(docId).BodyJson(item).Do(context.Background())
-		if err != nil {
-			fmt.Println("新增失败:", err.Error())
-			return err
-		}
-		if resp.Status == 0 && resp.Result == "created" {
-			fmt.Println("新增成功" + docId)
-			return nil
-		} else {
-			fmt.Println("AddData", resp.Status, resp.Result)
-		}
-	}
-	return
-}

services/hz_data_api.go

@@ -1,154 +0,0 @@
-package services
-
-import (
-	"bytes"
-	"crypto/md5"
-	"encoding/json"
-	"errors"
-	"eta_gn/eta_task/utils"
-	"fmt"
-	"github.com/shopspring/decimal"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"sort"
-	"strings"
-	"time"
-)
-
-func HttpPost(funcName, method string, postDataMap map[string]interface{}) (result string, err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("Sync hz crawler err:" + err.Error())
-			utils.FileLog.Info("Sync hz crawler err:" + err.Error())
-		}
-	}()
-
-	bytesData, err := handlePostData(postDataMap)
-	if err != nil {
-		fmt.Println("handlePostData Err:" + err.Error())
-		return
-	}
-
-	fmt.Println("URL:" + utils.HzDataApi + method)
-	fmt.Println("Params:" + string(bytesData))
-	client := &http.Client{}
-	req, err := http.NewRequest("POST", utils.HzDataApi+method, bytes.NewReader(bytesData))
-	if err != nil {
-		fmt.Println("http.NewRequest Err:" + err.Error())
-		return "", err
-	}
-	req.Header.Set("content-type", "application/json")
-	utils.FileLog.Info(fmt.Sprintf("请求函数:%s ;请求地址:%s;请求体:%s", funcName, utils.HzDataApi+method, string(bytesData)))
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	if resp.Body != nil {
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return "", err
-		}
-		result = string(body)
-		fmt.Println("HttpPost Result:" + string(body))
-	}
-	utils.FileLog.Info(fmt.Sprintf("请求函数:%s ;返回体:%s", funcName, result))
-	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
-}

services/oss.go

@@ -3,50 +3,11 @@ package services
 import (
 	"errors"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-	"os"
 	"time"
 
 	"eta_gn/eta_task/utils"
 )
 
-/*
-上传demo
-func init() {
-	fmt.Println("start")
-	randStr := utils.GetRandStringNoSpecialChar(28)
-	fileName :=  randStr + ".jpg"
-	fmt.Println("fileName:",fileName)
-	fpath:="./1.png"
-	resourceUrl,err:=UploadAliyun(fileName,fpath)
-	if err!=nil {
-		fmt.Println("UploadAliyun Err:",err.Error())
-		return
-	}
-	fmt.Println("resourceUrl:",resourceUrl)
-	fmt.Println("end")
-}
-*/
-
-// 图片上传到阿里云
-func UploadAliyun(filename, filepath string) (string, error) {
-	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
-	if err != nil {
-		return "1", err
-	}
-	bucket, err := client.Bucket(utils.Bucketname)
-	if err != nil {
-		return "2", err
-	}
-	path := utils.UploadDir + time.Now().Format("200601/20060102/")
-	path += filename
-	err = bucket.PutObjectFromFile(path, filepath)
-	if err != nil {
-		return "3", err
-	}
-	path = utils.Imghost + path
-	return path, err
-}
-
 // UploadAudioAliyun 音频上传到阿里云
 func UploadAudioAliyun(filename, filepath string) (string, error) {
 	if utils.AccessKeyId == `` {
@@ -69,27 +30,3 @@ func UploadAudioAliyun(filename, filepath string) (string, error) {
 	path = utils.Imghost + path
 	return path, err
 }
-
-// 视频上传到阿里云
-func UploadVideoAliyun(filename, filepath, savePath string) error {
-	defer func() {
-		os.Remove(filepath)
-	}()
-	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
-	if err != nil {
-		return err
-	}
-	bucket, err := client.Bucket(utils.Bucketname)
-	if err != nil {
-		return err
-	}
-	//path := utils.Upload_Audio_Dir + time.Now().Format("200601/20060102/")
-	//path += filename
-	err = bucket.PutObjectFromFile(savePath, filepath)
-	if err != nil {
-		return err
-	}
-	//path = utils.Imghost + path
-	//return path,err
-	return err
-}

services/report.go

@@ -272,27 +272,6 @@ func handleByPublishReport(item *models.Report) {
 	return
 }
 
-// PublishReportTest 定时发布研报-每秒
-/*func PublishReportTest() (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println(err.Error())
-		}
-	}()
-	item, err := models.GetReportById(3331)
-	if err != nil {
-		return
-	}
-	// 判断是否未发送模版消息，并且配置了立即推送模版消息的报告需要推送
-	if item.MsgIsSend == 0 && item.PreMsgSend == 1 {
-		err = ReportSendTemplateMsg(item.Id)
-		if err != nil {
-			return
-		}
-	}
-	return
-}*/
-
 func ReportSendTemplateMsg(reportId int) (err error) {
 	defer func() {
 		if err != nil {

services/task.go

@@ -127,10 +127,3 @@ func SyncBaseDataExt(cont context.Context) (err error) {
 	go data.SetChartEdbEndDate()
 	return
 }
-
-func TaskInit() {
-	fmt.Println("TaskInit start")
-	//data.InitGuangzhouPositionTask()
-	fmt.Println("TaskInit end")
-	return
-}

services/wx_template_msg.go

@@ -23,33 +23,7 @@ func SendWxMsgWithFrequency(first, keyword1, keyword2, remark string, openIdList
 		fmt.Println("line 21", err, msg)
 	}()
 	utils.FileLog.Info("services SendMsg")
-	/*accessToken, err := models.GetWxAccessToken()
-	if err != nil {
-		msg = "GetWxAccessToken Err:" + err.Error()
-		return
-	}
-	if accessToken == "" {
-		msg = "accessToken is empty"
-		return
-	}
-
-	sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-	templateId := utils.TemplateId
-	//if true{
-	sendMap := make(map[string]interface{})
-	sendData := make(map[string]interface{})
-
-	sendMap["template_id"] = templateId
-
-	//redirectUrl:="report.hzinsights.com/#/allindex/"+strconv.Itoa(v.ResearchReportId)+"/"+v.ReportType;
 
-	//sendMap["url"]=redirectUrl
-	sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-	sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-	sendData["keyword2"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-	sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
-	sendMap["data"] = sendData
-	WxSendTemplateMsg(sendUrl, sendMap, openIdList)*/
 	wxAppPath := ""
 	openIdArr := make([]string, len(openIdList))
 	for i, v := range openIdList {