yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改包名main-->gin-vue-admin

Browse Source
This commit is contained in:
pixel
2019-12-19 09:36:21 +08:00
parent 07364c903b
commit 403a18a1ce
34 changed files with 120 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QMPlusServer/model/sysModel/sys_api.go
+9 -9
View File
@@ -1,11 +1,11 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
)
type SysApi struct {
@@ -27,20 +27,20 @@ func (a *SysApi) CreateApi() (err error) {
func (a *SysApi) DeleteApi() (err error) {
err = qmsql.DEFAULTDB.Delete(a).Error
new(CasbinModel).clearCasbin(1,a.Path)
new(CasbinModel).clearCasbin(1, a.Path)
return err
}
func (a *SysApi) UpdataApi() (err error) {
var oldA SysApi
err = qmsql.DEFAULTDB.Where("id = ?", a.ID).First(&oldA).Error
if(err!=nil){
if err != nil {
return err
}else{
err = new(CasbinModel).CasbinApiUpdata(oldA.Path,a.Path)
if(err!=nil){
} else {
err = new(CasbinModel).CasbinApiUpdata(oldA.Path, a.Path)
if err != nil {
return err
}else{
} else {
err = qmsql.DEFAULTDB.Save(a).Error
}
}
QMPlusServer/model/sysModel/sys_authority.go
+3 -3
View File
@@ -1,11 +1,11 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
)
type SysAuthority struct {
QMPlusServer/model/sysModel/sys_base_menu.go
+3 -3
View File
@@ -2,11 +2,11 @@ package sysModel
import (
"fmt"
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
)
type SysBaseMenu struct {
QMPlusServer/model/sysModel/sys_casbin.go
+19 -21
View File
@@ -2,27 +2,25 @@ package sysModel
import (
"errors"
"gin-vue-admin/init/qmsql"
"github.com/casbin/casbin"
gormadapter "github.com/casbin/gorm-adapter"
"main/init/qmsql"
"strings"
)
type CasbinModel struct {
ID uint `json:"id" gorm:"column:_id"`
Ptype string `json:"ptype" gorm:"column:ptype"`
AuthorityId string `json:"rolename" gorm:"column:v0"`
Path string `json:"path" gorm:"column:v1"`
Method string `json:"method" gorm:"column:v2"`
ID uint `json:"id" gorm:"column:_id"`
Ptype string `json:"ptype" gorm:"column:ptype"`
AuthorityId string `json:"rolename" gorm:"column:v0"`
Path string `json:"path" gorm:"column:v1"`
Method string `json:"method" gorm:"column:v2"`
}
// 更新权限
func (c *CasbinModel) CasbinPUpdata(AuthorityId string,Paths []string)error{
c.clearCasbin(0,AuthorityId)
for _,v:=range Paths{
cm:= CasbinModel{
func (c *CasbinModel) CasbinPUpdata(AuthorityId string, Paths []string) error {
c.clearCasbin(0, AuthorityId)
for _, v := range Paths {
cm := CasbinModel{
ID: 0,
Ptype: "p",
AuthorityId: AuthorityId,
@@ -30,7 +28,7 @@ func (c *CasbinModel) CasbinPUpdata(AuthorityId string,Paths []string)error{
Method: "POST",
}
addflag := c.AddCasbin(cm)
if(addflag == false){
if addflag == false {
return errors.New("存在相同api,添加失败,请联系管理员")
}
}
@@ -38,39 +36,39 @@ func (c *CasbinModel) CasbinPUpdata(AuthorityId string,Paths []string)error{
}
// API更新随动
func (c *CasbinModel) CasbinApiUpdata(oldPath string,newPath string)error{
func (c *CasbinModel) CasbinApiUpdata(oldPath string, newPath string) error {
var cs []CasbinModel
err := qmsql.DEFAULTDB.Table("casbin_rule").Where("v1 = ?",oldPath).Find(&cs).Update("v1", newPath).Error
err := qmsql.DEFAULTDB.Table("casbin_rule").Where("v1 = ?", oldPath).Find(&cs).Update("v1", newPath).Error
return err
}
//添加权限
func (c *CasbinModel) AddCasbin(cm CasbinModel) bool {
e := Casbin()
return e.AddPolicy( cm.AuthorityId, cm.Path, cm.Method)
return e.AddPolicy(cm.AuthorityId, cm.Path, cm.Method)
}
//获取权限列表
func (c *CasbinModel) GetPolicyPathByAuthorityId(AuthorityId string)[]string {
func (c *CasbinModel) GetPolicyPathByAuthorityId(AuthorityId string) []string {
e := Casbin()
var pathList []string
list := e.GetFilteredPolicy(0, AuthorityId)
for _,v:=range list{
for _, v := range list {
pathList = append(pathList, v[1])
}
return pathList
}
//清除匹配的权限
func (c *CasbinModel) clearCasbin(v int,p string) bool {
func (c *CasbinModel) clearCasbin(v int, p string) bool {
e := Casbin()
return e.RemoveFilteredPolicy(v,p)
return e.RemoveFilteredPolicy(v, p)
}
// 自定义规则函数
func ParamsMatch(key1 string, key2 string) bool {
k1arr := strings.Split(key1,"?")
k1arr := strings.Split(key1, "?")
return k1arr[0] == key2
}
QMPlusServer/model/sysModel/sys_menu_authority.go
+1 -1
View File
@@ -2,7 +2,7 @@ package sysModel
import (
"fmt"
"main/init/qmsql"
"gin-vue-admin/init/qmsql"
)
// menu需要构建的点有点多 这里关联关系表直接把所有数据拿过来 用代码实现关联 后期实现主外键模式
QMPlusServer/model/sysModel/sys_user.go
+6 -6
View File
@@ -1,13 +1,13 @@
package sysModel
import (
"gin-vue-admin/controller/servers"
"gin-vue-admin/init/qmsql"
"gin-vue-admin/model/modelInterface"
"gin-vue-admin/tools"
"github.com/jinzhu/gorm"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
"main/controller/servers"
"main/init/qmsql"
"main/model/modelInterface"
"main/tools"
)
type SysUser struct {
@@ -62,8 +62,8 @@ func (u *SysUser) Login() (err error, userInter *SysUser) {
var user SysUser
u.Password = tools.MD5V(u.Password)
err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error
if(err!=nil){
return err,&user
if err != nil {
return err, &user
}
err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error
return err, &user
QMPlusServer/model/sysModel/sys_worfFlow.go
+3 -3
View File
@@ -1,8 +1,8 @@
package sysModel
import (
"gin-vue-admin/init/qmsql"
"github.com/jinzhu/gorm"
"main/init/qmsql"
)
//工作流属性表
@@ -11,13 +11,13 @@ type SysWorkflow struct {
WorkflowNickName string `json:"workflowNickName"` // 工作流名称
WorkflowName string `json:"workflowName"` // 工作流英文id
WorkflowDescription string `json:"workflowDescription"` // 工作流描述
WorkflowStepInfo []SysWorkflowStepInfo `json:"workflowStep"` // 工作流步骤
WorkflowStepInfo []SysWorkflowStepInfo `json:"workflowStep"` // 工作流步骤
}
// 工作流状态表
type SysWorkflowStepInfo struct {
gorm.Model
SysWorkflowID uint `json:"workflowID"` // 所属工作流ID
SysWorkflowID uint `json:"workflowID"` // 所属工作流ID
IsStrat bool `json:"isStrat"` // 是否是开始流节点
StepName string `json:"stepName"` // 工作流名称
StepNo float64 `json:"stepNo"` // 步骤id （第几步）