删除一些不要的

business/jxutils/jxutils.go

@@ -1,8 +1,6 @@
 package jxutils
 
 import (
-	"bytes"
-	"context"
 	"crypto/aes"
 	"crypto/md5"
 	"encoding/base64"
@@ -14,15 +12,9 @@ import (
 	"strings"
 	"time"
 
-	"git.rosy.net.cn/baseapi"
-	"git.rosy.net.cn/baseapi/platformapi/autonavi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/routinepool"
-	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/globals"
-	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/qiniu/api.v7/storage"
 )
 
 var (
@@ -244,16 +236,6 @@ func EarthDistance(lng1, lat1, lng2, lat2 float64) float64 {
 	return dist * radius
 }
 
-// 返回结果单元为公里
-func WalkingDistance(lng1, lat1, lng2, lat2 float64) (distance float64) {
-	if distance = api.AutonaviAPI.WalkingDistance(lng1, lat1, lng2, lat2); distance == 0 {
-		distance = EarthDistance(lng1, lat1, lng2, lat2) * 1.4
-	} else {
-		distance /= 1000
-	}
-	return distance
-}
-
 func StandardCoordinate2Int(value float64) int {
 	return int(math.Round(value * 1000000))
 }
@@ -262,25 +244,6 @@ func IntCoordinate2Standard(value int) float64 {
 	return float64(value) / 1000000
 }
 
-func IntCoordinate2MarsStandard(gpsLng, gpsLat int, coordinateType int) (marsLng, marsLat float64, err error) {
-	marsLng = IntCoordinate2Standard(gpsLng)
-	marsLat = IntCoordinate2Standard(gpsLat)
-	coordSys := ""
-	switch coordinateType {
-	case model.CoordinateTypeGPS:
-		coordSys = autonavi.CoordSysGPS
-	case model.CoordinateTypeMars:
-		return marsLng, marsLat, nil
-	case model.CoordinateTypeBaiDu:
-		coordSys = autonavi.CoordSysBaidu
-	case model.CoordinateTypeMapbar:
-		coordSys = autonavi.CoordSysMapbar
-	default:
-		panic(fmt.Sprintf("known coordinate type:%d", coordinateType))
-	}
-	return api.AutonaviAPI.CoordinateConvert(marsLng, marsLat, coordSys)
-}
-
 func IntPrice2Standard(value int64) float64 {
 	return float64(value) / 100
 }
@@ -595,36 +558,6 @@ func RefreshAfsOrderSkuRelated(afsOrder *model.AfsOrder) *model.AfsOrder {
 	return afsOrder
 }
 
-func UploadExportContent(content []byte, key string) (downloadURL string, err error) {
-	putPolicy := storage.PutPolicy{
-		Scope:           globals.QiniuBucket,
-		Expires:         10 * 60,
-		DeleteAfterDays: 1,
-	}
-	upToken := putPolicy.UploadToken(api.QiniuAPI)
-	cfg := &storage.Config{}
-	formUploader := storage.NewFormUploader(cfg)
-	ret := storage.PutRet{}
-	for i := 0; i < 3; i++ {
-		if err = formUploader.Put(context.Background(), &ret, upToken, key, bytes.NewReader(content), int64(len(content)), &storage.PutExtra{}); err == nil {
-			break
-		}
-	}
-	if err == nil {
-		downloadURL = ComposeQiniuResURL(key)
-	}
-	return downloadURL, err
-}
-
-func UploadExeclAndPushMsg(sheetList []*excel.Obj2ExcelSheetConfig, name string) (downloadURL, fileName string, err error) {
-	excelBin := excel.Obj2Excel(sheetList)
-	timeStr := utils.Int64ToStr(time.Now().Unix())
-	fileName = name + timeStr + fileExt
-	baseapi.SugarLogger.Debugf("WriteToExcel:save %s success", fileName)
-	downloadURL, err = UploadExportContent(excelBin, fileName)
-	return downloadURL, fileName, err
-}
-
 func TaskResult2Hint(resultList []interface{}) (hint string) {
 	strList := make([]string, len(resultList))
 	for k, v := range resultList {
@@ -820,25 +753,6 @@ func PKCS5UnPadding(origData []byte) []byte {
 	return origData[:(length - unpadding)]
 }
 
-//合成水印图
-func MixWatermarkImg(imgWatermark, img, positon string) (imgMix string) {
-	baseURL := base64.URLEncoding.EncodeToString([]byte(imgWatermark))
-	var imgUrl string
-	if strings.Contains(img, "?") {
-		imgUrl = img + "/imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/" + positon + "/dx/10/dy/10"
-	} else {
-		imgUrl = img + "?imageView2/0/q/75|watermark/1/image/" + baseURL + "/dissolve/100/gravity/" + positon + "/dx/10/dy/10"
-	}
-	if resBinary, _, err := DownloadFileByURL(imgUrl); err == nil {
-		if downloadURL, err := UploadExportContent(resBinary, utils.Int64ToStr(time.Now().Unix())+img[strings.LastIndex(img, "/")+1:len(img)]); err == nil {
-			if err == nil {
-				return downloadURL
-			}
-		}
-	}
-	return imgMix
-}
-
 func GetIssue() (issue int) {
 	year, month, _ := time.Now().Date()
 	return year*100 + int(month)