diff --git a/.gitignore b/.gitignore index 0e6ebd8..a6aac31 100644 --- a/.gitignore +++ b/.gitignore @@ -31,8 +31,6 @@ wwwroot/provider/ wwwroot/reseller/ wwwroot/role/ wwwroot/rolepermission/ -wwwroot/userapp/ -wwwroot/userdepartment/ wwwroot/userrole/ wwwroot/users/ mysql.ddl.sql \ No newline at end of file diff --git a/json/userapp.json b/json/userapp.json deleted file mode 100644 index a2da0c7..0000000 --- a/json/userapp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "tblname": "userapp", - "title":"用户", - "params": { - "confidential_fields":["apikey"], - "sortby":"appname", - "browserfields": { - "exclouded": ["id", "userid"], - "alters": {} - }, - "editexclouded": [ - "id", "userid" - ], - "record_toolbar": null - } -} diff --git a/json/userdepartment.json b/json/userdepartment.json deleted file mode 100644 index 1dbd9b4..0000000 --- a/json/userdepartment.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "tblname": "userdepartment", - "title":"用户", - "params": { - "browserfields": { - "exclouded": ["id", "userid"], - "cwidth": {} - }, - "editexclouded": [ - "id", "userid" - ], - "record_toolbar": null - } -} diff --git a/models/userapp.json b/models/userapp.json deleted file mode 100644 index 653e595..0000000 --- a/models/userapp.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "summary": [ - { - "name": "userapp", - "title": "用户应用", - "primary": [ - "id" - ], - "catelog": "entity" - } - ], - "fields": [ - { - "name": "id", - "title": "id", - "type": "str", - "length": 32 - }, - { - "name": "userid", - "title": "用户id", - "type": "str", - "length": 32, - "default": "0" - }, - { - "name": "appname", - "title": "应用名称", - "type": "str", - "length": 99 - }, - { - "name": "apikey", - "title": "apikey", - "type": "str", - "length": 400 - }, - { - "name": "enabled_date", - "title": "启用日期", - "type": "date" - }, - { - "name": "expired_date", - "title": "失效日期", - "type": "date" - }, - { - "name": "allowed_ips", - "title": "允许IP集", - "type": "str", - "length": 200 - } - ] -} \ No newline at end of file diff --git a/models/userapp.xlsx b/models/userapp.xlsx deleted file mode 100644 index c03a1bb..0000000 Binary files a/models/userapp.xlsx and /dev/null differ diff --git a/models/userdepartment.json b/models/userdepartment.json deleted file mode 100644 index 5d68646..0000000 --- a/models/userdepartment.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "summary": [ - { - "name": "userdepartment", - "title": "用户部门表", - "primary": [ - "id" - ] - } - ], - "fields": [ - { - "name": "id", - "title": "id", - "type": "str", - "length": 32 - }, - { - "name": "userid", - "title": "用户id", - "type": "str", - "length": 32 - }, - { - "name": "depid", - "title": "部门id", - "type": "str", - "length": 32 - } - ] -} \ No newline at end of file diff --git a/models/userdepartment.xlsx b/models/userdepartment.xlsx deleted file mode 100644 index 0e4df52..0000000 Binary files a/models/userdepartment.xlsx and /dev/null differ diff --git a/script/init.py b/script/init.py index 17c2340..032ca01 100644 --- a/script/init.py +++ b/script/init.py @@ -70,8 +70,7 @@ type_roles = { } rbac_tables = [ - "organization", "orgtypes", "role", "users", "userrole", "rolepermission", "permission", - "userapp", "userdepartment" ] + "organization", "orgtypes", "role", "users", "userrole", "rolepermission", "permission" ] role_perms = { 'superuser': [ diff --git a/scripts/load_path.py b/scripts/load_path.py index fea5808..c10a21b 100644 --- a/scripts/load_path.py +++ b/scripts/load_path.py @@ -71,8 +71,6 @@ PATHS_LOGINED = [ f"/{MOD}/user/edit_profile.dspy", f"/{MOD}/user/save_profile.dspy", f"/{MOD}/user/wechat_login.ui", - f"/{MOD}/userapp", - f"/{MOD}/userdepartment", f"/{MOD}/userrole", f"/{MOD}/users", f"/{MOD}/usersync",