From 9a035c729b40f8fe24b184fd3c606ca79104309c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <1101766085@qq.com> Date: Sun, 22 Aug 2021 00:13:00 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E4=BC=98=E5=8C=96=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 +++- controller/login.go | 9 +++++---- global/alisms.go | 2 +- global/mysql.go | 2 +- go.mod | 2 +- handle/apis.go | 4 ++-- initialization/casbin.go | 2 +- initialization/db.go | 4 ++-- initialization/init.go | 4 ++-- initialization/redis.go | 4 ++-- main.go | 10 +++++----- middleware/casbin.go | 4 ++-- middleware/jwt.go | 6 +++--- middleware/logger.go | 2 +- middleware/request.go | 6 +++--- repository/apis_repository.go | 4 ++-- repository/menu_repository.go | 4 ++-- repository/request_log_repository.go | 4 ++-- repository/role_menu_repository.go | 4 ++-- repository/role_repository.go | 4 ++-- repository/user_repository.go | 4 ++-- repository/user_role_repository.go | 4 ++-- route/login.go | 2 +- route/route.go | 2 +- route/test.go | 4 ++-- 25 files changed, 52 insertions(+), 49 deletions(-) diff --git a/.env b/.env index f85ecbd..6ffa1de 100644 --- a/.env +++ b/.env @@ -11,4 +11,6 @@ MYSQL_PWD=casbin123 MYSQL_DB=casbin_demo # 阿里云通信配置 ALI_SMS_KEY=LTAI5tBExwETRZcVcpogQCp7 -ALI_SMS_SECRET=afZPFabUs5Vmjr3W6R7reI3dNaGa8o \ No newline at end of file +ALI_SMS_SECRET=afZPFabUs5Vmjr3W6R7reI3dNaGa8o +# JWT 口令 +JWT_SECRET=bgx6yCtxziJ3it37 \ No newline at end of file diff --git a/controller/login.go b/controller/login.go index 9068973..5650984 100644 --- a/controller/login.go +++ b/controller/login.go @@ -3,10 +3,10 @@ package controller import ( "fmt" "github.com/gin-gonic/gin" - . "go_api_tmpl/core" - . "go_api_tmpl/global" - "go_api_tmpl/repository" - "go_api_tmpl/utils" + . "goweb/core" + . "goweb/global" + "goweb/repository" + "goweb/utils" "math/rand" "net/http" "time" @@ -47,6 +47,7 @@ func GetSmsCodeController(ctx *gin.Context) { } err = RedisConn.SetWithTimeout(phoneKey, code, "600") if err != nil { + Log.Errorf("保存验证码到Redis失败: %v", err.Error()) R(ctx).FailWithMessage("验证码发送失败,请稍后重试") return } diff --git a/global/alisms.go b/global/alisms.go index 2ebc8da..f6b5a04 100644 --- a/global/alisms.go +++ b/global/alisms.go @@ -3,7 +3,7 @@ package global import ( "fmt" "github.com/aliyun/alibaba-cloud-sdk-go/services/dysmsapi" - "go_api_tmpl/config" + "goweb/config" ) type aliSmsBot struct{} diff --git a/global/mysql.go b/global/mysql.go index a3c3f9a..428d643 100644 --- a/global/mysql.go +++ b/global/mysql.go @@ -2,10 +2,10 @@ package global import ( "fmt" - . "go_api_tmpl/config" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" + . "goweb/config" "log" "os" "time" diff --git a/go.mod b/go.mod index 468b5ae..0b4d012 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go_api_tmpl +module goweb go 1.16 diff --git a/handle/apis.go b/handle/apis.go index d47bb2c..977548a 100644 --- a/handle/apis.go +++ b/handle/apis.go @@ -2,8 +2,8 @@ package handle import ( "github.com/gin-gonic/gin" - "go_api_tmpl/global" - "go_api_tmpl/repository" + "goweb/global" + "goweb/repository" ) // SaveAllRoute 保存入库所有接口路由信息 diff --git a/initialization/casbin.go b/initialization/casbin.go index 71039a1..6669ac7 100644 --- a/initialization/casbin.go +++ b/initialization/casbin.go @@ -5,7 +5,7 @@ import ( "github.com/casbin/casbin/v2" "github.com/casbin/casbin/v2/model" gormAdapter "github.com/casbin/gorm-adapter/v3" - "go_api_tmpl/global" + "goweb/global" ) // Casbin 初始化Casbin的RABC模型 diff --git a/initialization/db.go b/initialization/db.go index ff28fb2..d109d3b 100644 --- a/initialization/db.go +++ b/initialization/db.go @@ -1,8 +1,8 @@ package initialization import ( - . "go_api_tmpl/global" - "go_api_tmpl/repository" + . "goweb/global" + "goweb/repository" ) // DatabaseTable 初始化数据库表结构 diff --git a/initialization/init.go b/initialization/init.go index c873807..81970f1 100644 --- a/initialization/init.go +++ b/initialization/init.go @@ -1,8 +1,8 @@ package initialization import ( - "go_api_tmpl/config" - "go_api_tmpl/global" + "goweb/config" + "goweb/global" ) func Init() { diff --git a/initialization/redis.go b/initialization/redis.go index b832f05..565392e 100644 --- a/initialization/redis.go +++ b/initialization/redis.go @@ -3,8 +3,8 @@ package initialization import ( "fmt" "github.com/garyburd/redigo/redis" - "go_api_tmpl/config" - "go_api_tmpl/global" + "goweb/config" + "goweb/global" "time" ) diff --git a/main.go b/main.go index cfd9a2c..9b87438 100644 --- a/main.go +++ b/main.go @@ -2,11 +2,11 @@ package main import ( "github.com/gin-gonic/gin" - "go_api_tmpl/core" - "go_api_tmpl/handle" - "go_api_tmpl/initialization" - "go_api_tmpl/middleware" - "go_api_tmpl/route" + "goweb/core" + "goweb/handle" + "goweb/initialization" + "goweb/middleware" + "goweb/route" ) func main() { diff --git a/middleware/casbin.go b/middleware/casbin.go index 0e7083b..8c9e34d 100644 --- a/middleware/casbin.go +++ b/middleware/casbin.go @@ -3,8 +3,8 @@ package middleware import ( "fmt" "github.com/gin-gonic/gin" - "go_api_tmpl/core" - . "go_api_tmpl/global" + "goweb/core" + . "goweb/global" "net/http" ) diff --git a/middleware/jwt.go b/middleware/jwt.go index 9ee1ec5..6b9dbec 100644 --- a/middleware/jwt.go +++ b/middleware/jwt.go @@ -3,9 +3,9 @@ package middleware import ( "github.com/gin-gonic/gin" "github.com/golang-jwt/jwt" - "go_api_tmpl/core" - "go_api_tmpl/global" - "go_api_tmpl/utils" + "goweb/core" + "goweb/global" + "goweb/utils" "net/http" ) diff --git a/middleware/logger.go b/middleware/logger.go index 20c9ded..4dc3f5d 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -2,7 +2,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go_api_tmpl/global" + "goweb/global" "time" ) diff --git a/middleware/request.go b/middleware/request.go index 0aa7f8f..ec34a07 100644 --- a/middleware/request.go +++ b/middleware/request.go @@ -3,9 +3,9 @@ package middleware import ( "bytes" "github.com/gin-gonic/gin" - "go_api_tmpl/core" - "go_api_tmpl/model" - "go_api_tmpl/repository" + "goweb/core" + "goweb/model" + "goweb/repository" "io/ioutil" "net/http" "time" diff --git a/repository/apis_repository.go b/repository/apis_repository.go index 58686b6..d1643b9 100644 --- a/repository/apis_repository.go +++ b/repository/apis_repository.go @@ -2,8 +2,8 @@ package repository import ( "github.com/gin-gonic/gin" - . "go_api_tmpl/global" - "go_api_tmpl/model" + . "goweb/global" + "goweb/model" ) type apisRepository struct{} diff --git a/repository/menu_repository.go b/repository/menu_repository.go index a6d59c2..4eb363d 100644 --- a/repository/menu_repository.go +++ b/repository/menu_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type menuRepository struct{} diff --git a/repository/request_log_repository.go b/repository/request_log_repository.go index e4fbdab..425c903 100644 --- a/repository/request_log_repository.go +++ b/repository/request_log_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type requestLogRepository struct{} diff --git a/repository/role_menu_repository.go b/repository/role_menu_repository.go index 1a5d9e8..cecfd34 100644 --- a/repository/role_menu_repository.go +++ b/repository/role_menu_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type roleMenuRepository struct{} diff --git a/repository/role_repository.go b/repository/role_repository.go index b8f86eb..876e38f 100644 --- a/repository/role_repository.go +++ b/repository/role_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type roleRepository struct{} diff --git a/repository/user_repository.go b/repository/user_repository.go index c96ffab..2267ed1 100644 --- a/repository/user_repository.go +++ b/repository/user_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type userRepository struct{} diff --git a/repository/user_role_repository.go b/repository/user_role_repository.go index 423132f..9993ff9 100644 --- a/repository/user_role_repository.go +++ b/repository/user_role_repository.go @@ -1,8 +1,8 @@ package repository import ( - "go_api_tmpl/global" - "go_api_tmpl/model" + "goweb/global" + "goweb/model" ) type userRoleRepository struct{} diff --git a/route/login.go b/route/login.go index 4c956ac..7c238c1 100644 --- a/route/login.go +++ b/route/login.go @@ -2,7 +2,7 @@ package route import ( "github.com/gin-gonic/gin" - "go_api_tmpl/controller" + "goweb/controller" ) // 初始化登录相关接口路由 diff --git a/route/route.go b/route/route.go index c2debb2..a907fd9 100644 --- a/route/route.go +++ b/route/route.go @@ -2,7 +2,7 @@ package route import ( "github.com/gin-gonic/gin" - "go_api_tmpl/core" + "goweb/core" ) func InitRoute(app *gin.Engine) { diff --git a/route/test.go b/route/test.go index 73b6f45..a9ec7b3 100644 --- a/route/test.go +++ b/route/test.go @@ -2,8 +2,8 @@ package route import ( "github.com/gin-gonic/gin" - "go_api_tmpl/core" - "go_api_tmpl/middleware" + "goweb/core" + "goweb/middleware" ) func initTestRoute(r *gin.RouterGroup) {