- update

CHANGELOG.md

@@ -1,3 +1,29 @@
+## v1.0.109
+
+- update [goip](utils%2Fgoip)
+- update [gojobs](utils%2Fgojobs)
+- add [wikeyun](service%2Fwikeyun)
+- add [wechatunion](service%2Fwechatunion)
+- add [wechatqy](service%2Fwechatqy)
+- add [wechatpayopen](service%2Fwechatpayopen)
+- add [wechatpayapiv3](service%2Fwechatpayapiv3)
+- add [wechatopen](service%2Fwechatopen)
+- add [wechatoffice](service%2Fwechatoffice)
+- add [wechatminiprogram](service%2Fwechatminiprogram)
+- add [taobao](service%2Ftaobao)
+- add [pintoto](service%2Fpintoto)
+- add [pinduoduo](service%2Fpinduoduo)
+- add [nldyp](service%2Fnldyp)
+- add [meituan](service%2Fmeituan)
+- add [kashangwl](service%2Fkashangwl)
+- add [jd](service%2Fjd)
+- add [feishu](service%2Ffeishu)
+- add [ejiaofei](service%2Fejiaofei)
+- add [eastiot](service%2Feastiot)
+- add [dingtalk](service%2Fdingtalk)
+- add [dingdanxia](service%2Fdingdanxia)
+- add [alipayopen](service%2Falipayopen)
+
 ## v1.0.108
 
 - add [rocron](utils%2Frocron)

library.go

@@ -1,5 +1,5 @@
 package go_library
 
 func Version() string {
-	return "1.0.108"
+	return "1.0.109"
 }

service/alipayopen/api.go

@@ -0,0 +1,17 @@
+package alipayopen
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, c.newParamsWithType(_method, params))
+	if err != nil {
+		return nil, err
+	}
+	return request.ResponseBody, err
+}

service/dingdanxia/api.go

@@ -0,0 +1,25 @@
+package dingdanxia
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/dingtalk/api.go

@@ -0,0 +1,25 @@
+package dingtalk
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/eastiot/api.go

@@ -0,0 +1,25 @@
+package eastiot
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/ejiaofei/api.go

@@ -0,0 +1,25 @@
+package ejiaofei
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/feishu/api.go

@@ -0,0 +1,15 @@
+package feishu
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/jd/api.go

@@ -0,0 +1,14 @@
+package jd
+
+import (
+	"context"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...Params) ([]byte, error) {
+	// 参数
+	params := NewParamsWithType(_method, notMustParams...)
+	// 请求
+	request, err := c.request(ctx, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/kashangwl/api.go

@@ -0,0 +1,34 @@
+package kashangwl
+
+import (
+	"context"
+	"github.com/baidubce/bce-sdk-go/http"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) CacheGet(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.requestCache(ctx, apiUrl+_method, params, http.GET)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) CachePost(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.requestCache(ctx, apiUrl+_method, params, http.POST)
+	// 定义
+	return request.ResponseBody, err
+}

service/meituan/api.go

@@ -0,0 +1,25 @@
+package meituan
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/nldyp/api.go

@@ -0,0 +1,15 @@
+package nldyp
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/pinduoduo/api.go

@@ -0,0 +1,14 @@
+package pinduoduo
+
+import (
+	"context"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...Params) ([]byte, error) {
+	// 参数
+	params := NewParamsWithType(_method, notMustParams...)
+	// 请求
+	request, err := c.request(ctx, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/pintoto/api.go

@@ -0,0 +1,15 @@
+package pintoto
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/taobao/api.go

@@ -0,0 +1,14 @@
+package taobao
+
+import (
+	"context"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...Params) ([]byte, error) {
+	// 参数
+	params := NewParamsWithType(_method, notMustParams...)
+	// 请求
+	request, err := c.request(ctx, params)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatminiprogram/api.go

@@ -0,0 +1,25 @@
+package wechatminiprogram
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatoffice/api.go

@@ -0,0 +1,25 @@
+package wechatoffice
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatopen/api.go

@@ -0,0 +1,25 @@
+package wechatopen
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatpayapiv3/api.go

@@ -0,0 +1,25 @@
+package wechatpayapiv3
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, commonParams bool, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet, commonParams)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, commonParams bool, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost, commonParams)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatpayopen/api.go

@@ -0,0 +1,25 @@
+package wechatpayopen
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatqy/api.go

@@ -0,0 +1,25 @@
+package wechatqy
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wechatunion/api.go

@@ -0,0 +1,25 @@
+package wechatunion
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+	"net/http"
+)
+
+func (c *Client) Get(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodGet)
+	// 定义
+	return request.ResponseBody, err
+}
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params, http.MethodPost)
+	// 定义
+	return request.ResponseBody, err
+}

service/wikeyun/api.go

