修改,兼容go-admin sdk方案

This commit is contained in:
linwenxiang committed 2021-03-09 19:12:49 +08:00
1 parent c541d09076
commit 25d8364bf4
151 files changed
+578 -3525

No files matched your search

@@ -7,7 +7,7 @@ import (
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
@@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/apis/{{.ModuleName}}"
"go-admin/app/admin/middleware"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
@@ -3,7 +3,7 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/apis/{{.ModuleName}}"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
@@ -7,7 +7,7 @@ import (
"go-admin/app/{{.PackageName}}/models"
"go-admin/app/{{.PackageName}}/service/dto"
"go-admin/common/actions"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"go-admin/app/{{.PackageName}}/models"
"go-admin/common/dto"
"go-admin/tools"
"go-admin/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
)
type {{.ClassName}}Search struct {
+8 -6
View File
@@ -1,15 +1,17 @@
package {{.ModuleName}}
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/service"
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"go-admin/app/admin/models"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/actions"
"go-admin/common/apis"
"go-admin/tools"
)
type {{.ClassName}} struct {
@@ -110,7 +112,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
service{{.ClassName}} := service.{{.ClassName}}{}
service{{.ClassName}}.Orm = db
@@ -148,7 +150,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
//数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -184,7 +186,7 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
}
// 设置编辑人
control.SetUpdateBy(tools.GetUserId(c))
control.SetUpdateBy(user.GetUserId(c))
// 数据权限检查
p := actions.GetPermissionFromContext(c)
@@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/apis/{{.ModuleName}}"
"go-admin/app/admin/middleware"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
@@ -3,7 +3,7 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/apis/{{.ModuleName}}"
jwt "go-admin/pkg/jwtauth"
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
)
func init() {
+3 -1
View File
@@ -2,12 +2,14 @@ package service
import (
"errors"
"gorm.io/gorm"
"go-admin/app/admin/models"
"go-admin/common/actions"
cDto "go-admin/common/dto"
"go-admin/app/admin/service/dto"
"go-admin/common/service"
"gorm.io/gorm"
)
type {{.ClassName}} struct {