update *

service/dingtalk/dingtalk.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"gitee.com/dtapps/go-library/service/dingtalk/config"
 	"gitee.com/dtapps/go-library/service/dingtalk/message"
-	"gitee.com/dtapps/go-library/utils/djson"
+	utilsJson "gitee.com/dtapps/go-library/utils/json"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -30,7 +30,7 @@ func (bot *DingBot) Send(msg message.Message) (response, error) {
 	var response response
 	signStr := sign(timestamp, bot.Secret)
 	dingUrl := fmt.Sprintf("%s?access_token=%s&timestamp=%d&sign=%s", config.Api, bot.AccessToken, timestamp, signStr)
-	toString, err := djson.MarshalToString(msg)
+	toString, err := utilsJson.MarshalToString(msg)
 	if err != nil {
 		return response, err
 	}

service/qywechat/qywechat.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"gitee.com/dtapps/go-library/service/qywechat/config"
 	"gitee.com/dtapps/go-library/service/qywechat/message"
-	"gitee.com/dtapps/go-library/utils/djson"
+	utilsJson "gitee.com/dtapps/go-library/utils/json"
 	"io/ioutil"
 	"net/http"
 	"strings"
@@ -26,7 +26,7 @@ type response struct {
 func (bot *QyBot) Send(msg message.Message) (response, error) {
 	var response response
 	qyUrl := fmt.Sprintf("%s?key=%s", config.Api, bot.Key)
-	toString, err := djson.MarshalToString(msg)
+	toString, err := utilsJson.MarshalToString(msg)
 	if err != nil {
 		return response, err
 	}

utils/decimal/decimal.go

@@ -1,4 +1,4 @@
-package ddecimal
+package decimal
 
 import (
 	"fmt"

utils/decimal/decimal_test.go

@@ -1,4 +1,4 @@
-package ddecimal
+package decimal
 
 import (
 	"fmt"

utils/files/files.go

@@ -1,4 +1,4 @@
-package dfiles
+package files
 
 import (
 	"os"

utils/header/header.go

@@ -1,4 +1,4 @@
-package dheader
+package header
 
 import (
 	"encoding/json"

utils/http/http.go

@@ -1,8 +1,8 @@
-package dhttp
+package http
 
 import (
 	"encoding/json"
-	"gitee.com/dtapps/go-library/utils/drequest"
+	"gitee.com/dtapps/go-library/utils/request"
 	"github.com/bitly/go-simplejson"
 	"gopkg.in/h2non/gentleman.v2"
 	"gopkg.in/h2non/gentleman.v2/plugins/body"
@@ -21,7 +21,7 @@ func GetJson(url string, data string, headers map[string]interface{}) (res []byt
 		// 设置请求首部（Header）
 		req.SetHeader(key, value.(string))
 	}
-	req.SetHeader("User-Agent", drequest.GetUserAgent())
+	req.SetHeader("User-Agent", request.GetUserAgent())
 	// 发送请求，获取响应对象res
 	response, err := req.Send()
 	if err != nil {
@@ -49,7 +49,7 @@ func PostJson(url string, data map[string]interface{}, headers map[string]interf
 		// 设置请求首部（Header）
 		req.SetHeader(key, value.(string))
 	}
-	req.SetHeader("User-Agent", drequest.GetUserAgent())
+	req.SetHeader("User-Agent", request.GetUserAgent())
 	// 发送请求，获取响应对象res
 	response, err := req.Send()
 	if err != nil {
@@ -76,7 +76,7 @@ func PostXml(url string, data map[string]string, headers map[string]interface{})
 		// 设置请求首部（Header）
 		req.SetHeader(key, value.(string))
 	}
-	req.SetHeader("User-Agent", drequest.GetUserAgent())
+	req.SetHeader("User-Agent", request.GetUserAgent())
 	// 发送请求，获取响应对象res
 	response, err := req.Send()
 	if err != nil {

utils/http/http_test.go

@@ -1,4 +1,4 @@
-package dhttp
+package http
 
 import (
 	"fmt"

utils/json/json.go

@@ -1,4 +1,4 @@
-package djson
+package json
 
 import "encoding/json"
 

utils/mail/mail.go

@@ -1,4 +1,4 @@
-package dmail
+package mail
 
 import (
 	"fmt"

utils/md5/md5.go

@@ -1,4 +1,4 @@
-package dmd5
+package md5
 
 import (
 	"crypto/md5"

utils/md5/md5_test.go

@@ -1,4 +1,4 @@
-package dmd5
+package md5
 
 import (
 	"fmt"

utils/preg/preg.go

@@ -1,4 +1,4 @@
-package dpreg
+package preg
 
 import (
 	"regexp"

utils/preg/preg_test.go

@@ -1,4 +1,4 @@
-package dpreg
+package preg
 
 import "testing"
 

utils/redis/Iterator.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 type Iterator struct {
 	data  []interface{}

utils/redis/client.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 import (
 	"context"

utils/redis/operation_attr.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 import "time"
 

utils/redis/redis_test.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 import (
 	"fmt"

utils/redis/simple_cache.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 import (
 	"encoding/json"

utils/redis/slice_result.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 type SliceResult struct {
 	Result []interface{}

utils/redis/string_operation.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 import (
 	"context"

utils/redis/string_result.go

@@ -1,4 +1,4 @@
-package dredis
+package redis
 
 type StringResult struct {
 	Result string

utils/request/request.go

@@ -1,4 +1,4 @@
-package drequest
+package request
 
 import (
 	"errors"

utils/request/request_test.go

@@ -1,4 +1,4 @@
-package drequest
+package request
 
 import (
 	"fmt"

utils/rsa/rsa.go

@@ -1,4 +1,4 @@
-package drsa
+package rsa
 
 import (
 	"crypto/rand"