@@ -0,0 +1,15 @@
+package wikeyun
+
+import (
+	"context"
+	"github.com/dtapps/go-library/utils/gorequest"
+)
+
+func (c *Client) Post(ctx context.Context, _method string, notMustParams ...gorequest.Params) ([]byte, error) {
+	// 参数
+	params := gorequest.NewParamsWith(notMustParams...)
+	// 请求
+	request, err := c.request(ctx, apiUrl+_method, params)
+	// 定义
+	return request.ResponseBody, err
+}

utils/gojobs/gorm_model.go

@@ -131,6 +131,13 @@ func (c *Client) taskFindAll(ctx context.Context, tx *gorm.DB, frequency int64,
 
 // 查询多任务
 func (c *Client) taskFindAllType(ctx context.Context, tx *gorm.DB, Type string, frequency int64, status string) (results []jobs_gorm_model.Task) {
+	if frequency == 0 {
+		err := tx.Where("type = ?", Type).Where("status = ?", status).Order("id asc").Find(&results).Error
+		if err != nil {
+			c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询多任务：%v", err)
+		}
+		return results
+	}
 	err := tx.Where("type = ?", Type).Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
 	if err != nil {
 		c.zapLog.WithTraceId(ctx).Sugar().Errorf("查询多任务：%v", err)
@@ -144,8 +151,8 @@ func (c *Client) TaskFindAllIn(ctx context.Context, tx *gorm.DB, frequency int64
 }
 
 // TaskFindAllInType 查询多任务 - 任务运行
-func (c *Client) TaskFindAllInType(ctx context.Context, tx *gorm.DB, Type string, frequency int64) []jobs_gorm_model.Task {
-	return c.taskFindAllType(ctx, tx, Type, frequency, TASK_IN)
+func (c *Client) TaskFindAllInType(ctx context.Context, tx *gorm.DB, Type string) []jobs_gorm_model.Task {
+	return c.taskFindAllType(ctx, tx, Type, 0, TASK_IN)
 }
 
 // TaskFindAllSuccess 查询多任务 - 任务完成
@@ -154,8 +161,8 @@ func (c *Client) TaskFindAllSuccess(ctx context.Context, tx *gorm.DB, frequency
 }
 
 // TaskFindAllSuccessType 查询多任务 - 任务完成
-func (c *Client) TaskFindAllSuccessType(ctx context.Context, tx *gorm.DB, Type string, frequency int64) []jobs_gorm_model.Task {
-	return c.taskFindAllType(ctx, tx, Type, frequency, TASK_SUCCESS)
+func (c *Client) TaskFindAllSuccessType(ctx context.Context, tx *gorm.DB, Type string) []jobs_gorm_model.Task {
+	return c.taskFindAllType(ctx, tx, Type, 0, TASK_SUCCESS)
 }
 
 // TaskFindAllError 查询多任务 - 任务异常
@@ -164,8 +171,8 @@ func (c *Client) TaskFindAllError(ctx context.Context, tx *gorm.DB, frequency in
 }
 
 // TaskFindAllErrorType 查询多任务 - 任务异常
-func (c *Client) TaskFindAllErrorType(ctx context.Context, tx *gorm.DB, Type string, frequency int64) []jobs_gorm_model.Task {
-	return c.taskFindAllType(ctx, tx, Type, frequency, TASK_ERROR)
+func (c *Client) TaskFindAllErrorType(ctx context.Context, tx *gorm.DB, Type string) []jobs_gorm_model.Task {
+	return c.taskFindAllType(ctx, tx, Type, 0, TASK_ERROR)
 }
 
 // TaskFindAllTimeout 查询多任务 - 任务超时
@@ -174,8 +181,8 @@ func (c *Client) TaskFindAllTimeout(ctx context.Context, tx *gorm.DB, frequency
 }
 
 // TaskFindAllTimeoutType 查询多任务 - 任务超时
-func (c *Client) TaskFindAllTimeoutType(ctx context.Context, tx *gorm.DB, Type string, frequency int64) []jobs_gorm_model.Task {
-	return c.taskFindAllType(ctx, tx, Type, frequency, TASK_TIMEOUT)
+func (c *Client) TaskFindAllTimeoutType(ctx context.Context, tx *gorm.DB, Type string) []jobs_gorm_model.Task {
+	return c.taskFindAllType(ctx, tx, Type, 0, TASK_TIMEOUT)
 }
 
 // TaskFindAllWait 查询多任务 - 任务等待
@@ -184,8 +191,8 @@ func (c *Client) TaskFindAllWait(ctx context.Context, tx *gorm.DB, frequency int
 }
 
 // TaskFindAllWaitType 查询多任务 - 任务等待
-func (c *Client) TaskFindAllWaitType(ctx context.Context, tx *gorm.DB, Type string, frequency int64) []jobs_gorm_model.Task {
-	return c.taskFindAllType(ctx, tx, Type, frequency, TASK_WAIT)
+func (c *Client) TaskFindAllWaitType(ctx context.Context, tx *gorm.DB, Type string) []jobs_gorm_model.Task {
+	return c.taskFindAllType(ctx, tx, Type, 0, TASK_WAIT)
 }
 
 // StartTask 任务启动