From f08cd6f899c2bde72cf62d6e954f0ed9509a5da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Thu, 19 Aug 2021 13:44:15 +0800 Subject: [PATCH] update * --- service/dingtalk/dingtalk.go | 4 ++-- ...nfo_get_ShowDate.go => movie_info_get_show_date.go} | 0 service/qywechat/qywechat.go | 4 ++-- utils/{ddecimal/ddecimal.go => decimal/decimal.go} | 2 +- .../ddecimal_test.go => decimal/decimal_test.go} | 2 +- utils/{dfiles/dfiles.go => files/files.go} | 2 +- utils/{dheader => header}/header.go | 2 +- utils/{dhttp/dhttp.go => http/http.go} | 10 +++++----- utils/{dhttp/dhttp_test.go => http/http_test.go} | 2 +- utils/{djson/djson.go => json/json.go} | 2 +- utils/{dmail/dmail.go => mail/mail.go} | 2 +- utils/{dmd5/dmd5.go => md5/md5.go} | 2 +- utils/{dmd5/dmd5_test.go => md5/md5_test.go} | 2 +- utils/{dpreg/dpreg.go => preg/preg.go} | 2 +- utils/{dpreg/dpreg_test.go => preg/preg_test.go} | 2 +- utils/{dredis => redis}/Iterator.go | 2 +- utils/{dredis => redis}/client.go | 2 +- utils/{dredis => redis}/operation_attr.go | 2 +- utils/{dredis/dredis_test.go => redis/redis_test.go} | 2 +- utils/{dredis => redis}/simple_cache.go | 2 +- utils/{dredis => redis}/slice_result.go | 2 +- utils/{dredis => redis}/string_operation.go | 2 +- utils/{dredis => redis}/string_result.go | 2 +- utils/{drequest/drequest.go => request/request.go} | 2 +- .../drequest_test.go => request/request_test.go} | 2 +- utils/{drsa/drsa.go => rsa/rsa.go} | 2 +- 26 files changed, 31 insertions(+), 31 deletions(-) rename service/movieapiv2/{movie_info_get_ShowDate.go => movie_info_get_show_date.go} (100%) rename utils/{ddecimal/ddecimal.go => decimal/decimal.go} (91%) rename utils/{ddecimal/ddecimal_test.go => decimal/decimal_test.go} (84%) rename utils/{dfiles/dfiles.go => files/files.go} (98%) rename utils/{dheader => header}/header.go (97%) rename utils/{dhttp/dhttp.go => http/http.go} (92%) rename utils/{dhttp/dhttp_test.go => http/http_test.go} (89%) rename utils/{djson/djson.go => json/json.go} (95%) rename utils/{dmail/dmail.go => mail/mail.go} (98%) rename utils/{dmd5/dmd5.go => md5/md5.go} (98%) rename utils/{dmd5/dmd5_test.go => md5/md5_test.go} (87%) rename utils/{dpreg/dpreg.go => preg/preg.go} (98%) rename utils/{dpreg/dpreg_test.go => preg/preg_test.go} (78%) rename utils/{dredis => redis}/Iterator.go (96%) rename utils/{dredis => redis}/client.go (99%) rename utils/{dredis => redis}/operation_attr.go (97%) rename utils/{dredis/dredis_test.go => redis/redis_test.go} (99%) rename utils/{dredis => redis}/simple_cache.go (99%) rename utils/{dredis => redis}/slice_result.go (97%) rename utils/{dredis => redis}/string_operation.go (98%) rename utils/{dredis => redis}/string_result.go (97%) rename utils/{drequest/drequest.go => request/request.go} (99%) rename utils/{drequest/drequest_test.go => request/request_test.go} (84%) rename utils/{drsa/drsa.go => rsa/rsa.go} (99%) diff --git a/service/dingtalk/dingtalk.go b/service/dingtalk/dingtalk.go index 891823a4..9cc226c4 100644 --- a/service/dingtalk/dingtalk.go +++ b/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×tamp=%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 } diff --git a/service/movieapiv2/movie_info_get_ShowDate.go b/service/movieapiv2/movie_info_get_show_date.go similarity index 100% rename from service/movieapiv2/movie_info_get_ShowDate.go rename to service/movieapiv2/movie_info_get_show_date.go diff --git a/service/qywechat/qywechat.go b/service/qywechat/qywechat.go index cc4d1e6b..9ace264d 100644 --- a/service/qywechat/qywechat.go +++ b/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 } diff --git a/utils/ddecimal/ddecimal.go b/utils/decimal/decimal.go similarity index 91% rename from utils/ddecimal/ddecimal.go rename to utils/decimal/decimal.go index abff0b39..5fd0f590 100644 --- a/utils/ddecimal/ddecimal.go +++ b/utils/decimal/decimal.go @@ -1,4 +1,4 @@ -package ddecimal +package decimal import ( "fmt" diff --git a/utils/ddecimal/ddecimal_test.go b/utils/decimal/decimal_test.go similarity index 84% rename from utils/ddecimal/ddecimal_test.go rename to utils/decimal/decimal_test.go index 02683cec..23f81351 100644 --- a/utils/ddecimal/ddecimal_test.go +++ b/utils/decimal/decimal_test.go @@ -1,4 +1,4 @@ -package ddecimal +package decimal import ( "fmt" diff --git a/utils/dfiles/dfiles.go b/utils/files/files.go similarity index 98% rename from utils/dfiles/dfiles.go rename to utils/files/files.go index 83c386dd..877d2f08 100644 --- a/utils/dfiles/dfiles.go +++ b/utils/files/files.go @@ -1,4 +1,4 @@ -package dfiles +package files import ( "os" diff --git a/utils/dheader/header.go b/utils/header/header.go similarity index 97% rename from utils/dheader/header.go rename to utils/header/header.go index e5a918b8..9dba8720 100644 --- a/utils/dheader/header.go +++ b/utils/header/header.go @@ -1,4 +1,4 @@ -package dheader +package header import ( "encoding/json" diff --git a/utils/dhttp/dhttp.go b/utils/http/http.go similarity index 92% rename from utils/dhttp/dhttp.go rename to utils/http/http.go index 011711eb..f1700131 100644 --- a/utils/dhttp/dhttp.go +++ b/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 { diff --git a/utils/dhttp/dhttp_test.go b/utils/http/http_test.go similarity index 89% rename from utils/dhttp/dhttp_test.go rename to utils/http/http_test.go index 73c1161c..bc07a699 100644 --- a/utils/dhttp/dhttp_test.go +++ b/utils/http/http_test.go @@ -1,4 +1,4 @@ -package dhttp +package http import ( "fmt" diff --git a/utils/djson/djson.go b/utils/json/json.go similarity index 95% rename from utils/djson/djson.go rename to utils/json/json.go index bd6074b4..f6c7755e 100644 --- a/utils/djson/djson.go +++ b/utils/json/json.go @@ -1,4 +1,4 @@ -package djson +package json import "encoding/json" diff --git a/utils/dmail/dmail.go b/utils/mail/mail.go similarity index 98% rename from utils/dmail/dmail.go rename to utils/mail/mail.go index 521693d6..b89f0943 100644 --- a/utils/dmail/dmail.go +++ b/utils/mail/mail.go @@ -1,4 +1,4 @@ -package dmail +package mail import ( "fmt" diff --git a/utils/dmd5/dmd5.go b/utils/md5/md5.go similarity index 98% rename from utils/dmd5/dmd5.go rename to utils/md5/md5.go index 8250e70e..3013168a 100644 --- a/utils/dmd5/dmd5.go +++ b/utils/md5/md5.go @@ -1,4 +1,4 @@ -package dmd5 +package md5 import ( "crypto/md5" diff --git a/utils/dmd5/dmd5_test.go b/utils/md5/md5_test.go similarity index 87% rename from utils/dmd5/dmd5_test.go rename to utils/md5/md5_test.go index ccd8732a..92ce521b 100644 --- a/utils/dmd5/dmd5_test.go +++ b/utils/md5/md5_test.go @@ -1,4 +1,4 @@ -package dmd5 +package md5 import ( "fmt" diff --git a/utils/dpreg/dpreg.go b/utils/preg/preg.go similarity index 98% rename from utils/dpreg/dpreg.go rename to utils/preg/preg.go index d67bcf47..44bec8d8 100644 --- a/utils/dpreg/dpreg.go +++ b/utils/preg/preg.go @@ -1,4 +1,4 @@ -package dpreg +package preg import ( "regexp" diff --git a/utils/dpreg/dpreg_test.go b/utils/preg/preg_test.go similarity index 78% rename from utils/dpreg/dpreg_test.go rename to utils/preg/preg_test.go index 308bdc03..6760f880 100644 --- a/utils/dpreg/dpreg_test.go +++ b/utils/preg/preg_test.go @@ -1,4 +1,4 @@ -package dpreg +package preg import "testing" diff --git a/utils/dredis/Iterator.go b/utils/redis/Iterator.go similarity index 96% rename from utils/dredis/Iterator.go rename to utils/redis/Iterator.go index 4e8674a7..3a89dbf5 100644 --- a/utils/dredis/Iterator.go +++ b/utils/redis/Iterator.go @@ -1,4 +1,4 @@ -package dredis +package redis type Iterator struct { data []interface{} diff --git a/utils/dredis/client.go b/utils/redis/client.go similarity index 99% rename from utils/dredis/client.go rename to utils/redis/client.go index fd71120f..fda3fe66 100644 --- a/utils/dredis/client.go +++ b/utils/redis/client.go @@ -1,4 +1,4 @@ -package dredis +package redis import ( "context" diff --git a/utils/dredis/operation_attr.go b/utils/redis/operation_attr.go similarity index 97% rename from utils/dredis/operation_attr.go rename to utils/redis/operation_attr.go index ed288cfc..6d5d165e 100644 --- a/utils/dredis/operation_attr.go +++ b/utils/redis/operation_attr.go @@ -1,4 +1,4 @@ -package dredis +package redis import "time" diff --git a/utils/dredis/dredis_test.go b/utils/redis/redis_test.go similarity index 99% rename from utils/dredis/dredis_test.go rename to utils/redis/redis_test.go index e302cd12..6ca69bf1 100644 --- a/utils/dredis/dredis_test.go +++ b/utils/redis/redis_test.go @@ -1,4 +1,4 @@ -package dredis +package redis import ( "fmt" diff --git a/utils/dredis/simple_cache.go b/utils/redis/simple_cache.go similarity index 99% rename from utils/dredis/simple_cache.go rename to utils/redis/simple_cache.go index 43dd20c8..8be2fd7b 100644 --- a/utils/dredis/simple_cache.go +++ b/utils/redis/simple_cache.go @@ -1,4 +1,4 @@ -package dredis +package redis import ( "encoding/json" diff --git a/utils/dredis/slice_result.go b/utils/redis/slice_result.go similarity index 97% rename from utils/dredis/slice_result.go rename to utils/redis/slice_result.go index e298c8e2..b237088b 100644 --- a/utils/dredis/slice_result.go +++ b/utils/redis/slice_result.go @@ -1,4 +1,4 @@ -package dredis +package redis type SliceResult struct { Result []interface{} diff --git a/utils/dredis/string_operation.go b/utils/redis/string_operation.go similarity index 98% rename from utils/dredis/string_operation.go rename to utils/redis/string_operation.go index 68fe0f1a..b174ce75 100644 --- a/utils/dredis/string_operation.go +++ b/utils/redis/string_operation.go @@ -1,4 +1,4 @@ -package dredis +package redis import ( "context" diff --git a/utils/dredis/string_result.go b/utils/redis/string_result.go similarity index 97% rename from utils/dredis/string_result.go rename to utils/redis/string_result.go index a680404f..96190751 100644 --- a/utils/dredis/string_result.go +++ b/utils/redis/string_result.go @@ -1,4 +1,4 @@ -package dredis +package redis type StringResult struct { Result string diff --git a/utils/drequest/drequest.go b/utils/request/request.go similarity index 99% rename from utils/drequest/drequest.go rename to utils/request/request.go index 1d204705..8f1ab9ad 100644 --- a/utils/drequest/drequest.go +++ b/utils/request/request.go @@ -1,4 +1,4 @@ -package drequest +package request import ( "errors" diff --git a/utils/drequest/drequest_test.go b/utils/request/request_test.go similarity index 84% rename from utils/drequest/drequest_test.go rename to utils/request/request_test.go index d6f23afd..2128a180 100644 --- a/utils/drequest/drequest_test.go +++ b/utils/request/request_test.go @@ -1,4 +1,4 @@ -package drequest +package request import ( "fmt" diff --git a/utils/drsa/drsa.go b/utils/rsa/rsa.go similarity index 99% rename from utils/drsa/drsa.go rename to utils/rsa/rsa.go index 3e417714..891be13f 100644 --- a/utils/drsa/drsa.go +++ b/utils/rsa/rsa.go @@ -1,4 +1,4 @@ -package drsa +package rsa import ( "crypto/rand"