From e439ada75a556d9dbc8dd7492edaea3fcee90b36 Mon Sep 17 00:00:00 2001 From: howell <2827207845@qq.com> Date: Tue, 7 Dec 2021 09:25:38 +0800 Subject: [PATCH] fix: delete --- internal/api/manage/gys/logic/enterprise.go | 2 +- internal/api/manage/vend/min_program.go | 2 +- main.go | 8 -------- tools/crypto.go | 6 +++--- tools/ffmpeg_cmd.go | 2 +- tools/float64_money.go | 11 ----------- tools/page.go | 4 ++-- tools/rand.go | 2 +- tools/rsa.go | 6 +++--- tools/struct_map.go | 17 ----------------- tools/time.go | 2 +- tools/verfiy.go | 6 +++--- 12 files changed, 16 insertions(+), 52 deletions(-) delete mode 100644 tools/float64_money.go delete mode 100644 tools/struct_map.go diff --git a/internal/api/manage/gys/logic/enterprise.go b/internal/api/manage/gys/logic/enterprise.go index 0e00e3b..4553e29 100644 --- a/internal/api/manage/gys/logic/enterprise.go +++ b/internal/api/manage/gys/logic/enterprise.go @@ -164,7 +164,7 @@ func (e *enterprise) Verfiy(info *EnterpriseInfo) (err error) { if info.LegalPerson == "" { return errors.New("请填写法人证明") } - if !tools.VerfiyIdCard(info.LegalPersonCode) { + if !tools.VerifyIdCard(info.LegalPersonCode) { return errors.New("请正确填写法人身份证号") } if info.LegalPersonUrl == "" { diff --git a/internal/api/manage/vend/min_program.go b/internal/api/manage/vend/min_program.go index 6460d45..cfea3da 100644 --- a/internal/api/manage/vend/min_program.go +++ b/internal/api/manage/vend/min_program.go @@ -120,7 +120,7 @@ func Phone(c *gin.Context) { key, _ := base64.StdEncoding.DecodeString(sessionKey) iv, _ := base64.StdEncoding.DecodeString(args.Iv) - jsonData, _ := tools.AesCBCDncrypt(decodeString, key, iv) + jsonData, _ := tools.AesCBCDecrypt(decodeString, key, iv) userPhone := UserPhone{} json.Unmarshal(jsonData, &userPhone) if userPhone.Watermark.Appid != define.WxMiniProgramAppID { diff --git a/main.go b/main.go index 244eed4..fedcf9a 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "github.com/astaxie/beego" "log" "net" "net/http" @@ -33,9 +32,6 @@ var ( ) func main() { - - beego.SetLogFuncCall(true) - dirs := []string{"credentials"} // 设置需要释放的目录 for _, dir := range dirs { // 解压dir目录到当前目录 @@ -52,10 +48,6 @@ func main() { mq.SetUpMq() } - func() { - fmt.Println("测试方法在这里") - }() - if configs.IsProductionEnv() { gin.SetMode("release") } else { diff --git a/tools/crypto.go b/tools/crypto.go index 5d7b7d2..9d8dcaa 100644 --- a/tools/crypto.go +++ b/tools/crypto.go @@ -6,8 +6,8 @@ import ( "errors" ) -//AEC解密（CBC模式） -func AesCBCDncrypt(encryptData, key, iv []byte) ([]byte, error) { +// AesCBCDecrypt AEC解密（CBC模式） +func AesCBCDecrypt(encryptData, key, iv []byte) ([]byte, error) { block, err := aes.NewCipher(key) if err != nil { return nil, err @@ -26,7 +26,7 @@ func AesCBCDncrypt(encryptData, key, iv []byte) ([]byte, error) { return encryptData, nil } -//对密文删除填充 +// PKCS7UnPadding 对密文删除填充 func PKCS7UnPadding(origData []byte) []byte { length := len(origData) unpadding := int(origData[length-1]) diff --git a/tools/ffmpeg_cmd.go b/tools/ffmpeg_cmd.go index b6fc3e9..853b600 100644 --- a/tools/ffmpeg_cmd.go +++ b/tools/ffmpeg_cmd.go @@ -56,7 +56,7 @@ func ParseVideoDuration(path string) (second int, err error) { return min*60 + sec, nil } -// ffmpeg -i ec64616125dba12b171f24a60bdfd08c.mp4 -y -f image2 -t 0.001 -s 800x450 test.jpg +// GenerateVideoThumbnail ffmpeg -i ec64616125dba12b171f24a60bdfd08c.mp4 -y -f image2 -t 0.001 -s 800x450 test.jpg func GenerateVideoThumbnail(path string) string { prename := path[7:] name := prename[:len(prename)-4] diff --git a/tools/float64_money.go b/tools/float64_money.go deleted file mode 100644 index a90f746..0000000 --- a/tools/float64_money.go +++ /dev/null @@ -1,11 +0,0 @@ -package tools - -import ( - "fmt" - "strconv" -) - -func Money(m float64) float64 { - f, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", m), 64) - return f -} diff --git a/tools/page.go b/tools/page.go index 17d9e4f..7a95342 100644 --- a/tools/page.go +++ b/tools/page.go @@ -5,7 +5,7 @@ type Page struct { Limit uint `json:"limit" form:"limit"` } -// 获取初始位置 +// GetStart 获取初始位置 func (p *Page) GetStart() uint { if p.Page <= 0 { p.Page = 1 @@ -13,7 +13,7 @@ func (p *Page) GetStart() uint { return (p.Page - 1) * p.GetLimit() } -// 获取分页大小 +// GetLimit 获取分页大小 func (p *Page) GetLimit() uint { if p.Limit <= 0 { p.Limit = 10 diff --git a/tools/rand.go b/tools/rand.go index a2a5d8e..7a11b73 100644 --- a/tools/rand.go +++ b/tools/rand.go @@ -10,7 +10,7 @@ func init() { rand.Seed(time.Now().UnixNano()) } -// @Style 生成随机数 +// RandStr 生成随机数 func RandStr(n int, str ...string) string { s := "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890" if len(str) > 0 { diff --git a/tools/rsa.go b/tools/rsa.go index b34abbd..2c918ad 100644 --- a/tools/rsa.go +++ b/tools/rsa.go @@ -52,8 +52,8 @@ type EncPacket struct { Recook string `json:"recook"` } -// 私钥加密 -func PrivateKeyEnctypt(data interface{}) *gin.H { +// PrivateKeyEncrypt 私钥加密 +func PrivateKeyEncrypt(data interface{}) *gin.H { bytes, err := json.Marshal(data) if err != nil { panic(err) @@ -67,7 +67,7 @@ func PrivateKeyEnctypt(data interface{}) *gin.H { } } -// 私钥解密 +// PrivateKeyDecrypt 私钥解密 func PrivateKeyDecrypt(data []byte) interface{} { decData, err := gorsa.RSA.PriKeyDECRYPT(data) if err != nil { diff --git a/tools/struct_map.go b/tools/struct_map.go deleted file mode 100644 index a022ba6..0000000 --- a/tools/struct_map.go +++ /dev/null @@ -1,17 +0,0 @@ -package tools - -func Struct2Map(obj interface{}) map[string]interface{} { - bs, err := json.Marshal(obj) - if err != nil { - panic(err) - } - - // json字符转化为map - var data = make(map[string]interface{}) - err = json.Unmarshal(bs, &data) - if err != nil { - panic(err) - } - - return data -} diff --git a/tools/time.go b/tools/time.go index c646d55..d411329 100644 --- a/tools/time.go +++ b/tools/time.go @@ -5,7 +5,7 @@ import ( "time" ) -// @Style 字符串时间转formatime.Second +// StrToSecond 字符串时间转formatime.Second func StrToSecond(datetime string, layouts ...string) formatime.Second { layout := "2006-01-02 15:04:05" if len(layouts) > 0 { diff --git a/tools/verfiy.go b/tools/verfiy.go index 46b5566..51164b2 100644 --- a/tools/verfiy.go +++ b/tools/verfiy.go @@ -6,8 +6,8 @@ import ( "time" ) -// @Style 身份证验证 -func VerfiyIdCard(idCard string) bool { +// VerifyIdCard 身份证验证 +func VerifyIdCard(idCard string) bool { citys := []string{"11", "12", "13", "14", "15", "21", "22", "23", "31", "32", "33", "34", "35", "36", "37", "41", "42", "43", "44", "45", "46", @@ -42,7 +42,7 @@ func VerfiyIdCard(idCard string) bool { return true } -// @Style 邮箱格式验证 +// VerifyEmail 邮箱格式验证 func VerifyEmail(email string) bool { pattern := `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*` //匹配电子邮箱 reg := regexp.MustCompile(pattern)