fix：钢联化工地址变更

services/aliyun.go

@@ -1,164 +0,0 @@
-package services
-
-import (
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	openapi "github.com/alibabacloud-go/darabonba-openapi/v2/client"
-	ocr20191230 "github.com/alibabacloud-go/ocr-20191230/v3/client"
-	util "github.com/alibabacloud-go/tea-utils/v2/service"
-	"github.com/alibabacloud-go/tea/tea"
-	"hongze/hz_eta_api/utils"
-	"io/ioutil"
-	"net/http"
-	"strings"
-
-	rhttp "github.com/rdlucklib/rdluck_tools/http"
-)
-
-const (
-	AlAppKey    = "203889624"
-	AlAppSecret = "voampGGl0yGNx5xA1sZdmZlV2EiBct2P"
-	AlAppCode   = "22553c4ba74545568aba70ac6cfd441d"
-)
-
-type OcrItem struct {
-	Image string `json:"image"`
-}
-
-type OcrResult struct {
-	Addr               []string `json:"addr"`
-	Company            []string `json:"company"`
-	Success            bool     `json:"success"`
-	TelCell            []string `json:"tel_cell"`
-	Departments        []string `json:"departments"`
-	Name               string   `json:"name"`
-	OfficePhoneNumbers []string `json:"office_phone_numbers"`
-	Titles             []string `json:"titles"`
-}
-
-// /ocr_business_card.json
-func AliyunBusinessCard(imgUrl string) (result *OcrResult, err error) {
-	postUrl := `https://dm-57.data.aliyun.com/rest/160601/ocr/ocr_business_card.json`
-
-	imgBody, err := rhttp.Get(imgUrl)
-	if err != nil {
-		return
-	}
-	imageBase64 := base64.StdEncoding.EncodeToString(imgBody)
-
-	item := new(OcrItem)
-	item.Image = imageBase64
-	jsonBody, err := json.Marshal(item)
-	if err != nil {
-		fmt.Println("json.Marshal Err:" + err.Error())
-		return
-	}
-	tr := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	client := &http.Client{Transport: tr}
-	req, err := http.NewRequest("POST", postUrl, strings.NewReader(string(jsonBody)))
-	if err != nil {
-		fmt.Println("err:" + err.Error())
-		return
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "APPCODE "+AlAppCode)
-	resp, err := client.Do(req)
-	if err != nil {
-		fmt.Println("client.Do Err:" + err.Error())
-		return
-	}
-	fmt.Println("resp")
-	fmt.Println(resp)
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("err:" + err.Error())
-		return
-	}
-	fmt.Println("body:", string(body))
-	utils.FileLog.Info(fmt.Sprintf("aliyun card;imgUrl:%s; Body:%s", imgUrl, string(body)))
-	err = json.Unmarshal(body, &result)
-	return
-}
-
-// AliyunBusinessCardOcr 阿里云的ocr识别
-func AliyunBusinessCardOcr(imgUrl string) (result OcrResult, err error) {
-	if utils.AccessKeyId == `` {
-		err = errors.New("阿里云信息未配置")
-		return
-	}
-	config := &openapi.Config{
-		// 2、"YOUR_ACCESS_KEY_ID", "YOUR_ACCESS_KEY_SECRET" 的生成请参考https://help.aliyun.com/document_detail/175144.html
-		// 如果您是用的子账号AccessKey，还需要为子账号授予权限AliyunVIAPIFullAccess，请参考https://help.aliyun.com/document_detail/145025.html
-		// 您的 AccessKey ID
-		AccessKeyId: tea.String(utils.AccessKeyId),
-		// 您的 AccessKey Secret
-		AccessKeySecret: tea.String(utils.AccessKeySecret),
-	}
-	// 3、访问的域名。注意：这个地方需要求改为相应类目的域名，参考：https://help.aliyun.com/document_detail/143103.html
-	config.Endpoint = tea.String("ocr.cn-shanghai.aliyuncs.com")
-	// 4、这里只是以ocr为例，其他能力请使用相应类目的包
-
-	client, err := ocr20191230.NewClient(config)
-	if err != nil {
-		return
-	}
-	httpClient := http.Client{}
-	file, _ := httpClient.Get(imgUrl)
-
-	// 5、这里只是以ocr的RecognizeBankCard为例，其他能力请使用相应类目的包和类
-	recognizeBusinessCardAdvanceRequest := &ocr20191230.RecognizeBusinessCardAdvanceRequest{
-		ImageURLObject: file.Body,
-	}
-	runtime := &util.RuntimeOptions{}
-	// 6、这里只是以ocr的RecognizeBankCard为例，其他能力请使用相应类目的包和类，注意RecognizeBankCardWithOptions也需要改成对应能力的方法名。方法名是根据能力名称按照一定规范形成的，如能力名称为SegmentCommonImage，对应方法名应该为SegmentCommonImageWithOptions。
-	recognizeBusinessCardResponse, err := client.RecognizeBusinessCardAdvance(recognizeBusinessCardAdvanceRequest, runtime)
-
-	if err != nil {
-		// 获取整体报错信息
-		//fmt.Println(err.Error())
-		utils.FileLog.Info(fmt.Sprintf("aliyun card;imgUrl:%s; err:%s", imgUrl, err))
-		return
-	}
-
-	// 获取整体结果
-	//fmt.Println(recognizeBusinessCardResponse)
-	//// 获取单个字段，这里只是一个例子，具体能力下的字段需要看具体能力的文档
-	//fmt.Println(recognizeBusinessCardResponse.Body.Data.Name)
-
-	// 地址
-	for _, v := range recognizeBusinessCardResponse.Body.Data.Addresses {
-		result.Addr = append(result.Addr, *v)
-	}
-	// company
-	for _, v := range recognizeBusinessCardResponse.Body.Data.Companies {
-		result.Company = append(result.Company, *v)
-	}
-	// tel_cell
-	for _, v := range recognizeBusinessCardResponse.Body.Data.CellPhoneNumbers {
-		result.TelCell = append(result.TelCell, *v)
-	}
-	// Departments
-	for _, v := range recognizeBusinessCardResponse.Body.Data.Departments {
-		result.Departments = append(result.Departments, *v)
-	}
-	// OfficePhoneNumbers
-	for _, v := range recognizeBusinessCardResponse.Body.Data.OfficePhoneNumbers {
-		result.OfficePhoneNumbers = append(result.OfficePhoneNumbers, *v)
-	}
-	// Titles
-	for _, v := range recognizeBusinessCardResponse.Body.Data.Titles {
-		result.Titles = append(result.Titles, *v)
-	}
-	if recognizeBusinessCardResponse.Body.Data.Name != nil {
-		result.Name = *recognizeBusinessCardResponse.Body.Data.Name
-	}
-	result.Success = true
-
-	return
-}

