- update service

.gitignore

@@ -4,6 +4,7 @@
 .idea
 .vscode
 *.log
-git.sh
-gomod.sh
-/*/*_test.go
+*.sh
+*_test.go
+/service/*_test.go
+/utils/*_test.go

gojobs/grpc_build.sh

@@ -1,5 +0,0 @@
-#protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative --grpc-gateway_out . --grpc-gateway_opt paths=source_relative ./pb/basics.proto
-
-protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./pb/basics.proto
-protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./pb/task.proto
-protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative ./pb/pubsub.proto

library_test.go

@@ -1,13 +0,0 @@
-package go_library
-
-import "testing"
-
-func TestVersion(t *testing.T) {
-	t.Log(Version())
-}
-
-func BenchmarkVersion(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Version()
-	}
-}

service/dingdanxia/app.go

@@ -1,9 +1,9 @@
 package dingdanxia
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomongo"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomongo"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 )
 

service/dingdanxia/jd.jy_order_details.go

@@ -2,7 +2,7 @@ package dingdanxia
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/dingdanxia/pgsql.go

@@ -1,9 +1,9 @@
 package dingdanxia
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 

service/dingdanxia/waimai.meituan_orderid.go

@@ -2,7 +2,7 @@ package dingdanxia
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/dingdanxia/waimai.meituan_orders.go

@@ -2,7 +2,7 @@ package dingdanxia
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/dingdanxia/waimai.meituan_privilege.go

@@ -2,7 +2,7 @@ package dingdanxia
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/dingdanxia/waimai.meituan_sg_privilege.go

@@ -2,7 +2,7 @@ package dingdanxia
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/dingtalk/app.go

@@ -1,8 +1,8 @@
 package dingtalk
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 )
 

service/dingtalk/pgsql.go

@@ -1,9 +1,9 @@
 package dingtalk
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 

service/dingtalk/robot.send.go

@@ -3,7 +3,7 @@ package dingtalk
 import (
 	"encoding/json"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 	"time"
 )

service/douyin/api.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/mvdan/xurls"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 	"regexp"
 	"strings"

service/douyin/app.go

@@ -2,8 +2,8 @@ package douyin
 
 import (
 	"errors"
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 	"net/http"
 	"strings"

service/douyin/pgsql.go

@@ -1,9 +1,9 @@
 package douyin
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 

service/eastiot/Iot_api.query_ordered_pkgInfo.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/Iot_api.query_sim_pkgInfo.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/Iot_api.query_user_pkgInfo.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/Iot_api.recharge_sim.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/api.Iot_api.get_all_sim_type.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/app.go

@@ -1,9 +1,9 @@
 package eastiot
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomongo"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomongo"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 	"time"
 )

service/eastiot/lot_api.query_user_balance.go

@@ -2,7 +2,7 @@ package eastiot
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/eastiot/pgsql.go

@@ -1,19 +1,19 @@
 package eastiot
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
+func (app *App) postgresqlLog(request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                     //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                      //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                     //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),  //【返回】头部
@@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                       //【返回】状态码
 		ResponseBody:          request.ResponseBody,                                             //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                    //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                     //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                    //【返回】时间
 	})
 }

service/eastiot/sign.go

@@ -3,7 +3,7 @@ package eastiot
 import (
 	"encoding/json"
 	"fmt"
-	"go.dtapp.net/library/gomd5"
+	"go.dtapp.net/library/utils/gomd5"
 	"sort"
 	"strconv"
 )

service/ejiaofei/app.go

@@ -2,10 +2,10 @@ package ejiaofei
 
 import (
 	"fmt"
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomd5"
-	"go.dtapp.net/library/gomongo"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomd5"
+	"go.dtapp.net/library/utils/gomongo"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 )
 

service/ejiaofei/check_cost.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/chongzhi_jkorders.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/gprs_chongzhi_advance.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/money_jkuser.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/pgsql.go

@@ -1,20 +1,20 @@
 package ejiaofei
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomongo"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomongo"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                                              //【请求】时间
+func (app *App) postgresqlLog(request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                                             //【请求】时间
 		RequestUri:            request.RequestUri,                                                                       //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                                               //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                                              //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                                              //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                                             //【请求】接口
 		RequestMethod:         request.RequestMethod,                                                                    //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),                          //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),                          //【返回】头部
@@ -22,6 +22,6 @@ func (app *App) postgresqlLog(request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                                               //【返回】状态码
 		ResponseBody:          datatypes.JSON(gojson.JsonEncodeNoError(gomongo.XmlDecodeNoError(request.ResponseBody))), //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                                            //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                                             //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                                            //【返回】时间
 	})
 }

service/ejiaofei/query_jkorders.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/query_txproduct.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/ejiaofei/txchongzhi.go

@@ -3,7 +3,7 @@ package ejiaofei
 import (
 	"encoding/xml"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/feishu/app.go

@@ -1,8 +1,8 @@
 package feishu
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 )
 

service/feishu/pgsql.go

@@ -1,19 +1,19 @@
 package feishu
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
+func (app *App) postgresqlLog(request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                     //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                      //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                     //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),  //【返回】头部
@@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                       //【返回】状态码
 		ResponseBody:          request.ResponseBody,                                             //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                    //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                     //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                    //【返回】时间
 	})
 }

service/feishu/webhook.go

@@ -3,7 +3,7 @@ package feishu
 import (
 	"encoding/json"
 	"fmt"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type WebhookSendResponse struct {

service/jd/app.go

@@ -1,9 +1,9 @@
 package jd
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gorequest"
-	"go.dtapp.net/library/gostring"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
+	"go.dtapp.net/library/utils/gostring"
 	"gorm.io/gorm"
 )
 

service/jd/jd.union.open.activity.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenActivityQueryResultResponse struct {

service/jd/jd.union.open.category.goods.get.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenCategoryGoodsGetResultResponse struct {

service/jd/jd.union.open.goods.bigfield.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenGoodsBigfieldQueryResultResponse struct {

service/jd/jd.union.open.goods.jingfen.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenGoodsJIngFenQueryResultResponse struct {

service/jd/jd.union.open.goods.material.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenGoodsMaterialQueryResultResponse struct {

service/jd/jd.union.open.goods.promotiongoodsinfo.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenGoodsPromotionGoodsInfoQueryResultResponse struct {

service/jd/jd.union.open.order.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenOrderQueryResultResponse struct {

service/jd/jd.union.open.order.row.query.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenOrderRowQueryResultResponse struct {

service/jd/jd.union.open.promotion.bysubunionid.get.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenPromotionBySubUnionIdGetResultResponse struct {

service/jd/jd.union.open.promotion.common.get.go

@@ -2,7 +2,7 @@ package jd
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type UnionOpenPromotionCommonGetResultResponse struct {

service/jd/pgsql.go

@@ -1,18 +1,18 @@
 package jd
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(api string, request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
+func (app *App) postgresqlLog(api string, request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                     //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
 		RequestApi:            api,                                                              //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
@@ -21,6 +21,6 @@ func (app *App) postgresqlLog(api string, request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                       //【返回】状态码
 		ResponseBody:          request.ResponseBody,                                             //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                    //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                     //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                    //【返回】时间
 	})
 }

service/kashangwl/api.buy.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiBuyResponse struct {

service/kashangwl/api.customer.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiCustomerResponse struct {

service/kashangwl/api.order.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiOrderResponse struct {

service/kashangwl/api.outer-order.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiOuterOrderResponse struct {

service/kashangwl/api.product.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiProductResponse struct {

service/kashangwl/api.product.recharge-params.go

@@ -2,7 +2,7 @@ package kashangwl
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 )
 
 type ApiProductRechargeParamsResponse struct {

service/kashangwl/app.go

@@ -1,8 +1,8 @@
 package kashangwl
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 	"time"
 )

service/kashangwl/pgsql.go

@@ -1,19 +1,19 @@
 package kashangwl
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
+func (app *App) postgresqlLog(request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                     //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                      //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                     //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),  //【返回】头部
@@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                       //【返回】状态码
 		ResponseBody:          request.ResponseBody,                                             //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                    //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                     //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                    //【返回】时间
 	})
 }

service/kashangwl/sign.go

@@ -5,7 +5,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"io"
 	"net/url"
 	"sort"

service/kuaishou/app.go

@@ -1,9 +1,9 @@
 package kuaishou
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomongo"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomongo"
+	"go.dtapp.net/library/utils/gorequest"
 	"gorm.io/gorm"
 )
 

service/kuaishou/mongo.go

@@ -1,26 +1,25 @@
-package wechatpayapiv2
+package kuaishou
 
 import (
-	gomongo2 "go.dtapp.net/library/gomongo"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gomongo"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 
 // 日志
 type mongoZap struct {
-	RequestTime           gomongo2.BsonTime      `json:"request_time" bson:"request_time"`                       //【请求】时间
+	RequestTime           gomongo.BsonTime       `json:"request_time" bson:"request_time"`                       //【请求】时间
 	RequestUri            string                 `json:"request_uri" bson:"request_uri"`                         //【请求】链接
 	RequestUrl            string                 `json:"request_url" bson:"request_url"`                         //【请求】链接
 	RequestApi            string                 `json:"request_api" bson:"request_api"`                         //【请求】接口
 	RequestMethod         string                 `json:"request_method" bson:"request_method"`                   //【请求】方式
-	RequestParams         gorequest.Params       `json:"request_params" bson:"request_params"`                   //【请求】参数
-	RequestHeader         gorequest.Headers      `json:"request_header" bson:"request_header"`                   //【请求】头部
+	RequestParams         gorequest2.Params      `json:"request_params" bson:"request_params"`                   //【请求】参数
+	RequestHeader         gorequest2.Headers     `json:"request_header" bson:"request_header"`                   //【请求】头部
 	ResponseHeader        http.Header            `json:"response_header" bson:"response_header"`                 //【返回】头部
 	ResponseStatusCode    int                    `json:"response_status_code" bson:"response_status_code"`       //【返回】状态码
 	ResponseBody          map[string]interface{} `json:"response_body" bson:"response_body"`                     //【返回】内容
-	ResponseXml           string                 `json:"response_xml" bson:"response_xml"`                       //【返回】内容
 	ResponseContentLength int64                  `json:"response_content_length" bson:"response_content_length"` //【返回】大小
-	ResponseTime          gomongo2.BsonTime      `json:"response_time" bson:"response_time"`                     //【返回】时间
+	ResponseTime          gomongo.BsonTime       `json:"response_time" bson:"response_time"`                     //【返回】时间
 }
 
 func (m *mongoZap) Database() string {
@@ -28,23 +27,22 @@ func (m *mongoZap) Database() string {
 }
 
 func (m *mongoZap) TableName() string {
-	return "wechatpayapiv2"
+	return "kuaishou"
 }
 
-func (app *App) mongoLog(request gorequest.Response) {
+func (app *App) mongoLog(request gorequest2.Response) {
 	_, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{
-		RequestTime:           gomongo2.BsonTime(request.RequestTime),          //【请求】时间
+		RequestTime:           gomongo.BsonTime(request.RequestTime),           //【请求】时间
 		RequestUri:            request.RequestUri,                              //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,      //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,     //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,     //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,    //【请求】接口
 		RequestMethod:         request.RequestMethod,                           //【请求】方式
 		RequestParams:         request.RequestParams,                           //【请求】参数
 		RequestHeader:         request.RequestHeader,                           //【请求】头部
 		ResponseHeader:        request.ResponseHeader,                          //【返回】头部
 		ResponseStatusCode:    request.ResponseStatusCode,                      //【返回】状态码
-		ResponseBody:          gomongo2.XmlDecodeNoError(request.ResponseBody), //【返回】内容
-		ResponseXml:           string(request.ResponseBody),                    //【返回】内容
+		ResponseBody:          gomongo.JsonDecodeNoError(request.ResponseBody), //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                   //【返回】大小
-		ResponseTime:          gomongo2.BsonTime(request.ResponseTime),         //【返回】时间
+		ResponseTime:          gomongo.BsonTime(request.ResponseTime),          //【返回】时间
 	})
 }

service/kuaishou/pgsql.go

@@ -1,19 +1,19 @@
 package kuaishou
 
 import (
-	"go.dtapp.net/library/gojson"
-	golog "go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	golog2 "go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
-		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
+func (app *App) postgresqlLog(request gorequest2.Response) {
+	app.log.Record(golog2.ApiPostgresqlLog{
+		RequestTime:           golog2.TimeString{Time: request.RequestTime},                     //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                      //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                     //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),  //【返回】头部
@@ -21,6 +21,6 @@ func (app *App) postgresqlLog(request gorequest.Response) {
 		ResponseStatusCode:    request.ResponseStatusCode,                                       //【返回】状态码
 		ResponseBody:          request.ResponseBody,                                             //【返回】内容
 		ResponseContentLength: request.ResponseContentLength,                                    //【返回】大小
-		ResponseTime:          golog.TimeString{Time: request.ResponseTime},                     //【返回】时间
+		ResponseTime:          golog2.TimeString{Time: request.ResponseTime},                    //【返回】时间
 	})
 }

service/leshuazf/apiv2.merchant.updateAuthority.go

@@ -2,7 +2,7 @@ package leshuazf
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/leshuazf/app.go

@@ -1,11 +1,11 @@
 package leshuazf
 
 import (
-	"go.dtapp.net/library/golog"
-	"go.dtapp.net/library/gomongo"
-	"go.dtapp.net/library/gorandom"
-	"go.dtapp.net/library/gorequest"
-	"go.dtapp.net/library/gotime"
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gomongo"
+	"go.dtapp.net/library/utils/gorandom"
+	"go.dtapp.net/library/utils/gorequest"
+	"go.dtapp.net/library/utils/gotime"
 	"gorm.io/gorm"
 )
 

service/leshuazf/data.area.go

@@ -2,7 +2,7 @@ package leshuazf
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/leshuazf/data.bankbranch2.go

@@ -2,7 +2,7 @@ package leshuazf
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/leshuazf/data.mcc.go

@@ -2,7 +2,7 @@ package leshuazf
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 

service/leshuazf/mongo.go

@@ -1,25 +1,25 @@
 package leshuazf
 
 import (
-	gomongo2 "go.dtapp.net/library/gomongo"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gomongo"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 
 // 日志
 type mongoZap struct {
-	RequestTime           gomongo2.BsonTime      `json:"request_time" bson:"request_time"`                       //【请求】时间
+	RequestTime           gomongo.BsonTime       `json:"request_time" bson:"request_time"`                       //【请求】时间
 	RequestUri            string                 `json:"request_uri" bson:"request_uri"`                         //【请求】链接
 	RequestUrl            string                 `json:"request_url" bson:"request_url"`                         //【请求】链接
 	RequestApi            string                 `json:"request_api" bson:"request_api"`                         //【请求】接口
 	RequestMethod         string                 `json:"request_method" bson:"request_method"`                   //【请求】方式
-	RequestParams         gorequest.Params       `json:"request_params" bson:"request_params"`                   //【请求】参数
-	RequestHeader         gorequest.Headers      `json:"request_header" bson:"request_header"`                   //【请求】头部
+	RequestParams         gorequest2.Params      `json:"request_params" bson:"request_params"`                   //【请求】参数
+	RequestHeader         gorequest2.Headers     `json:"request_header" bson:"request_header"`                   //【请求】头部
 	ResponseHeader        http.Header            `json:"response_header" bson:"response_header"`                 //【返回】头部
 	ResponseStatusCode    int                    `json:"response_status_code" bson:"response_status_code"`       //【返回】状态码
 	ResponseBody          map[string]interface{} `json:"response_body" bson:"response_body"`                     //【返回】内容
 	ResponseContentLength int64                  `json:"response_content_length" bson:"response_content_length"` //【返回】大小
-	ResponseTime          gomongo2.BsonTime      `json:"response_time" bson:"response_time"`                     //【返回】时间
+	ResponseTime          gomongo.BsonTime       `json:"response_time" bson:"response_time"`                     //【返回】时间
 }
 
 func (m *mongoZap) Database() string {
@@ -30,19 +30,19 @@ func (m *mongoZap) TableName() string {
 	return "leshuazf"
 }
 
-func (app *App) mongoLog(request gorequest.Response) {
+func (app *App) mongoLog(request gorequest2.Response) {
 	_, _ = app.mongo.Model(&mongoZap{}).InsertOne(mongoZap{
-		RequestTime:           gomongo2.BsonTime(request.RequestTime),           //【请求】时间
-		RequestUri:            request.RequestUri,                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,      //【请求】接口
-		RequestMethod:         request.RequestMethod,                            //【请求】方式
-		RequestParams:         request.RequestParams,                            //【请求】参数
-		RequestHeader:         request.RequestHeader,                            //【请求】头部
-		ResponseHeader:        request.ResponseHeader,                           //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                       //【返回】状态码
-		ResponseBody:          gomongo2.JsonDecodeNoError(request.ResponseBody), //【返回】内容
-		ResponseContentLength: request.ResponseContentLength,                    //【返回】大小
-		ResponseTime:          gomongo2.BsonTime(request.ResponseTime),          //【返回】时间
+		RequestTime:           gomongo.BsonTime(request.RequestTime),           //【请求】时间
+		RequestUri:            request.RequestUri,                              //【请求】链接
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,     //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,    //【请求】接口
+		RequestMethod:         request.RequestMethod,                           //【请求】方式
+		RequestParams:         request.RequestParams,                           //【请求】参数
+		RequestHeader:         request.RequestHeader,                           //【请求】头部
+		ResponseHeader:        request.ResponseHeader,                          //【返回】头部
+		ResponseStatusCode:    request.ResponseStatusCode,                      //【返回】状态码
+		ResponseBody:          gomongo.JsonDecodeNoError(request.ResponseBody), //【返回】内容
+		ResponseContentLength: request.ResponseContentLength,                   //【返回】大小
+		ResponseTime:          gomongo.BsonTime(request.ResponseTime),          //【返回】时间
 	})
 }

service/leshuazf/pgsql.go

@@ -1,19 +1,19 @@
 package leshuazf
 
 import (
-	"go.dtapp.net/library/gojson"
-	"go.dtapp.net/library/golog"
-	gorequest "go.dtapp.net/library/gorequest"
+	"go.dtapp.net/library/utils/gojson"
+	"go.dtapp.net/library/utils/golog"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"gorm.io/datatypes"
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
+func (app *App) postgresqlLog(request gorequest2.Response) {
 	app.log.Api.Record(golog.ApiPostgresqlLog{
 		RequestTime:           request.RequestTime,                                              //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
-		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接
-		RequestApi:            gorequest.UriParse(request.RequestUri).Path,                      //【请求】接口
+		RequestUrl:            gorequest2.UriParse(request.RequestUri).Url,                      //【请求】链接
+		RequestApi:            gorequest2.UriParse(request.RequestUri).Path,                     //【请求】接口
 		RequestMethod:         request.RequestMethod,                                            //【请求】方式
 		RequestParams:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
 		RequestHeader:         datatypes.JSON(gojson.JsonEncodeNoError(request.RequestHeader)),  //【返回】头部

service/leshuazf/sign.go

@@ -2,8 +2,8 @@ package leshuazf
 
 import (
 	"encoding/json"
-	"go.dtapp.net/library/gobase64"
-	"go.dtapp.net/library/gomd5"
+	"go.dtapp.net/library/utils/gobase64"
+	"go.dtapp.net/library/utils/gomd5"
 	"sort"
 )
 

service/meituan/api.generate_link.go

@@ -2,7 +2,7 @@ package meituan
 
 import (
 	"encoding/json"
-	gorequest "go.dtapp.net/library/gorequest"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 
@@ -15,11 +15,11 @@ type ApiGenerateLinkResponse struct {
 type ApiGenerateLinkResult struct {
 	Result ApiGenerateLinkResponse // 结果
 	Body   []byte                  // 内容
-	Http   gorequest.Response      // 请求
+	Http   gorequest2.Response     // 请求
 	Err    error                   // 错误
 }
 
-func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http gorequest.Response, err error) *ApiGenerateLinkResult {
+func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http gorequest2.Response, err error) *ApiGenerateLinkResult {
 	return &ApiGenerateLinkResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -27,14 +27,14 @@ func NewApiGenerateLinkResult(result ApiGenerateLinkResponse, body []byte, http
 // https://union.meituan.com/v2/apiDetail?id=25
 func (app *App) ApiGenerateLink(actId int64, sid string, linkType, shortLink int) *ApiGenerateLinkResult {
 	// 参数
-	param := gorequest.NewParams()
+	param := gorequest2.NewParams()
 	param.Set("actId", actId)         // 活动id，可以在联盟活动列表中查看获取
 	param.Set("appkey", app.appKey)   // 媒体名称，可在推广者备案-媒体管理中查询
 	param.Set("sid", sid)             // 推广位sid，支持通过接口自定义创建，不受平台200个上限限制，长度不能超过64个字符，支持小写字母和数字，历史已创建的推广位不受这个约束
 	param.Set("linkType", linkType)   // 投放链接的类型
 	param.Set("shortLink", shortLink) // 获取长链还是短链
 	// 转换
-	params := gorequest.NewParamsWith(param)
+	params := gorequest2.NewParamsWith(param)
 	params["sign"] = app.getSign(app.secret, params)
 	// 请求
 	request, err := app.request("https://openapi.meituan.com/api/generateLink", params, http.MethodGet)

service/meituan/api.getqualityscorebysid.go

@@ -2,8 +2,8 @@ package meituan
 
 import (
 	"encoding/json"
-	gorequest "go.dtapp.net/library/gorequest"
-	"go.dtapp.net/library/gotime"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
+	"go.dtapp.net/library/utils/gotime"
 	"net/http"
 )
 
@@ -24,19 +24,19 @@ type ApiGetQuaLitYsCoreBySidResponse struct {
 type ApiGetQuaLitYsCoreBySidResult struct {
 	Result ApiGetQuaLitYsCoreBySidResponse // 结果
 	Body   []byte                          // 内容
-	Http   gorequest.Response              // 请求
+	Http   gorequest2.Response             // 请求
 	Err    error                           // 错误
 }
 
-func NewApiGetQuaLitYsCoreBySidResult(result ApiGetQuaLitYsCoreBySidResponse, body []byte, http gorequest.Response, err error) *ApiGetQuaLitYsCoreBySidResult {
+func NewApiGetQuaLitYsCoreBySidResult(result ApiGetQuaLitYsCoreBySidResponse, body []byte, http gorequest2.Response, err error) *ApiGetQuaLitYsCoreBySidResult {
 	return &ApiGetQuaLitYsCoreBySidResult{Result: result, Body: body, Http: http, Err: err}
 }
 
 // ApiGetQuaLitYsCoreBySid 优选sid质量分&复购率查询
 // https://union.meituan.com/v2/apiDetail?id=28
-func (app *App) ApiGetQuaLitYsCoreBySid(notMustParams ...gorequest.Params) *ApiGetQuaLitYsCoreBySidResult {
+func (app *App) ApiGetQuaLitYsCoreBySid(notMustParams ...gorequest2.Params) *ApiGetQuaLitYsCoreBySidResult {
 	// 参数
-	params := gorequest.NewParamsWith(notMustParams...)
+	params := gorequest2.NewParamsWith(notMustParams...)
 	// 请求时刻10位时间戳(秒级)，有效期60s
 	params["ts"] = gotime.Current().Timestamp()
 	params["appkey"] = app.appKey

service/meituan/api.mini_code.go

@@ -2,7 +2,7 @@ package meituan
 
 import (
 	"encoding/json"
-	gorequest "go.dtapp.net/library/gorequest"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 
@@ -15,11 +15,11 @@ type ApiMiniCodeResponse struct {
 type ApiMiniCodeResult struct {
 	Result ApiMiniCodeResponse // 结果
 	Body   []byte              // 内容
-	Http   gorequest.Response  // 请求
+	Http   gorequest2.Response // 请求
 	Err    error               // 错误
 }
 
-func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http gorequest.Response, err error) *ApiMiniCodeResult {
+func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http gorequest2.Response, err error) *ApiMiniCodeResult {
 	return &ApiMiniCodeResult{Result: result, Body: body, Http: http, Err: err}
 }
 
@@ -27,12 +27,12 @@ func NewApiMiniCodeResult(result ApiMiniCodeResponse, body []byte, http goreques
 // https://union.meituan.com/v2/apiDetail?id=26
 func (app *App) ApiMiniCode(actId int64, sid string) *ApiMiniCodeResult {
 	// 参数
-	param := gorequest.NewParams()
+	param := gorequest2.NewParams()
 	param.Set("appkey", app.appKey)
 	param.Set("sid", sid)
 	param.Set("actId", actId)
 	// 转换
-	params := gorequest.NewParamsWith(param)
+	params := gorequest2.NewParamsWith(param)
 	params["sign"] = app.getSign(app.secret, params)
 	// 请求
 	request, err := app.request("https://openapi.meituan.com/api/miniCode", params, http.MethodGet)

service/meituan/api.order.go

@@ -2,7 +2,7 @@ package meituan
 
 import (
 	"encoding/json"
-	gorequest "go.dtapp.net/library/gorequest"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
 	"net/http"
 )
 
@@ -35,21 +35,21 @@ type ApiOrderResponse struct {
 }
 
 type ApiOrderResult struct {
-	Result ApiOrderResponse   // 结果
-	Body   []byte             // 内容
-	Http   gorequest.Response // 请求
-	Err    error              // 错误
+	Result ApiOrderResponse    // 结果
+	Body   []byte              // 内容
+	Http   gorequest2.Response // 请求
+	Err    error               // 错误
 }
 
-func NewApiOrderResult(result ApiOrderResponse, body []byte, http gorequest.Response, err error) *ApiOrderResult {
+func NewApiOrderResult(result ApiOrderResponse, body []byte, http gorequest2.Response, err error) *ApiOrderResult {
 	return &ApiOrderResult{Result: result, Body: body, Http: http, Err: err}
 }
 
 // ApiOrder 单订单查询接口（新版）
 // https://union.meituan.com/v2/apiDetail?id=24
-func (app *App) ApiOrder(notMustParams ...gorequest.Params) *ApiOrderResult {
+func (app *App) ApiOrder(notMustParams ...gorequest2.Params) *ApiOrderResult {
 	// 参数
-	params := gorequest.NewParamsWith(notMustParams...)
+	params := gorequest2.NewParamsWith(notMustParams...)
 	// 请求时刻10位时间戳(秒级)，有效期60s
 	params["appkey"] = app.appKey
 	params["sign"] = app.getSign(app.secret, params)

service/meituan/api.order_list.go

@@ -2,8 +2,8 @@ package meituan
 
 import (
 	"encoding/json"
-	gorequest "go.dtapp.net/library/gorequest"
-	"go.dtapp.net/library/gotime"
+	gorequest2 "go.dtapp.net/library/utils/gorequest"
+	"go.dtapp.net/library/utils/gotime"
 	"net/http"
 )
 
@@ -36,19 +36,19 @@ type ApiOrderListResponse struct {
 type ApiOrderListResult struct {
 	Result ApiOrderListResponse // 结果
 	Body   []byte               // 内容
-	Http   gorequest.Response   // 请求
+	Http   gorequest2.Response  // 请求
 	Err    error                // 错误
 }
 
-func NewApiOrderListResult(result ApiOrderListResponse, body []byte, http gorequest.Response, err error) *ApiOrderListResult {
+func NewApiOrderListResult(result ApiOrderListResponse, body []byte, http gorequest2.Response, err error) *ApiOrderListResult {
 	return &ApiOrderListResult{Result: result, Body: body, Http: http, Err: err}
 }
 
 // ApiOrderList 订单列表查询接口（新版）
 // https://union.meituan.com/v2/apiDetail?id=23
-func (app *App) ApiOrderList(notMustParams ...gorequest.Params) *ApiOrderListResult {
+func (app *App) ApiOrderList(notMustParams ...gorequest2.Params) *ApiOrderListResult {
 	// 参数
-	params := gorequest.NewParamsWith(notMustParams...)
+	params := gorequest2.NewParamsWith(notMustParams...)
 	// 请求时刻10位时间戳(秒级)，有效期60s
 	params["ts"] = gotime.Current().Timestamp()
 	params["appkey"] = app.appKey