Merge pull request #567 from flipped-aurora/gva_gormv2_dev

Gva gormv2 dev

server/Dockerfile

 FROM golang:alpine
 
-ENV GO111MODULE=on
-ENV GOPROXY=https://goproxy.io,direct
 WORKDIR /go/src/gin-vue-admin
 COPY . .
 
-RUN go env && go build -o server .
+RUN go generate && go env && go build -o server .
 
 FROM alpine:latest
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"

server/global/global.go

@@ -3,6 +3,8 @@ package global
 import (
 	"gin-vue-admin/utils/timer"
 
+	"golang.org/x/sync/singleflight"
+
 	"go.uber.org/zap"
 
 	"gin-vue-admin/config"
@@ -18,6 +20,7 @@ var (
 	GVA_CONFIG config.Server
 	GVA_VP     *viper.Viper
 	//GVA_LOG    *oplogging.Logger
-	GVA_LOG   *zap.Logger
-	GVA_Timer timer.Timer = timer.NewTimerTask()
+	GVA_LOG                 *zap.Logger
+	GVA_Timer               timer.Timer = timer.NewTimerTask()
+	GVA_Concurrency_Control             = &singleflight.Group{}
 )

server/go.mod

@@ -51,6 +51,7 @@ require (
 	github.com/unrolled/secure v1.0.7
 	go.uber.org/zap v1.10.0
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/tools v0.0.0-20200324003944-a576cf524670 // indirect
 	google.golang.org/protobuf v1.24.0 // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect

server/middleware/jwt.go

@@ -7,11 +7,12 @@ import (
 	"gin-vue-admin/model/request"
 	"gin-vue-admin/model/response"
 	"gin-vue-admin/service"
+	"strconv"
+	"time"
+
 	"github.com/dgrijalva/jwt-go"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
-	"strconv"
-	"time"
 )
 
 func JWTAuth() gin.HandlerFunc {
@@ -48,7 +49,7 @@ func JWTAuth() gin.HandlerFunc {
 		}
 		if claims.ExpiresAt-time.Now().Unix() < claims.BufferTime {
 			claims.ExpiresAt = time.Now().Unix() + global.GVA_CONFIG.JWT.ExpiresTime
-			newToken, _ := j.CreateToken(*claims)
+			newToken, _ := j.CreateTokenByOldToken(token, *claims)
 			newClaims, _ := j.ParseToken(newToken)
 			c.Header("new-token", newToken)
 			c.Header("new-expires-at", strconv.FormatInt(newClaims.ExpiresAt, 10))
@@ -91,6 +92,14 @@ func (j *JWT) CreateToken(claims request.CustomClaims) (string, error) {
 	return token.SignedString(j.SigningKey)
 }
 
+// CreateTokenByOldToken 旧token 换新token 使用归并回源避免并发问题
+func (j *JWT) CreateTokenByOldToken(oldToken string, claims request.CustomClaims) (string, error) {
+	v, err, _ := global.GVA_Concurrency_Control.Do("JWT:"+oldToken, func() (interface{}, error) {
+		return j.CreateToken(claims)
+	})
+	return v.(string), err
+}
+
 // 解析 token
 func (j *JWT) ParseToken(tokenString string) (*request.CustomClaims, error) {
 	token, err := jwt.ParseWithClaims(tokenString, &request.CustomClaims{}, func(token *jwt.Token) (i interface{}, e error) {

server/model/sys_api.go

@@ -9,5 +9,5 @@ type SysApi struct {
 	Path        string `json:"path" gorm:"comment:api路径"`                    // api路径
 	Description string `json:"description" gorm:"comment:api中文描述"`           // api中文描述
 	ApiGroup    string `json:"apiGroup" gorm:"comment:api组"`                 // api组
-	Method      string `json:"method" gorm:"default:POST" gorm:"comment:方法"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
+	Method      string `json:"method" gorm:"default:POST;comment:方法"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
 }

server/resource/template/server/api.go.tpl

@@ -10,6 +10,7 @@ import (
     "go.uber.org/zap"
 )
 
+// Create{{.StructName}} 创建{{.StructName}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.StructName}}
 // @Security ApiKeyAuth
@@ -29,6 +30,7 @@ func Create{{.StructName}}(c *gin.Context) {
 	}
 }
 
+// Delete{{.StructName}} 删除{{.StructName}}
 // @Tags {{.StructName}}
 // @Summary 删除{{.StructName}}
 // @Security ApiKeyAuth
@@ -48,6 +50,7 @@ func Delete{{.StructName}}(c *gin.Context) {
 	}
 }
 
+// Delete{{.StructName}}ByIds 批量删除{{.StructName}}
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.StructName}}
 // @Security ApiKeyAuth
@@ -67,6 +70,7 @@ func Delete{{.StructName}}ByIds(c *gin.Context) {
 	}
 }
 
+// Update{{.StructName}} 更新{{.StructName}}
 // @Tags {{.StructName}}
 // @Summary 更新{{.StructName}}
 // @Security ApiKeyAuth
@@ -86,6 +90,7 @@ func Update{{.StructName}}(c *gin.Context) {
 	}
 }
 
+// Find{{.StructName}} 用id查询{{.StructName}}
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.StructName}}
 // @Security ApiKeyAuth