services/data/chart_info_elastic.go

@@ -80,7 +80,7 @@ func CreateChartInfoIndex() {
     }
   }
 }`
-	EsCreateIndex(indexName, mappingJson)
+	elastic.EsCreateIndex(indexName, mappingJson)
 }
 
 func AddAllChartInfo() {

services/data/edb_info_elastic.go

@@ -1,252 +0,0 @@
-package data
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"github.com/olivere/elastic/v7"
-	"hongze/hz_eta_api/models/data_manage"
-	"hongze/hz_eta_api/utils"
-	"log"
-	"os"
-	"strconv"
-	"strings"
-)
-
-const (
-	ES_URL      = "http://es-cn-nif227b580019rgw6.public.elasticsearch.aliyuncs.com:9200" //<1>
-	ES_USERNAME = "elastic"                                                               //<2>
-	ES_PASSWORD = "hongze@2021"                                                           //<3>
-)
-
-func NewClient() (client *elastic.Client, err error) {
-	errorlog := log.New(os.Stdout, "APP", log.LstdFlags)
-	file := ""
-	if utils.RunMode == "release" {
-		file = `./rdlucklog/eslog.log`
-	} else {
-		file = `./rdlucklog/eslog.log`
-	}
-	logFile, _ := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0766)
-	client, err = elastic.NewClient(
-		elastic.SetURL(ES_URL),
-		elastic.SetBasicAuth(ES_USERNAME, ES_PASSWORD),
-		elastic.SetTraceLog(log.New(logFile, "ES-TRACE: ", 0)),
-		elastic.SetSniff(false), elastic.SetErrorLog(errorlog))
-	return
-}
-
-func CreateEdbInfoIndex() {
-	indexName := utils.DATA_INDEX_NAME
-	mappingJson := `{
- "mappings": {
-   "dynamic": true,
-   "properties": {
-     "EdbInfoId": {
-       "type": "integer"
-     },
-     "SourceName": {
-       "type": "text",
-       "term_vector": "with_positions_offsets",
-		"analyzer": "ik_smart"
-     },
-    "EdbCode": {
-       "type": "text",
-       "term_vector": "with_positions_offsets",
-		"analyzer": "ik_smart"
-     },
-     "EdbName": {
-       "type": "text",
-       "term_vector": "with_positions_offsets",
-		"analyzer": "ik_smart"
-     },
-      "Frequency": {
-       "type": "text",
-       "term_vector": "with_positions_offsets",
-		"analyzer": "ik_smart"
-     },
-     "UniqueCode": {
-       "type": "text",
-       "term_vector": "with_positions_offsets"
-     },
-     "Unit": {
-       "type": "text",
-       "term_vector": "with_positions_offsets"
-     }
-   }
- }
-}`
-	EsCreateIndex(indexName, mappingJson)
-}
-
-// indexName:索引名称
-// mappingJson:表结构
-func EsCreateIndex(indexName, mappingJson string) (err error) {
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
-	//定义表结构
-	exists, err := client.IndexExists(indexName).Do(context.Background()) //<5>
-	if err != nil {
-		return
-	}
-	if !exists {
-		resp, err := client.CreateIndex(indexName).BodyJson(mappingJson).Do(context.Background())
-		//BodyJson(bodyJson).Do(context.Background())
-		if err != nil {
-			fmt.Println("CreateIndex Err:" + err.Error())
-			return err
-		}
-		fmt.Println(resp.Index, resp.ShardsAcknowledged, resp.Acknowledged)
-	} else {
-		fmt.Println(indexName + " 已存在")
-	}
-	return
-}
-
-func AddAllEdbInfo() {
-	allList, err := data_manage.GetEdbInfoAllList()
-	if err != nil {
-		fmt.Println("GetArticleAll Err:", err.Error())
-		return
-	}
-	indexName := "hz_data_lib_v1"
-	for _, v := range allList {
-		EsAddOrEditEdbInfo(indexName, strconv.Itoa(v.EdbInfoId), v)
-		fmt.Println(v.EdbInfoId)
-	}
-}
-
-// 新增和修改数据
-func EsAddOrEditEdbInfo(indexName, docId string, item *data_manage.EdbInfo) (err error) {
-	defer func() {
-		if err != nil {
-			fmt.Println("EsAddOrEditEdbInfo Err:", err.Error())
-		}
-	}()
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
-	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{}{
-			"EdbInfoId":  item.EdbInfoId,
-			"EdbCode":    item.EdbCode,
-			"EdbName":    item.EdbName,
-			"Frequency":  item.Frequency,
-			"SourceName": item.SourceName,
-			"UniqueCode": item.UniqueCode,
-			"Unit":       item.Unit,
-		}).Do(context.Background())
-		if err != nil {
-			return err
-		}
-		fmt.Println(resp.Status, resp.Result)
-		if resp.Status == 0 {
-			fmt.Println("修改成功")
-		} 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("新增成功")
-			err = nil
-		} else {
-			fmt.Println("AddData", resp.Status, resp.Result)
-		}
-	}
-	return
-}
-
-// 删除数据
-func EsDeleteEdbInfo(docId int) (err error) {
-	indexName := utils.DATA_INDEX_NAME
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
-	resp, err := client.Delete().Index(indexName).Id(strconv.Itoa(docId)).Do(context.Background())
-	fmt.Println(resp)
-	if err != nil {
-		return
-	}
-	if resp.Status == 0 {
-		fmt.Println("删除成功")
-	} else {
-		fmt.Println("AddData", resp.Status, resp.Result)
-	}
-	return
-}
-
-func MappingModify(indexName, mappingJson string) {
-	client, err := NewClient()
-	if err != nil {
-		return
-	}
-	result, err := client.PutMapping().Index(indexName).BodyString(mappingJson).Do(context.Background())
-	fmt.Println(err)
-	fmt.Println(result)
-	return
-}
-
-// 搜索指标信息
-func EsSearchEdbInfo(indexName, keyWord string, filterSource int) (result []*data_manage.EdbInfoList, err error) {
-	client, err := NewClient()
-	if keyWord != "" {
-		keyWordArr := strings.Split(keyWord, " ")
-		existMap := make(map[int]string)
-		for _, searchKey := range keyWordArr {
-			matchArr := make([]elastic.Query, 0)
-			boolquery := elastic.NewBoolQuery()
-
-			multiMatch := elastic.NewMultiMatchQuery(searchKey, "EdbName", "EdbCode").Analyzer("ik_smart")
-			matchArr = append(matchArr, multiMatch)
-
-			if filterSource == 2 {
-				matchPhrase := elastic.NewMatchPhraseQuery("Frequency", "月度")
-				matchArr = append(matchArr, matchPhrase)
-			}
-
-			boolquery.Must(matchArr...)
-
-			//request := client.Search(indexName).Sort("CreateTime", false).Query(boolquery)
-			request := client.Search(indexName).Query(boolquery)
-
-			searchByMatch, err := request.Do(context.Background())
-			if err != nil {
-				return nil, err
-			}
-			if searchByMatch != nil {
-				if searchByMatch.Hits != nil {
-					for _, v := range searchByMatch.Hits.Hits {
-						edbInfoJson, err := v.Source.MarshalJSON()
-						if err != nil {
-							return nil, err
-						}
-						edbInfo := new(data_manage.EdbInfoList)
-						err = json.Unmarshal(edbInfoJson, &edbInfo)
-						if err != nil {
-							return nil, err
-						}
-						if _, ok := existMap[edbInfo.EdbInfoId]; !ok {
-							result = append(result, edbInfo)
-						}
-						existMap[edbInfo.EdbInfoId] = edbInfo.EdbCode
-					}
-				}
-			}
-		}
-	}
-	return
-}

services/data/mysteel_chemical.go

@@ -12,10 +12,6 @@ import (
 	"time"
 )
 
-const (
-	mysteelPostUrl = `http://mysteelhz.hzinsights.com:8040`
-)
-
 // AddMysteelChemicalClassify 添加钢联化工分类
 func AddMysteelChemicalClassify(classifyName string, parentId, level, sysUserId int, sysUserName string) (classifyInfo *data_manage.BaseFromMysteelChemicalClassify, err error, errMsg string) {
 	count, err := data_manage.GetBaseFromMysteelChemicalClassifyCount(classifyName, parentId)
@@ -543,8 +539,7 @@ func GetMysteelChemicalOpButton(sysUser *system.Admin, belongUserId int) (button
 
 // CurlAddMysteelChemicalData 请求钢联服务器添加指标
 func CurlAddMysteelChemicalData(indexCode, updateWeek string) {
-	//postUrl := `http://datamysteel.hzinsights.com:8040/api/index/create`
-	postUrl := mysteelPostUrl + `/api/index/create`
+	postUrl := utils.MySteelPostUrl + `/api/index/create`
 	//type IndexAddReq struct {
 	//	IndexCode  string `json:"IndexCode" binding:"required"`    //指标编码
 	//	UpdateWeek string `json:"UpdateWeek"`                      //更新周期
@@ -576,8 +571,7 @@ func CurlAddMysteelChemicalData(indexCode, updateWeek string) {
 
 // CurlDelMysteelChemicalData 请求钢联服务器删除指标
 func CurlDelMysteelChemicalData(indexCode, updateWeek string) {
-	//postUrl := `http://datamysteel.hzinsights.com:8040/api/index/delete`
-	postUrl := mysteelPostUrl + `/api/index/delete`
+	postUrl := utils.MySteelPostUrl + `/api/index/delete`
 	//type IndexAddReq struct {
 	//	IndexCode  string `json:"IndexCode" binding:"required"`    //指标编码
 	//	UpdateWeek string `json:"UpdateWeek"`                      //更新周期
@@ -621,8 +615,7 @@ var WeekMap = map[string]string{
 
 // CurlAddMysteelChemicalData 请求钢联服务器添加指标
 func CurlRefreshMysteelChemicalData(mergeFilePath string) {
-	//postUrl := `http://datamysteel.hzinsights.com:8040/api/index/refresh`
-	postUrl := mysteelPostUrl + `/api/index/refresh`
+	postUrl := utils.MySteelPostUrl + `/api/index/refresh`
 	//type IndexAddReq struct {
 	//	IndexCode  string `json:"IndexCode" binding:"required"`    //指标编码
 	//	UpdateWeek string `json:"UpdateWeek"`                      //更新周期

utils/config.go

@@ -48,6 +48,9 @@ var (
 	APP_EDB_LIB_NAME_EN string
 	EDB_LIB_Md5_KEY     string
 
+	// MySteelPostUrl 钢联化工的服务地址
+	MySteelPostUrl string
+
 	// SendWxTemplateMsgUrl 模板消息推送
 	SendWxTemplateMsgUrl string
 
@@ -247,6 +250,9 @@ func init() {
 		APP_EDB_LIB_NAME_EN = config["app_edb_lib_name_en"]
 		EDB_LIB_Md5_KEY = config["edb_lib_md5_key"]
 
+		// 钢联化工服务地址
+		MySteelPostUrl = config["mysteel_post_url"]
+
 		// 发送微信模板消息地址
 		SendWxTemplateMsgUrl = config["send_wx_template_msg_url"]