diff --git a/.gitignore b/.gitignore index cdd78af..28f8e70 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ *.so *.dylib -# Test binary, built with `go test -c` +# Test binary, built with `go excample -c` *.test # Output of the go coverage tool, specifically when used with LiteIDE diff --git a/README.MD b/README.MD index b149257..78f45f6 100644 --- a/README.MD +++ b/README.MD @@ -72,13 +72,13 @@ r.Headers().SetRandomUerAgent() r.Headers().ConentType_json() //r.Headers().Set("Content-Type", "application/json") -r.Headers()ConentType_formData() +r.Headers().ConentType_formData() //r.Headers().Set("Content-Type","multipart/form-data") -r.Headers()ConentType_formUrlencoded() +r.Headers().ConentType_formUrlencoded() //r.Headers().Set("Content-Type","application/x-www-form-urlencoded") -r.Headers()ConentType_textPlain() +r.Headers().ConentType_textPlain() //r.Headers().Set("Content-Type","text/plain; charset=utf-8") ``` @@ -160,7 +160,7 @@ if err != nil { } ``` -#### 2.7.2 get请求 +#### 2.7.2 发送请求 ```go res, err :=r.Get("https://127.0.0.1:80/excample") if err != nil { @@ -169,8 +169,16 @@ ftm.Println( "error occured", err) fmt.Println(res) } ``` -#### 2.7.3 其它类型的请求 -后续支持...敬请期待 +**支持的请求类型有** +- POST +- GET +- PUT +- DELETE +- PATCH +- HEAD +- CONNECT +- OPTIONS +- TRACE ### 2.8 获取上下文 @@ -186,4 +194,4 @@ responseContext:=r.Response ``` ## 3. 使用示例 -[simpleRequest_test.go](./test/simpleRequest_test.go) \ No newline at end of file +[simpleRequest_test.go](excample/simpleRequest_test.go) \ No newline at end of file diff --git a/authorization.go b/authorization.go index 184790d..b6bec1d 100644 --- a/authorization.go +++ b/authorization.go @@ -1,6 +1,6 @@ /* * @FileName: auth.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/24 上午12:09 * @Description: */ diff --git a/body.go b/body.go index faaa11a..b3397f9 100644 --- a/body.go +++ b/body.go @@ -1,6 +1,6 @@ /* * @FileName: body.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/2 上午1:23 * @Description: */ diff --git a/test/simpleRequest_test.go b/excample/simpleRequest_test.go similarity index 75% rename from test/simpleRequest_test.go rename to excample/simpleRequest_test.go index 41e1de9..101390f 100644 --- a/test/simpleRequest_test.go +++ b/excample/simpleRequest_test.go @@ -1,17 +1,15 @@ /* * @FileName: simpleRequest_test.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/3 下午11:34 * @Description: */ -package test +package excample import ( "fmt" "github.com/dorlolo/simpleRequest" - "github.com/dorlolo/simpleRequest/test/simpleCrypto" - "github.com/dorlolo/simpleRequest/test/timeUtil" "net/http" "strings" "testing" @@ -27,12 +25,11 @@ func TestRequest(t *testing.T) { //设置params r.QueryParams().Set("user", "dorlolo") - //支持一次性添加,不会覆盖上面user + //批量添加,不会覆盖上面user pamarsBulid := map[string]interface{}{ "passwd": "123456", "action": "login", } - r.QueryParams().Sets(pamarsBulid) //--添加body @@ -43,7 +40,7 @@ func TestRequest(t *testing.T) { r.SkipCertVerify() //跳过证书验证 //--发送请求,这里返回的直接是body中的数据，等后续增加功能 - res, err := r.Get("http://www.webSite.com/end/point") + res, err := r.GET("http://www.webSite.com/end/point") if err != nil { t.Error(err) } else { @@ -57,16 +54,16 @@ func TestAuth_fotmData(t *testing.T) { req := simpleRequest.NewRequest() req.Headers().ConentType_formData() req.Headers().SetRandomUerAgent() - req.Body().Set("grant_type", "password") - req.Body().Set("client_id", "smz") - req.Body().Set("client_secret", "smz") - req.Body().Set("scope", "getdata") - req.Body().Set("username", "shiming_zyf") - req.Body().Set("password", "zyf499bbcb9") + req.Body().Set("grant_type", "password"). + Set("client_id", "smz"). + Set("client_secret", "smz"). + Set("scope", "getdata"). + Set("username", "shiming_zyf"). + Set("password", "zyf499bbcb9") var URL = "" - data, _ := req.Post(URL) + data, _ := req.POST(URL) t.Log(string(data)) } @@ -74,9 +71,10 @@ func TestAuth_fotmData(t *testing.T) { func TestAuthorization(t *testing.T) { req := simpleRequest.NewRequest() req.Authorization().Bearer("19f0591e-fab1-4447-90c3-1c60aef78fbd") - req.Body().Set("prjnumber", "3205072020100901A01000") - req.Body().Set("date", "20220324") - data, err := req.Post("") + req.Body(). + Set("prjnumber", "3205072020100901A01000"). + Set("date", "20220324") + data, err := req.PUT("") t.Log(string(data)) t.Log(err) @@ -84,9 +82,7 @@ func TestAuthorization(t *testing.T) { func TestXml(t *testing.T) { idcard := "320324196705101880" - thisDate := time.Now().Format(timeUtil.TimeFormat.NoSpacer_YMD) - passStr := fmt.Sprintf("%v%vsparkcn", idcard, thisDate) - pass := simpleCrypto.Md5Enscrypto(passStr) + pass := "96778" urlAddr := "http://218.4.84.171:5445/AppWebService/GHBackBone_SAMWS.asmx?Content-Type=application/soap+xml;charset=utf-8" body := fmt.Sprintf(` @@ -98,10 +94,11 @@ func TestXml(t *testing.T) { `, idcard, pass) req := simpleRequest.NewRequest() - req.Headers().Set("Content-Type", "application/soap+xml;charset=utf-8") - req.Headers().SetRandomUerAgent() + req.Headers(). + Set("Content-Type", "application/soap+xml;charset=utf-8"). + SetRandomUerAgent() req.Body().SetString(body) - data, err := req.Post(urlAddr) + data, err := req.POST(urlAddr) t.Log(string(data)) t.Log(err) return diff --git a/headers.go b/headers.go index 611c96a..2dd0247 100644 --- a/headers.go +++ b/headers.go @@ -1,6 +1,6 @@ /* * @FileName: header.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/1 下午9:44 * @Description: */ @@ -103,7 +103,7 @@ func (s *HeadersConf) SetConentType(value string) *HeadersConf { func (s *HeadersConf) ConentType_json() *HeadersConf { jsonData, err := json.Marshal(s.simpleReq.tempBody) if err == nil { - s.simpleReq.body = bytes.NewReader(jsonData) + s.simpleReq.body = bytes.NewReader([]byte("{}")) } s.simpleReq.body = bytes.NewReader(jsonData) s.simpleReq.headers.Set(hdrContentTypeKey, jsonContentType) diff --git a/param.go b/param.go index d7e9581..551a6d2 100644 --- a/param.go +++ b/param.go @@ -1,6 +1,6 @@ /* * @FileName: param.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/1 下午9:07 * @Description: */ diff --git a/simpleRequest.go b/simpleRequest.go index 07d7514..4eab00e 100644 --- a/simpleRequest.go +++ b/simpleRequest.go @@ -1,6 +1,6 @@ /* * @FileName: simpleRequest.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/2 上午12:33 * @Description: */ @@ -140,7 +140,7 @@ func (s *SimpleRequest) do(request *http.Request) (body []byte, err error) { return } - //v0.0.2更新，将request和response内容返回，便于用户进行分析 JuneXu 03-11-2022 + //v0.0.2更新，将request和response内容返回，便于用户进行分析 JJXu 03-11-2022 if resp != nil { s.Response = *resp } @@ -154,7 +154,8 @@ func (s *SimpleRequest) do(request *http.Request) (body []byte, err error) { return } -func (s *SimpleRequest) Post(urls string) (body []byte, err error) { +// POST method does POST HTTP request. It's defined in section 2 of RFC5789. +func (s *SimpleRequest) POST(urls string) (body []byte, err error) { s.initBody() r, err := http.NewRequest(http.MethodPost, urls, s.body) if err != nil { @@ -174,7 +175,8 @@ func (s *SimpleRequest) Post(urls string) (body []byte, err error) { return } -func (s *SimpleRequest) Get(urls string) (body []byte, err error) { +// GET method does GET HTTP request. It's defined in section 2 of RFC5789. +func (s *SimpleRequest) GET(urls string) (body []byte, err error) { // body s.initBody() r, err := http.NewRequest(http.MethodGet, urls, s.body) @@ -213,47 +215,41 @@ func (s *SimpleRequest) LaunchTo(urls, method string) (body []byte, err error) { return } -func (s *SimpleRequest) Put(url string) (body []byte, err error) { +// PUT method does PUT HTTP request. It's defined in section 4.3.4 of RFC7231. +func (s *SimpleRequest) PUT(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodPut) } + +// DELETE method does DELETE HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) DELETE(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodDelete) } + +// Patch method does Patch HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) PATCH(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodPatch) } + +// HEAD method does HEAD HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) HEAD(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodHead) } + +// CONNECT method does CONNECT HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) CONNECT(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodConnect) } + +// OPTIONS method does OPTIONS HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) OPTIONS(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodOptions) } + +// TRACE method does TRACE HTTP request. It's defined in section 2 of RFC5789. func (s *SimpleRequest) TRACE(url string) (body []byte, err error) { return s.LaunchTo(url, http.MethodTrace) } -// Put method does PUT HTTP request. It's defined in section 4.3.4 of RFC7231. -//func (s *SimpleRequest) Put(url string) (*Response, error) { -// return r.Execute(MethodPut, url) -//} - -// Delete method does DELETE HTTP request. It's defined in section 4.3.5 of RFC7231. -//func (s *SimpleRequest) Delete(url string) (*Response, error) { -// return r.Execute(MethodDelete, url) -//} - -// Options method does OPTIONS HTTP request. It's defined in section 4.3.7 of RFC7231. -//func (s *SimpleRequest) Options(url string) (*Response, error) { -// return r.Execute(MethodOptions, url) -//} - -// Patch method does PATCH HTTP request. It's defined in section 2 of RFC5789. -//func (s *SimpleRequest) Patch(url string) (*Response, error) { -// return r.Execute(MethodPatch, url) -//} //------------------------------------------------------ // // 这里数据 diff --git a/simpleRequest_test.go b/simpleRequest_test.go new file mode 100644 index 0000000..eece469 --- /dev/null +++ b/simpleRequest_test.go @@ -0,0 +1,69 @@ +// Package simpleRequest ----------------------------- +// @file : simpleRequest_test.go +// @author : JJXu +// @contact : wavingBear@163.com +// @time : 2022/12/9 20:34:52 +// ------------------------------------------- +package simpleRequest + +import ( + "encoding/json" + "fmt" + "io" + "net/http" + "testing" +) + +type api struct { + Name string `json:"name" form:"name" query:"name"` +} + +func httpserver() { + http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + switch r.Method { + case "POST": + var data api + jsonDecoder := json.NewDecoder(r.Body) + jsonDecoder.Decode(&data) + if data.Name == "JJXu" { + io.WriteString(w, "ok") + } else { + io.WriteString(w, "false") + } + + default: + io.WriteString(w, "false") + } + }) + fmt.Println("http服务启动了") + http.ListenAndServe(":8989", nil) +} + +func TestPost_withSet(t *testing.T) { + go httpserver() + var r = NewRequest() + r.Headers().ConentType_json() + r.Body().Set("name", "JJXu") + result, err := r.POST("http://localhost:8989/") + if err != nil { + t.Error(err.Error()) + } else { + t.Log(string(result)) + } +} + +func TestPost_withSets(t *testing.T) { + go httpserver() + + var r = NewRequest() + r.Headers().ConentType_json() + r.Body().Sets(map[string]interface{}{ + "name": "JJXu", + }) + result, err := r.POST("http://localhost:8989/") + if err != nil { + t.Error(err.Error()) + } else { + t.Log(string(result)) + } +} diff --git a/test/base64_test.go b/test/base64_test.go deleted file mode 100644 index 049c147..0000000 --- a/test/base64_test.go +++ /dev/null @@ -1,21 +0,0 @@ -/* - * @FileName: base64_test.go - * @Author: JuneXu - * @CreateTime: 2022/3/24 上午12:03 - * @Description: - */ - -package test - -import ( - "encoding/base64" - "fmt" - "testing" -) - -func TestBs(t *testing.T) { - authStr := fmt.Sprintf("%v:%v", "aaa", "bbb") - data := base64.StdEncoding.EncodeToString([]byte(authStr)) - t.Log(data) - -} //YWFhOmJiYg== diff --git a/test/simpleCrypto/ecb.go b/test/simpleCrypto/ecb.go deleted file mode 100644 index d5c2f63..0000000 --- a/test/simpleCrypto/ecb.go +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright 2013 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Electronic Code Book (ECB) mode. - -// ECB provides confidentiality by assigning a fixed ciphertext block to each -// plaintext block. - -// See NIST SP 800-38A, pp 08-09 - -package simpleCrypto - -import ( - "crypto/cipher" -) - -type ecb struct { - b cipher.Block - blockSize int -} - -func newECB(b cipher.Block) *ecb { - return &ecb{ - b: b, - blockSize: b.BlockSize(), - } -} - -type ecbEncrypter ecb - -// NewECBEncrypter returns a BlockMode which encrypts in electronic code book -// mode, using the given Block. -func NewECBEncrypter(b cipher.Block) cipher.BlockMode { - return (*ecbEncrypter)(newECB(b)) -} - -func (x *ecbEncrypter) BlockSize() int { return x.blockSize } - -func (x *ecbEncrypter) CryptBlocks(dst, src []byte) { - if len(src)%x.blockSize != 0 { - panic("crypto/cipher: input not full blocks") - } - if len(dst) < len(src) { - panic("crypto/cipher: output smaller than input") - } - for len(src) > 0 { - x.b.Encrypt(dst, src[:x.blockSize]) - src = src[x.blockSize:] - dst = dst[x.blockSize:] - } -} - -type ecbDecrypter ecb - -// NewECBDecrypter returns a BlockMode which decrypts in electronic code book -// mode, using the given Block. -func NewECBDecrypter(b cipher.Block) cipher.BlockMode { - return (*ecbDecrypter)(newECB(b)) -} - -func (x *ecbDecrypter) BlockSize() int { return x.blockSize } - -func (x *ecbDecrypter) CryptBlocks(dst, src []byte) { - if len(src)%x.blockSize != 0 { - panic("crypto/cipher: input not full blocks") - } - if len(dst) < len(src) { - panic("crypto/cipher: output smaller than input") - } - for len(src) > 0 { - x.b.Decrypt(dst, src[:x.blockSize]) - src = src[x.blockSize:] - dst = dst[x.blockSize:] - } -} diff --git a/test/simpleCrypto/ecb_test.go b/test/simpleCrypto/ecb_test.go deleted file mode 100644 index 7318a2a..0000000 --- a/test/simpleCrypto/ecb_test.go +++ /dev/null @@ -1,125 +0,0 @@ -// Copyright 2013 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// ECB AES test vectors. - -// See U.S. National Institute of Standards and Technology (NIST) -// Special Publication 800-38A, ``Recommendation for Block Cipher -// Modes of Operation,'' 2001 Edition, pp. 24-29. - -package simpleCrypto - -import ( - "bytes" - "crypto/aes" - "encoding/base64" - "fmt" - "testing" -) - -var commonKey128 = []byte{0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c} - -var commonKey192 = []byte{ - 0x8e, 0x73, 0xb0, 0xf7, 0xda, 0x0e, 0x64, 0x52, 0xc8, 0x10, 0xf3, 0x2b, 0x80, 0x90, 0x79, 0xe5, - 0x62, 0xf8, 0xea, 0xd2, 0x52, 0x2c, 0x6b, 0x7b, -} - -var commonKey256 = []byte{ - 0x60, 0x3d, 0xeb, 0x10, 0x15, 0xca, 0x71, 0xbe, 0x2b, 0x73, 0xae, 0xf0, 0x85, 0x7d, 0x77, 0x81, - 0x1f, 0x35, 0x2c, 0x07, 0x3b, 0x61, 0x08, 0xd7, 0x2d, 0x98, 0x10, 0xa3, 0x09, 0x14, 0xdf, 0xf4, -} -var commonInput = []byte{ - 0x6b, 0xc1, 0xbe, 0xe2, 0x2e, 0x40, 0x9f, 0x96, 0xe9, 0x3d, 0x7e, 0x11, 0x73, 0x93, 0x17, 0x2a, - 0xae, 0x2d, 0x8a, 0x57, 0x1e, 0x03, 0xac, 0x9c, 0x9e, 0xb7, 0x6f, 0xac, 0x45, 0xaf, 0x8e, 0x51, - 0x30, 0xc8, 0x1c, 0x46, 0xa3, 0x5c, 0xe4, 0x11, 0xe5, 0xfb, 0xc1, 0x19, 0x1a, 0x0a, 0x52, 0xef, - 0xf6, 0x9f, 0x24, 0x45, 0xdf, 0x4f, 0x9b, 0x17, 0xad, 0x2b, 0x41, 0x7b, 0xe6, 0x6c, 0x37, 0x10, -} - -var ecbAESTests = []struct { - name string - key []byte - in []byte - out []byte -}{ - // NIST SP 800-38A pp 24-27 - { - "ECB-AES128", - commonKey128, - commonInput, - []byte{ - 0x3a, 0xd7, 0x7b, 0xb4, 0x0d, 0x7a, 0x36, 0x60, 0xa8, 0x9e, 0xca, 0xf3, 0x24, 0x66, 0xef, 0x97, - 0xf5, 0xd3, 0xd5, 0x85, 0x03, 0xb9, 0x69, 0x9d, 0xe7, 0x85, 0x89, 0x5a, 0x96, 0xfd, 0xba, 0xaf, - 0x43, 0xb1, 0xcd, 0x7f, 0x59, 0x8e, 0xce, 0x23, 0x88, 0x1b, 0x00, 0xe3, 0xed, 0x03, 0x06, 0x88, - 0x7b, 0x0c, 0x78, 0x5e, 0x27, 0xe8, 0xad, 0x3f, 0x82, 0x23, 0x20, 0x71, 0x04, 0x72, 0x5d, 0xd4, - }, - }, - { - "ECB-AES192", - commonKey192, - commonInput, - []byte{ - 0xbd, 0x33, 0x4f, 0x1d, 0x6e, 0x45, 0xf2, 0x5f, 0xf7, 0x12, 0xa2, 0x14, 0x57, 0x1f, 0xa5, 0xcc, - 0x97, 0x41, 0x04, 0x84, 0x6d, 0x0a, 0xd3, 0xad, 0x77, 0x34, 0xec, 0xb3, 0xec, 0xee, 0x4e, 0xef, - 0xef, 0x7a, 0xfd, 0x22, 0x70, 0xe2, 0xe6, 0x0a, 0xdc, 0xe0, 0xba, 0x2f, 0xac, 0xe6, 0x44, 0x4e, - 0x9a, 0x4b, 0x41, 0xba, 0x73, 0x8d, 0x6c, 0x72, 0xfb, 0x16, 0x69, 0x16, 0x03, 0xc1, 0x8e, 0x0e, - }, - }, - { - "ECB-AES256", - commonKey256, - commonInput, - []byte{ - 0xf3, 0xee, 0xd1, 0xbd, 0xb5, 0xd2, 0xa0, 0x3c, 0x06, 0x4b, 0x5a, 0x7e, 0x3d, 0xb1, 0x81, 0xf8, - 0x59, 0x1c, 0xcb, 0x10, 0xd4, 0x10, 0xed, 0x26, 0xdc, 0x5b, 0xa7, 0x4a, 0x31, 0x36, 0x28, 0x70, - 0xb6, 0xed, 0x21, 0xb9, 0x9c, 0xa6, 0xf4, 0xf9, 0xf1, 0x53, 0xe7, 0xb1, 0xbe, 0xaf, 0xed, 0x1d, - 0x23, 0x30, 0x4b, 0x7a, 0x39, 0xf9, 0xf3, 0xff, 0x06, 0x7d, 0x8d, 0x8f, 0x9e, 0x24, 0xec, 0xc7, - }, - }, -} - -func TestECB_AES(t *testing.T) { - for _, tt := range ecbAESTests { - test := tt.name - - c, err := aes.NewCipher(tt.key) - if err != nil { - t.Errorf("%s: NewCipher(%d bytes) = %s", test, len(tt.key), err) - continue - } - - encrypter := NewECBEncrypter(c) - d := make([]byte, len(tt.in)) - encrypter.CryptBlocks(d, tt.in) - if !bytes.Equal(tt.out, d) { - t.Errorf("%s: ECBEncrypter\nhave %x\nwant %x", test, d, tt.out) - } - - decrypter := NewECBDecrypter(c) - p := make([]byte, len(d)) - decrypter.CryptBlocks(p, d) - if !bytes.Equal(tt.in, p) { - t.Errorf("%s: ECBDecrypter\nhave %x\nwant %x", test, d, tt.in) - } - } -} - -//func PKCS5Padding(ciphertext []byte, blockSize int) []byte { -// padding := blockSize - len(ciphertext)%blockSize -// fmt.Println(padding) -// fmt.Println(len(ciphertext)) -// padtext := bytes.Repeat([]byte{byte(padding)}, padding) -// return append(ciphertext, padtext...) -//} - -func TestSelfECB(t *testing.T) { - combstr := []byte("dbc679fc7f4185e8:0092f9d7-01d6-44f1-b738-f557813d58e9:1575534561309") - fmt.Println(len(combstr)) - aeskey := []byte("yMY5J6iYnwPvxWGD") - c, _ := aes.NewCipher(aeskey) - encrypter := NewECBEncrypter(c) - combstr = PKCS5Padding(combstr, c.BlockSize()) - d := make([]byte, len(combstr)) - encrypter.CryptBlocks(d, combstr) - fmt.Println(base64.StdEncoding.EncodeToString(d)) -} diff --git a/test/simpleCrypto/readme.md b/test/simpleCrypto/readme.md deleted file mode 100644 index 058bc80..0000000 --- a/test/simpleCrypto/readme.md +++ /dev/null @@ -1,4 +0,0 @@ -# simpleCrypto -## 说明 -目前封装了md5、ecb加密的方法。 -具体内容请查看simpleCrypto.go文件。 \ No newline at end of file diff --git a/test/simpleCrypto/simpleCrypto.go b/test/simpleCrypto/simpleCrypto.go deleted file mode 100644 index 799df06..0000000 --- a/test/simpleCrypto/simpleCrypto.go +++ /dev/null @@ -1,45 +0,0 @@ -/* - * @FileName: - * @Author: xjj - * @CreateTime: 下午6:23 - * @Description: - */ -package simpleCrypto - -import ( - "bytes" - "crypto/aes" - "crypto/md5" - "encoding/base64" - "encoding/hex" - "sync" -) - -var lock sync.Mutex - -//Md5Enscrypto md5加密 -func Md5Enscrypto(data string) string { - m := md5.New() - m.Write([]byte(data)) - res := hex.EncodeToString(m.Sum(nil)) - return res -} - -//SimpleEncryptAesECB ECB加密，并对加密结果进行了base64编码 -func SimpleEncryptAesECB(aesText []byte, aesKey []byte) string { - lock.Lock() - c, _ := aes.NewCipher(aesKey) - encrypter := NewECBEncrypter(c) - aesText = PKCS5Padding(aesText, c.BlockSize()) - d := make([]byte, len(aesText)) - encrypter.CryptBlocks(d, aesText) - lock.Unlock() - return base64.StdEncoding.EncodeToString(d) -} - -//PKCS5Padding PKCS5明文填充方案，此方案使明文保持为块长度的倍数 -func PKCS5Padding(ciphertext []byte, blockSize int) []byte { - padding := blockSize - len(ciphertext)%blockSize - padtext := bytes.Repeat([]byte{byte(padding)}, padding) - return append(ciphertext, padtext...) -} diff --git a/test/timeUtil/format.go b/test/timeUtil/format.go deleted file mode 100644 index 5afc645..0000000 --- a/test/timeUtil/format.go +++ /dev/null @@ -1,55 +0,0 @@ -/* - * @FileName: format.go - * @Author: JuneXu - * @CreateTime: 2022/2/25 下午2:30 - * @Description: - */ - -package timeUtil - -import "time" - -var MonthMap = make(map[string]string) - -type DefineTimeFormat struct { - //常规时间格式(日期带横杠) - Normal_YMDhms string - Normal_YMD string - Normal_hms string - //带斜杠的时间格式 - Slash_YMDhms string - Slash_YMD string - //无间隔符 - NoSpacer_YMDhms string - NoSpacer_YMD string -} - -var TimeFormat DefineTimeFormat -var Loc *time.Location - -func init() { - MonthMap[""] = "00" - MonthMap["January"] = "01" - MonthMap["February"] = "02" - MonthMap["March"] = "03" - MonthMap["April"] = "04" - MonthMap["May"] = "05" - MonthMap["June"] = "06" - MonthMap["July"] = "07" - MonthMap["August"] = "08" - MonthMap["September"] = "09" - MonthMap["October"] = "10" - MonthMap["November"] = "11" - MonthMap["December"] = "12" - - TimeFormat = DefineTimeFormat{ - Normal_YMDhms: "2006-01-02 15:04:05", - Normal_YMD: "2006-01-02", - Normal_hms: "15:04:05", - Slash_YMDhms: "2006/01/02 15:04:05", - Slash_YMD: "2006/01/02", - NoSpacer_YMDhms: "20060102150405", - NoSpacer_YMD: "20060102", - } - Loc, _ = time.LoadLocation("Asia/Shanghai") -} diff --git a/test/timeUtil/getTime.go b/test/timeUtil/getTime.go deleted file mode 100644 index 387fa37..0000000 --- a/test/timeUtil/getTime.go +++ /dev/null @@ -1,65 +0,0 @@ -/* - * @FileName: getTime.go - * @Author: JuneXu - * @CreateTime: 2022/3/1 下午6:35 - * @Description: - */ - -package timeUtil - -import ( - "fmt" - "time" -) - -//ThisMormingTime 今天凌晨 -func ThisMorming(format string) (strTime string) { - thisTime := time.Now() - year := thisTime.Year() - month := MonthMap[thisTime.Month().String()] - day := fmt.Sprintf("%02d", thisTime.Day()) - strTime = fmt.Sprintf("%v-%v-%v 00:00:00", year, month, day) - if format != TimeFormat.Normal_YMDhms { - t1, _ := time.ParseInLocation(TimeFormat.Normal_YMDhms, strTime, Loc) - strTime = t1.Format(format) - } - return strTime -} - -//ThisMorningUnix 获取当日凌晨的时间戳 -func ThisMorningToUnix() int64 { - thist := time.Now() - zero_tm := time.Date(thist.Year(), thist.Month(), thist.Day(), 0, 0, 0, 0, thist.Location()).Unix() - return zero_tm -} - -//ThisTimeUnix 获取当前时间的时间戳 -func CurrentimeToUnix() int64 { - return time.Now().Unix() -} - -//CurrenStrtime 获取当前时间字符串 -func CurrenStrtime(format string) (strTime string) { - strTime = time.Now().Format(format) - return -} - -//Currentime 获取当前时间 -func Currentime() (thisTime time.Time) { - thisTime = time.Now().In(Loc) - return -} - -//Currentime 获取当前时间 -func Currentime2(format string) (strTime string) { - strTime = time.Now().Format(format) - return -} - -//HoursAgo 若干小时之前的时间 -func HoursAgo(hours time.Duration, format string) (lastTimeStr string) { - lastStamp := time.Now().Unix() - int64((time.Hour * hours).Seconds()) - lastTime := time.Unix(lastStamp, 0).In(Loc) - lastTimeStr = lastTime.Format(format) - return -} diff --git a/test/timeUtil/getTime_test.go b/test/timeUtil/getTime_test.go deleted file mode 100644 index 7f834f4..0000000 --- a/test/timeUtil/getTime_test.go +++ /dev/null @@ -1,20 +0,0 @@ -/* - * @FileName: getTime_test.go - * @Author: JuneXu - * @CreateTime: 2022/3/21 下午5:58 - * @Description: - */ - -package timeUtil - -import ( - "testing" -) - -func TestTimett(t *testing.T) { - t.Log(ThisMorming(TimeFormat.Normal_YMDhms)) - t.Log(Currentime()) - t.Log(Currentime2(TimeFormat.Normal_YMDhms)) - t.Log(HoursAgo(5, TimeFormat.Normal_YMDhms)) - t.Log(HoursAgo(5, TimeFormat.Normal_YMDhms)) -} diff --git a/test/timeUtil/timeTranslate.go b/test/timeUtil/timeTranslate.go deleted file mode 100644 index d86a836..0000000 --- a/test/timeUtil/timeTranslate.go +++ /dev/null @@ -1,65 +0,0 @@ -/** - * @Author Puzzle - * @Date 2021/11/18 1:36 下午 - **/ - -package timeUtil - -import ( - "fmt" - "time" -) - -func GetTimestampMillisecond() int64 { - now := time.Now() - return now.UnixNano() / 1e6 -} - -func StringToTime(strTime string) (*time.Time, error) { - const TIME_LAYOUT = "2006-01-02 15:04:05" //此时间不可更改 - timeobj, err := time.ParseInLocation(TIME_LAYOUT, strTime, Loc) - return &timeobj, err -} - -func StringToTimeWithFormat(strTime string, timeFormat string) (*time.Time, error) { - timeobj, err := time.ParseInLocation(timeFormat, strTime, Loc) - return &timeobj, err -} - -//去除精确时间后面的小数点 -func NowTimeToTime(layout string) *time.Time { - otime := time.Now().Format(layout) //"2006-01-02 15:04:05" and so on - tt, _ := StringToTime(otime) - return tt -} - -// timeToString -func TimeToString(timer time.Time) string { - //t1 := time.Now() - t2 := timer.Format("2006-01-02 15:04:05") - fmt.Println(t2) - return t2 -} - -// todo -//func commonParse_stringToTime(timeStr string) *time.Time { -//const spaceList =[4,2,2,2,2,2] -//var timeMap struct { -// year string -// month string -// day string -// hour string -// minute string -// second string -//} -// -//for k, v := range timeStr { -// fmt.Println() -//} - -//测试能否被int64化，如果能够转化说明全是数字 -// 替换-为"" -// 替换/为"" -// 替换:为"" - -//} diff --git a/test/timeUtil/timeTranslate_test.go b/test/timeUtil/timeTranslate_test.go deleted file mode 100644 index 44e467b..0000000 --- a/test/timeUtil/timeTranslate_test.go +++ /dev/null @@ -1,22 +0,0 @@ -/* - * @FileName: time_test.go - * @Author: JuneXu - * @CreateTime: 2022/2/25 下午2:37 - * @Description: - */ - -package timeUtil - -import ( - "fmt" - "testing" - "time" -) - -func TestTime(t *testing.T) { - result := NowTimeToTime(TimeFormat.Normal_YMDhms) - fmt.Println(result) - - TimeToString(time.Now()) - t.Log(NowTimeToTime(TimeFormat.Normal_YMD)) -} diff --git a/utils.go b/utils.go index 1cc8c78..b66fdb7 100644 --- a/utils.go +++ b/utils.go @@ -1,6 +1,6 @@ /* * @FileName: utils.go - * @Author: JuneXu + * @Author: JJXu * @CreateTime: 2022/3/29 上午11:16 * @Description: */