- remove legacy

business/jxutils/tasks/configrefresh.go

@@ -10,7 +10,6 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 
-	"git.rosy.net.cn/jx-callback/legacy/freshfood"
 	"github.com/astaxie/beego/orm"
 )
 
@@ -97,9 +96,6 @@ func RefreshWeixinToken() error {
 		return ""
 	}, func(value string) {
 		api.WeixinAPI.SetToken(value)
-		if !globals.OrderUseNewTable {
-			freshfood.FreshFoodAPI.RefreshWeixinToken()
-		}
 	})
 }
 
@@ -123,9 +119,6 @@ func RefreshElmToken() error {
 		err := utils.UnmarshalUseNumber([]byte(value), &tokenInfo)
 		if err == nil {
 			api.ElmAPI.SetToken(tokenInfo.AccessToken)
-			if !globals.OrderUseNewTable {
-				freshfood.FreshFoodAPI.RefreshElmToken()
-			}
 		}
 	})
 }

conf/app.conf

@@ -34,8 +34,6 @@ qiniuSK = "3MNdU_lKnu22vrNtUELDcLBv23UOUWYKzc16Pmkj"
 qiniuBucket = "jingxistandardlib"
 
 [dev]
-freshFoodServerURL = "http://portal.beta.jxc4.com"
-
 jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
 jdAppKey = "06692746f7224695ad4788ce340bc854"
 jdSecret = "d6b42a35a7414a5490d811654d745c84"
@@ -61,8 +59,6 @@ weixinSecret = "ba32b269a068a5b72486a0beafd171e8"
 dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&loc=Local&parseTime=true"
 
 [prod]
-freshFoodServerURL = "http://portal.int.jxc4.com"
-
 jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
 jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
 jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
@@ -93,8 +89,6 @@ enableEbaiStoreWrite = true
 [prod2]
 httpport = 8082
 
-freshFoodServerURL = ""
-
 disableJd = false
 jdToken  = "46058015-11b1-485d-9622-b7a91e446023"
 jdAppKey = "8410aba1b67e4d3199098e944f91cb68"
@@ -112,8 +106,6 @@ enableStore = true
 enableStoreWrite = true
 
 [test]
-freshFoodServerURL = "http://portal.alpha.int.jxc4.com"
-
 jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
 jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
 jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
@@ -140,7 +132,6 @@ dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8mb4&l
 
 [alpha]
 httpport = 8088
-freshFoodServerURL = "http://portal.alpha.jxc4.com"
 
 jdToken  = "c8854ef2-f80a-45ee-aceb-dc8014d646f8"
 jdAppKey = "06692746f7224695ad4788ce340bc854"
@@ -168,8 +159,6 @@ dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxstore_alpha?charset=utf8m
 enableStoreWrite = true
 
 [beta]
-freshFoodServerURL = "http://portal.alpha.int.jxc4.com"
-
 jdToken  = "91633f2a-c5f5-4982-a925-a220d19095c3"
 jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
 jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"

legacy/freshfood/freshfood.go

@@ -1,80 +0,0 @@
-package freshfood
-
-import (
-	"errors"
-	"net/http"
-	"net/url"
-	"time"
-
-	"github.com/astaxie/beego"
-
-	"git.rosy.net.cn/jx-callback/globals"
-)
-
-const (
-	URL_WX_UPDATE_ACCESSTOKEN       = "weixin/accesstoken/update"
-	URL_FRESHFOOD_ELEME_TOKENUPDATE = "eleme/token/update"
-)
-
-const (
-	retryCount = 1
-)
-
-type API struct {
-	baseURL string
-	client  *http.Client
-}
-
-var (
-	ErrFreshFooddReturnNot200 = errors.New("freshfood return code is not 200")
-)
-
-var (
-	FreshFoodAPI *API
-)
-
-func init() {
-	FreshFoodAPI = New(beego.AppConfig.String("freshFoodServerURL"))
-}
-
-func New(baseURL string) *API {
-	return &API{baseURL, &http.Client{Timeout: time.Millisecond * 2500}} // 2秒超时，因为JD那边的是3秒，超过3秒无意义
-}
-
-func (f *API) AccessFreshFood(apiStr string, params url.Values) error {
-	var err error
-	var response *http.Response
-	fullURL := f.baseURL + "/" + apiStr
-	for i := 0; i < retryCount; i++ {
-		if params != nil {
-			// globals.SugarLogger.Debug(params.Encode())
-			response, err = f.client.PostForm(fullURL, params)
-		} else {
-			response, err = f.client.Get(fullURL)
-		}
-		// err = error(nil)
-		// globals.SugarLogger.Debug(fullURL)
-		// globals.SugarLogger.Debug(params)
-		if err == nil && response != nil && response.StatusCode == 200 {
-			break
-		} else {
-			globals.SugarLogger.Infof("AccessFreshFood Call %s error:%v, response: %v", fullURL, err, response)
-		}
-	}
-	if err != nil || response.StatusCode != 200 {
-		globals.SugarLogger.Infof("AccessFreshFood finally failed Call %s error:%v, url:%s, response: %v", fullURL, err, fullURL, response)
-		if err != nil {
-			return err
-		}
-		return ErrFreshFooddReturnNot200
-	}
-	return nil
-}
-
-func (f *API) RefreshWeixinToken() error {
-	return f.AccessFreshFood(URL_WX_UPDATE_ACCESSTOKEN, nil)
-}
-
-func (f *API) RefreshElmToken() error {
-	return f.AccessFreshFood(URL_FRESHFOOD_ELEME_TOKENUPDATE, nil)
-}

main.go

@@ -8,10 +8,10 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/promotion"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"git.rosy.net.cn/jx-callback/globals/beegodb"
-	"git.rosy.net.cn/jx-callback/legacy/tasks"
 	_ "git.rosy.net.cn/jx-callback/routers"
 	"github.com/astaxie/beego"
 )