- update service/dingtalk

service/dingtalk/app.go

@@ -1,63 +0,0 @@
-package dingtalk
-
-import (
-	"go.dtapp.net/library/utils/golog"
-	"go.dtapp.net/library/utils/gorequest"
-	"gorm.io/gorm"
-)
-
-type App struct {
-	secret       string
-	accessToken  string
-	pgsql        *gorm.DB       // pgsql数据库
-	client       *gorequest.App // 请求客户端
-	log          *golog.Api     // 日志服务
-	logTableName string         // 日志表名
-	logStatus    bool           // 日志状态
-}
-
-func NewApp(secret, accessToken string, pgsql *gorm.DB) *App {
-	app := &App{secret: secret, accessToken: accessToken}
-	app.client = gorequest.NewHttp()
-	if pgsql != nil {
-		app.pgsql = pgsql
-		app.logStatus = true
-		app.logTableName = "dingtalk"
-		app.log = golog.NewApi(&golog.ApiConfig{
-			Db:        pgsql,
-			TableName: app.logTableName,
-		})
-	}
-	return app
-}
-
-func (app *App) request(url string, params map[string]interface{}, method string) (resp gorequest.Response, err error) {
-
-	// 创建请求
-	client := app.client
-
-	// 设置请求地址
-	client.SetUri(url)
-
-	// 设置方式
-	client.SetMethod(method)
-
-	// 设置格式
-	client.SetContentTypeJson()
-
-	// 设置参数
-	client.SetParams(params)
-
-	// 发起请求
-	request, err := client.Request()
-	if err != nil {
-		return gorequest.Response{}, err
-	}
-
-	// 日志
-	if app.logStatus == true {
-		go app.postgresqlLog(request)
-	}
-
-	return request, err
-}

service/dingtalk/client.go

@@ -0,0 +1,69 @@
+package dingtalk
+
+import (
+	"go.dtapp.net/library/utils/golog"
+	"go.dtapp.net/library/utils/gorequest"
+	"gorm.io/gorm"
+)
+
+type ConfigClient struct {
+	Secret      string
+	AccessToken string
+	PgsqlDb     *gorm.DB // pgsql数据库
+}
+
+type Client struct {
+	client       *gorequest.App // 请求客户端
+	log          *golog.Api     // 日志服务
+	logTableName string         // 日志表名
+	logStatus    bool           // 日志状态
+	config       *ConfigClient  // 配置
+}
+
+func NewClient(config *ConfigClient) *Client {
+
+	c := &Client{config: config}
+
+	c.client = gorequest.NewHttp()
+	if c.config.PgsqlDb != nil {
+		c.logStatus = true
+		c.logTableName = "dingtalk"
+		c.log = golog.NewApi(&golog.ApiConfig{
+			Db:        c.config.PgsqlDb,
+			TableName: c.logTableName,
+		})
+	}
+
+	return c
+}
+
+func (c *Client) request(url string, params map[string]interface{}, method string) (resp gorequest.Response, err error) {
+
+	// 创建请求
+	client := c.client
+
+	// 设置请求地址
+	client.SetUri(url)
+
+	// 设置方式
+	client.SetMethod(method)
+
+	// 设置格式
+	client.SetContentTypeJson()
+
+	// 设置参数
+	client.SetParams(params)
+
+	// 发起请求
+	request, err := client.Request()
+	if err != nil {
+		return gorequest.Response{}, err
+	}
+
+	// 日志
+	if c.logStatus == true {
+		go c.postgresqlLog(request)
+	}
+
+	return request, err
+}

service/dingtalk/log.go

@@ -8,8 +8,8 @@ import (
 )
 
 // 记录日志
-func (app *App) postgresqlLog(request gorequest.Response) {
-	app.log.Record(golog.ApiPostgresqlLog{
+func (c *Client) postgresqlLog(request gorequest.Response) {
+	c.log.Record(golog.ApiPostgresqlLog{
 		RequestTime:           golog.TimeString{Time: request.RequestTime},                      //【请求】时间
 		RequestUri:            request.RequestUri,                                               //【请求】链接
 		RequestUrl:            gorequest.UriParse(request.RequestUri).Url,                       //【请求】链接

service/dingtalk/params.go

@@ -1,27 +0,0 @@
-package dingtalk
-
-// Params 请求参数
-type Params map[string]interface{}
-
-func NewParams() Params {
-	p := make(Params)
-	return p
-}
-
-func (app *App) NewParamsWith(params ...Params) Params {
-	p := make(Params)
-	for _, v := range params {
-		p.SetParams(v)
-	}
-	return p
-}
-
-func (p Params) Set(key string, value interface{}) {
-	p[key] = value
-}
-
-func (p Params) SetParams(params Params) {
-	for key, value := range params {
-		p[key] = value
-	}
-}

service/dingtalk/robot.send.go

@@ -26,13 +26,13 @@ func NewRobotSendResult(result RobotSendResponse, body []byte, http gorequest.Re
 
 // RobotSend 自定义机器人
 // https://open.dingtalk.com/document/group/custom-robot-access
-func (app *App) RobotSend(notMustParams ...Params) *RobotSendResult {
+func (c *Client) RobotSend(notMustParams ...gorequest.Params) *RobotSendResult {
 	// 参数
-	params := app.NewParamsWith(notMustParams...)
+	params := gorequest.NewParamsWith(notMustParams...)
 	// 时间
 	timestamp := time.Now().UnixNano() / 1e6
 	// 请求
-	request, err := app.request(fmt.Sprintf("https://oapi.dingtalk.com/robot/send?access_token=%s&timestamp=%d&sign=%s", app.accessToken, timestamp, app.sign(timestamp)), params, http.MethodPost)
+	request, err := c.request(fmt.Sprintf("https://oapi.dingtalk.com/robot/send?access_token=%s&timestamp=%d&sign=%s", c.config.AccessToken, timestamp, c.sign(timestamp)), params, http.MethodPost)
 	// 定义
 	var response RobotSendResponse
 	err = json.Unmarshal(request.ResponseBody, &response)

service/dingtalk/sign.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 )
 
-func (app *App) sign(t int64) string {
-	secStr := fmt.Sprintf("%d\n%s", t, app.secret)
-	hmac256 := hmac.New(sha256.New, []byte(app.secret))
+func (c *Client) sign(t int64) string {
+	secStr := fmt.Sprintf("%d\n%s", t, c.config.Secret)
+	hmac256 := hmac.New(sha256.New, []byte(c.config.Secret))
 	hmac256.Write([]byte(secStr))
 	result := hmac256.Sum(nil)
 	return base64.StdEncoding.EncodeToString(result)