修改目录结构

This commit is contained in:
zhengxinonly
2021-06-22 23:42:25 +08:00
parent 05dff28523
commit 6da6768f81
18 changed files with 637 additions and 626 deletions
+20 -20
View File
@@ -1,4 +1,4 @@
from applications.common.utils.validate import xss_escape
from flask import escape
from applications.extensions import db
from applications.models import DictType, DictData, DictTypeSchema, DictDataSchema
from applications.common.curd import model_to_dicts
@@ -39,10 +39,10 @@ def get_dict_data(page, limit, type_code):
# 增加 dict type
def save_dict_type(req_json):
description = xss_escape(req_json.get("description"))
enable = xss_escape(req_json.get("enable"))
type_code = xss_escape(req_json.get("typeCode"))
type_name = xss_escape(req_json.get("typeName"))
description = escape(req_json.get("description"))
enable = escape(req_json.get("enable"))
type_code = escape(req_json.get("typeCode"))
type_name = escape(req_json.get("typeName"))
d = DictType(type_name=type_name, type_code=type_code, enable=enable, description=description)
db.session.add(d)
db.session.commit()
@@ -51,11 +51,11 @@ def save_dict_type(req_json):
# 编辑字典类型
def update_dict_type(req_json):
id = xss_escape(req_json.get("id"))
description = xss_escape(req_json.get("description"))
enable = xss_escape(req_json.get("enable"))
type_code = xss_escape(req_json.get("typeCode"))
type_name = xss_escape(req_json.get("typeName"))
id = escape(req_json.get("id"))
description = escape(req_json.get("description"))
enable = escape(req_json.get("enable"))
type_code = escape(req_json.get("typeCode"))
type_name = escape(req_json.get("typeName"))
DictType.query.filter_by(id=id).update({
"description": description,
"enable": enable,
@@ -95,11 +95,11 @@ def delete_type_by_id(id):
# 增加dictdata
def save_dict_data(req_json):
data_label = xss_escape(req_json.get("dataLabel"))
data_value = xss_escape(req_json.get("dataValue"))
enable = xss_escape(req_json.get("enable"))
remark = xss_escape(req_json.get("remark"))
type_code = xss_escape(req_json.get("typeCode"))
data_label = escape(req_json.get("dataLabel"))
data_value = escape(req_json.get("dataValue"))
enable = escape(req_json.get("enable"))
remark = escape(req_json.get("remark"))
type_code = escape(req_json.get("typeCode"))
d = DictData(data_label=data_label, data_value=data_value, enable=enable, remark=remark, type_code=type_code)
db.session.add(d)
db.session.commit()
@@ -110,11 +110,11 @@ def save_dict_data(req_json):
def update_dict_data(req_json):
id = req_json.get("dataId")
DictData.query.filter_by(id=id).update({
"data_label": xss_escape(req_json.get("dataLabel")),
"data_value": xss_escape(req_json.get("dataValue")),
"enable": xss_escape(req_json.get("enable")),
"remark": xss_escape(req_json.get("remark")),
"type_code": xss_escape(req_json.get("typeCode"))
"data_label": escape(req_json.get("dataLabel")),
"data_value": escape(req_json.get("dataValue")),
"enable": escape(req_json.get("enable")),
"remark": escape(req_json.get("remark")),
"type_code": escape(req_json.get("typeCode"))
})
db.session.commit()
return
+17 -17
View File
@@ -1,4 +1,4 @@
from applications.common.utils.validate import xss_escape
from flask import escape
from applications.extensions import db
from applications.models.rights.power import Power, PowerSchema2
from applications.models import Role
@@ -21,14 +21,14 @@ def select_parent():
# 增加权限
def save_power(req):
icon = xss_escape(req.get("icon"))
openType = xss_escape(req.get("openType"))
parentId = xss_escape(req.get("parentId"))
powerCode = xss_escape(req.get("powerCode"))
powerName = xss_escape(req.get("powerName"))
powerType = xss_escape(req.get("powerType"))
powerUrl = xss_escape(req.get("powerUrl"))
sort = xss_escape(req.get("sort"))
icon = escape(req.get("icon"))
openType = escape(req.get("openType"))
parentId = escape(req.get("parentId"))
powerCode = escape(req.get("powerCode"))
powerName = escape(req.get("powerName"))
powerType = escape(req.get("powerType"))
powerUrl = escape(req.get("powerUrl"))
sort = escape(req.get("sort"))
power = Power(
icon=icon,
open_type=openType,
@@ -55,14 +55,14 @@ def get_power_by_id(id):
def update_power(req_json):
id = req_json.get("powerId")
data = {
"icon": xss_escape(req_json.get("icon")),
"open_type": xss_escape(req_json.get("openType")),
"parent_id": xss_escape(req_json.get("parentId")),
"code": xss_escape(req_json.get("powerCode")),
"name": xss_escape(req_json.get("powerName")),
"type": xss_escape(req_json.get("powerType")),
"url": xss_escape(req_json.get("powerUrl")),
"sort": xss_escape(req_json.get("sort"))
"icon": escape(req_json.get("icon")),
"open_type": escape(req_json.get("openType")),
"parent_id": escape(req_json.get("parentId")),
"code": escape(req_json.get("powerCode")),
"name": escape(req_json.get("powerName")),
"type": escape(req_json.get("powerType")),
"url": escape(req_json.get("powerUrl")),
"sort": escape(req_json.get("sort"))
}
# print(data)
power = Power.query.filter_by(id=id).update(data)
+11 -11
View File
@@ -1,6 +1,5 @@
from sqlalchemy import and_
from applications.common.utils.validate import xss_escape
from applications.extensions import db
from applications.models import Role, RoleSchema
from applications.models.rights.power import Power, PowerSchema2
@@ -11,6 +10,7 @@ from applications.common.curd import model_to_dicts
def get_role_data(page, limit, filters):
print(page, limit, filters)
role = Role.query.filter(and_(*[getattr(Role, k).like(v) for k, v in filters.items()])).paginate(page=page,
per_page=limit,
error_out=False)
@@ -27,11 +27,11 @@ def get_role_data_dict(page, limit, filters):
def add_role(req):
""" 增加角色 """
details = xss_escape(req.get("details"))
enable = xss_escape(req.get("enable"))
roleCode = xss_escape(req.get("roleCode"))
roleName = xss_escape(req.get("roleName"))
sort = xss_escape(req.get("sort"))
details = req.get("details")
enable = req.get("enable")
roleCode = req.get("roleCode")
roleName = req.get("roleName")
sort = req.get("sort")
role = Role(
details=details,
enable=enable,
@@ -53,11 +53,11 @@ def update_role(req_json):
""" 更新角色 """
_id = req_json.get("roleId")
data = {
"code": xss_escape(req_json.get("roleCode")),
"name": xss_escape(req_json.get("roleName")),
"sort": xss_escape(req_json.get("sort")),
"enable": xss_escape(req_json.get("enable")),
"details": xss_escape(req_json.get("details"))
"code": req_json.get("roleCode"),
"name": req_json.get("roleName"),
"sort": req_json.get("sort"),
"enable": req_json.get("enable"),
"details": req_json.get("details")
}
role = Role.query.filter_by(id=_id).update(data)
db.session.commit()