From c1d8d78a2e09dfcb629f93532e89539a59e852eb Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 10 Nov 2023 17:07:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/casbin_rule_gen.go | 24 ------------- model/gmodel/casbin_rule_logic.go | 2 -- model/gmodel/fs_admin_api_gen.go | 32 ----------------- model/gmodel/fs_admin_api_logic.go | 2 -- model/gmodel/fs_admin_auth_role_gen.go | 33 ----------------- model/gmodel/fs_admin_auth_role_logic.go | 2 -- model/gmodel/fs_admin_department_gen.go | 35 ------------------ model/gmodel/fs_admin_department_logic.go | 2 -- model/gmodel/fs_admin_menu_gen.go | 44 ----------------------- model/gmodel/fs_admin_menu_logic.go | 2 -- model/gmodel/fs_admin_role_api_gen.go | 23 ------------ model/gmodel/fs_admin_role_api_logic.go | 2 -- model/gmodel/fs_admin_role_gen.go | 34 ------------------ model/gmodel/fs_admin_role_logic.go | 2 -- model/gmodel/fs_admin_user_gen.go | 44 ----------------------- model/gmodel/fs_admin_user_logic.go | 2 -- model/gmodel/fs_message_log_gen.go | 3 +- model/gmodel/var_gen.go | 6 ---- 18 files changed, 1 insertion(+), 293 deletions(-) delete mode 100644 model/gmodel/casbin_rule_gen.go delete mode 100644 model/gmodel/casbin_rule_logic.go delete mode 100644 model/gmodel/fs_admin_api_gen.go delete mode 100644 model/gmodel/fs_admin_api_logic.go delete mode 100644 model/gmodel/fs_admin_auth_role_gen.go delete mode 100644 model/gmodel/fs_admin_auth_role_logic.go delete mode 100644 model/gmodel/fs_admin_department_gen.go delete mode 100644 model/gmodel/fs_admin_department_logic.go delete mode 100644 model/gmodel/fs_admin_menu_gen.go delete mode 100644 model/gmodel/fs_admin_menu_logic.go delete mode 100644 model/gmodel/fs_admin_role_api_gen.go delete mode 100644 model/gmodel/fs_admin_role_api_logic.go delete mode 100644 model/gmodel/fs_admin_role_gen.go delete mode 100644 model/gmodel/fs_admin_role_logic.go delete mode 100644 model/gmodel/fs_admin_user_gen.go delete mode 100644 model/gmodel/fs_admin_user_logic.go diff --git a/model/gmodel/casbin_rule_gen.go b/model/gmodel/casbin_rule_gen.go deleted file mode 100644 index 57bd8599..00000000 --- a/model/gmodel/casbin_rule_gen.go +++ /dev/null @@ -1,24 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" -) - -// casbin_rule -type CasbinRule struct { - PType *string `gorm:"default:'';" json:"p_type"` // - V0 *string `gorm:"default:'';" json:"v0"` // - V1 *string `gorm:"default:'';" json:"v1"` // - V2 *string `gorm:"default:'';" json:"v2"` // - V3 *string `gorm:"default:'';" json:"v3"` // - V4 *string `gorm:"default:'';" json:"v4"` // - V5 *string `gorm:"default:'';" json:"v5"` // -} -type CasbinRuleModel struct { - db *gorm.DB - name string -} - -func NewCasbinRuleModel(db *gorm.DB) *CasbinRuleModel { - return &CasbinRuleModel{db: db, name: "casbin_rule"} -} diff --git a/model/gmodel/casbin_rule_logic.go b/model/gmodel/casbin_rule_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/casbin_rule_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_api_gen.go b/model/gmodel/fs_admin_api_gen.go deleted file mode 100644 index 10102f0e..00000000 --- a/model/gmodel/fs_admin_api_gen.go +++ /dev/null @@ -1,32 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_api 后台--接口表 -type FsAdminApi struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - Name *string `gorm:"default:'';" json:"name"` // - Path *string `gorm:"default:'';" json:"path"` // - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 - Method *int64 `gorm:"default:0;" json:"method"` // 接口方法 -} -type FsAdminApiModel struct { - db *gorm.DB - name string -} - -func NewFsAdminApiModel(db *gorm.DB) *FsAdminApiModel { - return &FsAdminApiModel{db: db, name: "fs_admin_api"} -} diff --git a/model/gmodel/fs_admin_api_logic.go b/model/gmodel/fs_admin_api_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_api_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_auth_role_gen.go b/model/gmodel/fs_admin_auth_role_gen.go deleted file mode 100644 index f9075654..00000000 --- a/model/gmodel/fs_admin_auth_role_gen.go +++ /dev/null @@ -1,33 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_auth_role 后台--角色表 -type FsAdminAuthRole struct { - Id int64 `gorm:"primary_key;default:0;" json:"id"` // 序号 - RolePid *int64 `gorm:"default:0;" json:"role_pid"` // 上级角色 - RoleName *string `gorm:"default:'';" json:"role_name"` // - DataAuthType *int64 `gorm:"default:1;" json:"data_auth_type"` // 数据权限类型 - DataAuth *string `gorm:"default:'';" json:"data_auth"` // - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 -} -type FsAdminAuthRoleModel struct { - db *gorm.DB - name string -} - -func NewFsAdminAuthRoleModel(db *gorm.DB) *FsAdminAuthRoleModel { - return &FsAdminAuthRoleModel{db: db, name: "fs_admin_auth_role"} -} diff --git a/model/gmodel/fs_admin_auth_role_logic.go b/model/gmodel/fs_admin_auth_role_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_auth_role_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_department_gen.go b/model/gmodel/fs_admin_department_gen.go deleted file mode 100644 index 87f421eb..00000000 --- a/model/gmodel/fs_admin_department_gen.go +++ /dev/null @@ -1,35 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_department 后台--部门表 -type FsAdminDepartment struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - DeptPid *int64 `gorm:"default:0;" json:"dept_pid"` // 上级部门 - DeptNo *string `gorm:"default:'';" json:"dept_no"` // - DeptName *string `gorm:"unique_key;default:'';" json:"dept_name"` // - ShortName *string `gorm:"default:'';" json:"short_name"` // - UserId *int64 `gorm:"default:0;" json:"user_id"` // 部门负责人 - Phone *string `gorm:"default:'';" json:"phone"` // - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 -} -type FsAdminDepartmentModel struct { - db *gorm.DB - name string -} - -func NewFsAdminDepartmentModel(db *gorm.DB) *FsAdminDepartmentModel { - return &FsAdminDepartmentModel{db: db, name: "fs_admin_department"} -} diff --git a/model/gmodel/fs_admin_department_logic.go b/model/gmodel/fs_admin_department_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_department_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_menu_gen.go b/model/gmodel/fs_admin_menu_gen.go deleted file mode 100644 index 06841189..00000000 --- a/model/gmodel/fs_admin_menu_gen.go +++ /dev/null @@ -1,44 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_menu 后台--菜单表 -type FsAdminMenu struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - Pid *int64 `gorm:"default:0;" json:"pid"` // 上级菜单 - Name *string `gorm:"unique_key;default:'';" json:"name"` // - Path *string `gorm:"default:'';" json:"path"` // - Hide *string `gorm:"default:'';" json:"hide"` // - Type *int64 `gorm:"default:0;" json:"type"` // 类型：1=菜单，2=iframe，3=外链，4=按钮 - Alias *string `gorm:"default:'';" json:"alias"` // - Icon *string `gorm:"default:'';" json:"icon"` // - Redirect *string `gorm:"default:'';" json:"redirect"` // - Highlight *string `gorm:"default:'';" json:"highlight"` // - View *string `gorm:"default:'';" json:"view"` // - Colour *string `gorm:"default:'';" json:"colour"` // - FullPageRout *int64 `gorm:"default:0;" json:"full_page_rout"` // 整页路由：1=是，0=否 - Label *string `gorm:"default:'';" json:"label"` // - Metadata *[]byte `gorm:"default:'';" json:"metadata"` // 元数据,json格式 - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 - ApiAuth *[]byte `gorm:"default:'';" json:"api_auth"` // -} -type FsAdminMenuModel struct { - db *gorm.DB - name string -} - -func NewFsAdminMenuModel(db *gorm.DB) *FsAdminMenuModel { - return &FsAdminMenuModel{db: db, name: "fs_admin_menu"} -} diff --git a/model/gmodel/fs_admin_menu_logic.go b/model/gmodel/fs_admin_menu_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_menu_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_role_api_gen.go b/model/gmodel/fs_admin_role_api_gen.go deleted file mode 100644 index 4fa47b17..00000000 --- a/model/gmodel/fs_admin_role_api_gen.go +++ /dev/null @@ -1,23 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" -) - -// fs_admin_role_api 后台--角色接口表 -type FsAdminRoleApi struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - RoleId *int64 `gorm:"index;default:0;" json:"role_id"` // 角色ID - MenuId *int64 `gorm:"index;default:0;" json:"menu_id"` // 菜单ID - ApiId *int64 `gorm:"index;default:0;" json:"api_id"` // 接口ID - ApiPath *string `gorm:"default:'';" json:"api_path"` // - ApiMethod *int64 `gorm:"default:0;" json:"api_method"` // 接口方法 -} -type FsAdminRoleApiModel struct { - db *gorm.DB - name string -} - -func NewFsAdminRoleApiModel(db *gorm.DB) *FsAdminRoleApiModel { - return &FsAdminRoleApiModel{db: db, name: "fs_admin_role_api"} -} diff --git a/model/gmodel/fs_admin_role_api_logic.go b/model/gmodel/fs_admin_role_api_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_role_api_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_role_gen.go b/model/gmodel/fs_admin_role_gen.go deleted file mode 100644 index 79b28060..00000000 --- a/model/gmodel/fs_admin_role_gen.go +++ /dev/null @@ -1,34 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_role 后台--角色表 -type FsAdminRole struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - RolePid *int64 `gorm:"default:0;" json:"role_pid"` // 上级角色 - RoleName *string `gorm:"unique_key;default:'';" json:"role_name"` // - DataAuthType *int64 `gorm:"default:1;" json:"data_auth_type"` // 数据权限类型 - DataAuth *[]byte `gorm:"default:'';" json:"data_auth"` // - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 - MenuAuth *[]byte `gorm:"default:'';" json:"menu_auth"` // -} -type FsAdminRoleModel struct { - db *gorm.DB - name string -} - -func NewFsAdminRoleModel(db *gorm.DB) *FsAdminRoleModel { - return &FsAdminRoleModel{db: db, name: "fs_admin_role"} -} diff --git a/model/gmodel/fs_admin_role_logic.go b/model/gmodel/fs_admin_role_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_role_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_admin_user_gen.go b/model/gmodel/fs_admin_user_gen.go deleted file mode 100644 index 8a1ba415..00000000 --- a/model/gmodel/fs_admin_user_gen.go +++ /dev/null @@ -1,44 +0,0 @@ -package gmodel - -import ( - "gorm.io/gorm" - "time" -) - -// fs_admin_user 后台--管理员表 -type FsAdminUser struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // 序号 - DepartmentId *int64 `gorm:"default:0;" json:"department_id"` // 部门 - RoleId *int64 `gorm:"default:0;" json:"role_id"` // 角色 - EmployeeId *int64 `gorm:"default:0;" json:"employee_id"` // 员工 - Type *int64 `gorm:"default:0;" json:"type"` // 类型：1=超级管理员，2=普通管理员 - Account *string `gorm:"unique_key;default:'';" json:"account"` // - Password *string `gorm:"default:'';" json:"password"` // - Nickname *string `gorm:"default:'';" json:"nickname"` // - Mobile *string `gorm:"default:'';" json:"mobile"` // - Email *string `gorm:"default:'';" json:"email"` // - Salt *string `gorm:"default:'';" json:"salt"` // - LoginInitPassword *string `gorm:"default:'';" json:"login_init_password"` // - LoginLastTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"login_last_time"` // - LoginLastIp *string `gorm:"default:'';" json:"login_last_ip"` // - LoginNum *int64 `gorm:"default:0;" json:"login_num"` // 登录次数 - Status *int64 `gorm:"default:2;" json:"status"` // 状态:1=启用,2=停用 - Remark *string `gorm:"default:'';" json:"remark"` // - Sort *int64 `gorm:"default:0;" json:"sort"` // 排序权重 - CreateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"create_time"` // - UpdateTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"update_time"` // - DeleteTime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"delete_time"` // - CreateUid *int64 `gorm:"default:0;" json:"create_uid"` // 创建人 - UpdateUid *int64 `gorm:"default:0;" json:"update_uid"` // 更新人 - DeleteUid *int64 `gorm:"default:0;" json:"delete_uid"` // 删除人 - IsDel *int64 `gorm:"default:0;" json:"is_del"` // 是否删除：1=是 0=否 - RoleIds *string `gorm:"default:'';" json:"role_ids"` // -} -type FsAdminUserModel struct { - db *gorm.DB - name string -} - -func NewFsAdminUserModel(db *gorm.DB) *FsAdminUserModel { - return &FsAdminUserModel{db: db, name: "fs_admin_user"} -} diff --git a/model/gmodel/fs_admin_user_logic.go b/model/gmodel/fs_admin_user_logic.go deleted file mode 100644 index e68225aa..00000000 --- a/model/gmodel/fs_admin_user_logic.go +++ /dev/null @@ -1,2 +0,0 @@ -package gmodel -// TODO: 使用model的属性做你想做的 \ No newline at end of file diff --git a/model/gmodel/fs_message_log_gen.go b/model/gmodel/fs_message_log_gen.go index 07be29a2..cb9b8fe5 100644 --- a/model/gmodel/fs_message_log_gen.go +++ b/model/gmodel/fs_message_log_gen.go @@ -1,9 +1,8 @@ package gmodel import ( - "time" - "gorm.io/gorm" + "time" ) // fs_message_log 消息记录表 diff --git a/model/gmodel/var_gen.go b/model/gmodel/var_gen.go index 4b7122fd..b2b073d8 100644 --- a/model/gmodel/var_gen.go +++ b/model/gmodel/var_gen.go @@ -119,10 +119,7 @@ type AllModelsGen struct { FsUserStock *FsUserStockModel // fs_user_stock 用户云仓库存 FsWebSet *FsWebSetModel // fs_web_set 网站配置表 FsZipCode *FsZipCodeModel // fs_zip_code 邮编表 - LdapApis *LdapApisModel // ldap_apis LdapCasbinRule *LdapCasbinRuleModel // ldap_casbin_rule 规则权限表 - LdapMenus *LdapMenusModel // ldap_menus - LdapUsers *LdapUsersModel // ldap_users } @@ -243,10 +240,7 @@ func NewAllModels(gdb *gorm.DB) *AllModelsGen { FsUserStock: NewFsUserStockModel(gdb), FsWebSet: NewFsWebSetModel(gdb), FsZipCode: NewFsZipCodeModel(gdb), - LdapApis: NewLdapApisModel(gdb), LdapCasbinRule: NewLdapCasbinRuleModel(gdb), - LdapMenus: NewLdapMenusModel(gdb), - LdapUsers: NewLdapUsersModel(gdb), } return models }