diff --git a/api/go.mod b/api/go.mod index a4113b18..a95a236b 100644 --- a/api/go.mod +++ b/api/go.mod @@ -19,7 +19,6 @@ require ( github.com/qiniu/go-sdk/v7 v7.17.1 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/smartwalle/alipay/v3 v3.2.15 - github.com/syndtr/goleveldb v1.0.0 go.uber.org/zap v1.23.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 gorm.io/driver/mysql v1.4.7 @@ -87,7 +86,6 @@ require ( github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.14.0 // indirect - github.com/golang/snappy v0.0.1 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/leodido/go-urn v1.2.4 // indirect github.com/mattn/go-isatty v0.0.19 // indirect diff --git a/api/go.sum b/api/go.sum index 6bc673ed..b14415c9 100644 --- a/api/go.sum +++ b/api/go.sum @@ -29,7 +29,6 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eatmoreapple/openwechat v1.2.1 h1:ez4oqF/Y2NSEX/DbPV8lvj7JlfkYqvieeo4awx5lzfU= github.com/eatmoreapple/openwechat v1.2.1/go.mod h1:61HOzTyvLobGdgWhL68jfGNwTJEv0mhQ1miCXQrvWU8= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= @@ -68,12 +67,8 @@ github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJ github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -89,7 +84,6 @@ github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imroc/req/v3 v3.37.2 h1:vEemuA0cq9zJ6lhe+mSRhsZm951bT0CdiSH47+KTn6I= github.com/imroc/req/v3 v3.37.2/go.mod h1:DECzjVIrj6jcUr5n6e+z0ygmCO93rx4Jy0RjOEe1YCI= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -138,12 +132,9 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs= github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b h1:FfH+VrHHk6Lxt9HdVS0PXzSXFyS2NbZKXv33FYPol0A= github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b/go.mod h1:AC62GU6hc0BrNm+9RK9VSiwa/EUe1bkIeFORAMcHvJU= @@ -199,8 +190,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= @@ -242,7 +231,6 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -251,13 +239,11 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -304,15 +290,12 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/api/handler/chatimpl/chat_handler.go b/api/handler/chatimpl/chat_handler.go index c1480c2c..a310f21c 100644 --- a/api/handler/chatimpl/chat_handler.go +++ b/api/handler/chatimpl/chat_handler.go @@ -7,7 +7,6 @@ import ( "chatplus/handler" logger2 "chatplus/logger" "chatplus/service/mj" - "chatplus/store" "chatplus/store/model" "chatplus/store/vo" "chatplus/utils" @@ -34,15 +33,13 @@ var logger = logger2.GetLogger() type ChatHandler struct { handler.BaseHandler db *gorm.DB - leveldb *store.LevelDB redis *redis.Client mjService *mj.Service } -func NewChatHandler(app *core.AppServer, db *gorm.DB, levelDB *store.LevelDB, redis *redis.Client, service *mj.Service) *ChatHandler { +func NewChatHandler(app *core.AppServer, db *gorm.DB, redis *redis.Client, service *mj.Service) *ChatHandler { h := ChatHandler{ db: db, - leveldb: levelDB, redis: redis, mjService: service, } diff --git a/api/handler/sms_handler.go b/api/handler/sms_handler.go index b9be4e2b..07e26067 100644 --- a/api/handler/sms_handler.go +++ b/api/handler/sms_handler.go @@ -4,23 +4,23 @@ import ( "chatplus/core" "chatplus/core/types" "chatplus/service" - "chatplus/store" "chatplus/utils" "chatplus/utils/resp" "github.com/gin-gonic/gin" + "github.com/go-redis/redis/v8" ) const CodeStorePrefix = "/verify/codes/" type SmsHandler struct { BaseHandler - leveldb *store.LevelDB + redis *redis.Client sms *service.AliYunSmsService captcha *service.CaptchaService } -func NewSmsHandler(app *core.AppServer, db *store.LevelDB, sms *service.AliYunSmsService, captcha *service.CaptchaService) *SmsHandler { - handler := &SmsHandler{leveldb: db, sms: sms, captcha: captcha} +func NewSmsHandler(app *core.AppServer, client *redis.Client, sms *service.AliYunSmsService, captcha *service.CaptchaService) *SmsHandler { + handler := &SmsHandler{redis: client, sms: sms, captcha: captcha} handler.App = app return handler } @@ -50,7 +50,7 @@ func (h *SmsHandler) SendCode(c *gin.Context) { } // 存储验证码，等待后面注册验证 - err = h.leveldb.Put(CodeStorePrefix+data.Mobile, code) + _, err = h.redis.Set(c, CodeStorePrefix+data.Mobile, code, 0).Result() if err != nil { resp.ERROR(c, "验证码保存失败") return diff --git a/api/handler/user_handler.go b/api/handler/user_handler.go index 746392dc..0fd9b7a7 100644 --- a/api/handler/user_handler.go +++ b/api/handler/user_handler.go @@ -3,7 +3,6 @@ package handler import ( "chatplus/core" "chatplus/core/types" - "chatplus/store" "chatplus/store/model" "chatplus/store/vo" "chatplus/utils" @@ -23,7 +22,6 @@ type UserHandler struct { BaseHandler db *gorm.DB searcher *xdb.Searcher - leveldb *store.LevelDB redis *redis.Client } @@ -31,9 +29,8 @@ func NewUserHandler( app *core.AppServer, db *gorm.DB, searcher *xdb.Searcher, - levelDB *store.LevelDB, client *redis.Client) *UserHandler { - handler := &UserHandler{db: db, searcher: searcher, leveldb: levelDB, redis: client} + handler := &UserHandler{db: db, searcher: searcher, redis: client} handler.App = app return handler } @@ -44,7 +41,7 @@ func (h *UserHandler) Register(c *gin.Context) { var data struct { Mobile string `json:"mobile"` Password string `json:"password"` - Code int `json:"code"` + Code string `json:"code"` } if err := c.ShouldBindJSON(&data); err != nil { resp.ERROR(c, types.InvalidArgs) @@ -64,8 +61,7 @@ func (h *UserHandler) Register(c *gin.Context) { // 检查验证码 key := CodeStorePrefix + data.Mobile if h.App.SysConfig.EnabledMsg { - var code int - err := h.leveldb.Get(key, &code) + code, err := h.redis.Get(c, key).Result() if err != nil || code != data.Code { resp.ERROR(c, "短信验证码错误") return @@ -107,7 +103,7 @@ func (h *UserHandler) Register(c *gin.Context) { } if h.App.SysConfig.EnabledMsg { - _ = h.leveldb.Delete(key) // 注册成功，删除短信验证码 + _ = h.redis.Del(c, key) // 注册成功，删除短信验证码 } // 自动登录创建 token @@ -323,13 +319,21 @@ func (h *UserHandler) Password(c *gin.Context) { func (h *UserHandler) BindMobile(c *gin.Context) { var data struct { Mobile string `json:"mobile"` - Code int `json:"code"` + Code string `json:"code"` } if err := c.ShouldBindJSON(&data); err != nil { resp.ERROR(c, types.InvalidArgs) return } + // 检查验证码 + key := CodeStorePrefix + data.Mobile + code, err := h.redis.Get(c, key).Result() + if err != nil || code != data.Code { + resp.ERROR(c, "短信验证码错误") + return + } + // 检查手机号是否被其他账号绑定 var item model.User res := h.db.Where("mobile = ?", data.Mobile).First(&item) @@ -338,15 +342,6 @@ func (h *UserHandler) BindMobile(c *gin.Context) { return } - // 检查验证码 - key := CodeStorePrefix + data.Mobile - var code int - err := h.leveldb.Get(key, &code) - if err != nil || code != data.Code { - resp.ERROR(c, "短信验证码错误") - return - } - user, err := utils.GetLoginUser(c, h.db) if err != nil { resp.NotAuth(c) @@ -359,6 +354,6 @@ func (h *UserHandler) BindMobile(c *gin.Context) { return } - _ = h.leveldb.Delete(key) // 删除短信验证码 + _ = h.redis.Del(c, key) // 删除短信验证码 resp.SUCCESS(c) } diff --git a/api/main.go b/api/main.go index 1d0250ac..fb7a3a26 100644 --- a/api/main.go +++ b/api/main.go @@ -94,7 +94,6 @@ func main() { // 初始化数据库 fx.Provide(store.NewGormConfig), fx.Provide(store.NewMysql), - fx.Provide(store.NewLevelDB), fx.Provide(store.NewRedisClient), fx.Provide(func() embed.FS { diff --git a/api/service/aliyun_sms_service.go b/api/service/aliyun_sms_service.go index c18bc9b4..582b34c5 100644 --- a/api/service/aliyun_sms_service.go +++ b/api/service/aliyun_sms_service.go @@ -2,18 +2,16 @@ package service import ( "chatplus/core/types" - "chatplus/store" "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi" ) type AliYunSmsService struct { config *types.AliYunSmsConfig - db *store.LevelDB client *dysmsapi.Client } -func NewAliYunSmsService(config *types.AppConfig, db *store.LevelDB) (*AliYunSmsService, error) { +func NewAliYunSmsService(config *types.AppConfig) (*AliYunSmsService, error) { // 创建阿里云短信客户端 client, err := dysmsapi.NewClientWithAccessKey( "cn-hangzhou", @@ -25,7 +23,6 @@ func NewAliYunSmsService(config *types.AppConfig, db *store.LevelDB) (*AliYunSms return &AliYunSmsService{ config: &config.SmsConfig, - db: db, client: client, }, nil } diff --git a/api/store/leveldb.go b/api/store/leveldb.go deleted file mode 100644 index 8a1a3ca8..00000000 --- a/api/store/leveldb.go +++ /dev/null @@ -1,96 +0,0 @@ -package store - -import ( - "chatplus/store/vo" - "encoding/json" - "github.com/syndtr/goleveldb/leveldb" - "github.com/syndtr/goleveldb/leveldb/util" -) - -type LevelDB struct { - driver *leveldb.DB -} - -func NewLevelDB() (*LevelDB, error) { - db, err := leveldb.OpenFile("data/leveldb", nil) - if err != nil { - return nil, err - } - return &LevelDB{ - driver: db, - }, nil -} - -func (db *LevelDB) Put(key string, value interface{}) error { - bytes, err := json.Marshal(value) - if err != nil { - return err - } - return db.driver.Put([]byte(key), bytes, nil) -} - -func (db *LevelDB) Get(key string, value interface{}) error { - bytes, err := db.driver.Get([]byte(key), nil) - if err != nil { - return err - } - - return json.Unmarshal(bytes, &value) -} - -func (db *LevelDB) Search(prefix string) []string { - var items = make([]string, 0) - iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil) - defer iter.Release() - - for iter.Next() { - items = append(items, string(iter.Value())) - } - return items -} - -func (db *LevelDB) SearchPage(prefix string, page int, pageSize int) *vo.Page { - var items = make([]string, 0) - iter := db.driver.NewIterator(util.BytesPrefix([]byte(prefix)), nil) - defer iter.Release() - - res := &vo.Page{Page: page, PageSize: pageSize} - // 计算数据总数和总页数 - total := 0 - for iter.Next() { - total++ - } - res.TotalPage = (total + pageSize - 1) / pageSize - res.Total = int64(total) - - // 计算目标页码的起始和结束位置 - start := (page - 1) * pageSize - if start > total { - return nil - } - end := start + pageSize - if end > total { - end = total - } - - // 跳转到目标页码的起始位置 - count := 0 - for iter.Next() { - if count >= start { - items = append(items, string(iter.Value())) - } - count++ - } - iter.Release() - res.Items = items - return res -} - -func (db *LevelDB) Delete(key string) error { - return db.driver.Delete([]byte(key), nil) -} - -// Close release resources -func (db *LevelDB) Close() error { - return db.driver.Close() -} diff --git a/api/test/test.go b/api/test/test.go index 79058077..fe125b33 100644 --- a/api/test/test.go +++ b/api/test/test.go @@ -1,5 +1,14 @@ package main -func main() { +import ( + "fmt" + "strconv" +) +func main() { + value, err := strconv.Atoi("012345") + if err != nil { + panic(err) + } + fmt.Println(value) } diff --git a/web/.env.development b/web/.env.development index 276ad755..bbfdc65e 100644 --- a/web/.env.development +++ b/web/.env.development @@ -1,5 +1,5 @@ -VUE_APP_API_HOST=http://localhost:6789 -VUE_APP_WS_HOST=ws://localhost:6789 +VUE_APP_API_HOST=http://localhost:5678 +VUE_APP_WS_HOST=ws://localhost:5678 VUE_APP_USER=18575670125 VUE_APP_PASS=12345678 VUE_APP_ADMIN_USER=admin diff --git a/web/src/components/BindMobile.vue b/web/src/components/BindMobile.vue index 75b3b5de..20d3619b 100644 --- a/web/src/components/BindMobile.vue +++ b/web/src/components/BindMobile.vue @@ -18,7 +18,7 @@ - + diff --git a/web/src/views/Register.vue b/web/src/views/Register.vue index 6565a595..16d35073 100644 --- a/web/src/views/Register.vue +++ b/web/src/views/Register.vue @@ -54,7 +54,7 @@