@@ -105,6 +110,7 @@ func Find{{.StructName}}(c *gin.Context) {
 	}
 }
 
+// Get{{.StructName}}List 分页获取{{.StructName}}列表
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.StructName}}列表
 // @Security ApiKeyAuth

server/resource/template/server/model.go.tpl

@@ -5,6 +5,7 @@ import (
 	"gin-vue-admin/global"
 )
 
+// {{.StructName}} 结构体
 // 如果含有time.Time 请自行import time包
 type {{.StructName}} struct {
       global.GVA_MODEL {{- range .Fields}}
@@ -16,6 +17,7 @@ type {{.StructName}} struct {
 }
 
 {{ if .TableName }}
+// TableName {{.StructName}} 表名
 func ({{.StructName}}) TableName() string {
   return "{{.TableName}}"
 }

server/resource/template/server/router.go.tpl

@@ -6,6 +6,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+// Init{{.StructName}}Router 初始化 {{.StructName}} 路由信息
 func Init{{.StructName}}Router(Router *gin.RouterGroup) {
 	{{.StructName}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
 	{

server/resource/template/server/service.go.tpl

@@ -6,67 +6,43 @@ import (
 	"gin-vue-admin/model/request"
 )
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Create{{.StructName}}
-//@description: 创建{{.StructName}}记录
-//@param: {{.Abbreviation}} model.{{.StructName}}
-//@return: err error
-
+// Create{{.StructName}} 创建{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Create{{.StructName}}({{.Abbreviation}} model.{{.StructName}}) (err error) {
 	err = global.GVA_DB.Create(&{{.Abbreviation}}).Error
 	return err
 }
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Delete{{.StructName}}
-//@description: 删除{{.StructName}}记录
-//@param: {{.Abbreviation}} model.{{.StructName}}
-//@return: err error
-
+// Delete{{.StructName}} 删除{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Delete{{.StructName}}({{.Abbreviation}} model.{{.StructName}}) (err error) {
 	err = global.GVA_DB.Delete(&{{.Abbreviation}}).Error
 	return err
 }
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Delete{{.StructName}}ByIds
-//@description: 批量删除{{.StructName}}记录
-//@param: ids request.IdsReq
-//@return: err error
-
+// Delete{{.StructName}}ByIds 批量删除{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Delete{{.StructName}}ByIds(ids request.IdsReq) (err error) {
 	err = global.GVA_DB.Delete(&[]model.{{.StructName}}{},"id in ?",ids.Ids).Error
 	return err
 }
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Update{{.StructName}}
-//@description: 更新{{.StructName}}记录
-//@param: {{.Abbreviation}} *model.{{.StructName}}
-//@return: err error
-
+// Update{{.StructName}} 更新{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Update{{.StructName}}({{.Abbreviation}} model.{{.StructName}}) (err error) {
 	err = global.GVA_DB.Save(&{{.Abbreviation}}).Error
 	return err
 }
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Get{{.StructName}}
-//@description: 根据id获取{{.StructName}}记录
-//@param: id uint
-//@return: err error, {{.Abbreviation}} model.{{.StructName}}
-
+// Get{{.StructName}} 根据id获取{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Get{{.StructName}}(id uint) (err error, {{.Abbreviation}} model.{{.StructName}}) {
 	err = global.GVA_DB.Where("id = ?", id).First(&{{.Abbreviation}}).Error
 	return
 }
 
-//@author: [piexlmax](https://github.com/piexlmax)
-//@function: Get{{.StructName}}InfoList
-//@description: 分页获取{{.StructName}}记录
-//@param: info request.{{.StructName}}Search
-//@return: err error, list interface{}, total int64
-
+// Get{{.StructName}}InfoList 分页获取{{.StructName}}记录
+// Author [piexlmax](https://github.com/piexlmax)
 func Get{{.StructName}}InfoList(info request.{{.StructName}}Search) (err error, list interface{}, total int64) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
@@ -102,4 +78,4 @@ func Get{{.StructName}}InfoList(info request.{{.StructName}}Search) (err error,
 	err = db.Count(&total).Error
 	err = db.Limit(limit).Offset(offset).Find(&{{.Abbreviation}}s).Error
 	return err, {{.Abbreviation}}s, total
-}
\ No newline at end of file
+}

web/src/view/systemTools/autoCode/index.vue

@@ -58,9 +58,9 @@
         <el-input v-model="form.description" placeholder="中文描述作为自动api描述" />
       </el-form-item>
       <el-form-item label="文件名称" prop="packageName">
-        <el-input v-model="form.packageName" placeholder="生成文件的默认名称" />
+        <el-input v-model="form.packageName" placeholder="生成文件的默认名称(建议为驼峰格式,首字母小写,如sysXxxXxxx)" />
       </el-form-item>
-      <el-form-item label="自动创建api">
+      <el-form-item label="自动创建api(将API相关信息注册到数据库中)">
         <el-checkbox v-model="form.autoCreateApiToSql" />
       </el-form-item>
       <el-form-item label="自动移动文件">
@@ -199,7 +199,7 @@ export default {
         packageName: [
           {
             required: true,
-            message: '文件名称：sys_xxxx_xxxx',
+            message: '文件名称：sysXxxxXxxx',
             trigger: 'blur'
           }
         ]