From 17ca2b2164f06c7a830815ed90407198a7198ba1 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 31 Aug 2021 13:00:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8532718ef6..3f3ab667a7 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -542,7 +542,7 @@ export default { create: 'Create', modify: 'Modify', delete: 'Delete', - delete_confirm: 'Deleting the organization will be associated with deleting the subordinate organization, Are you sure you want to delete it?', + delete_confirm: 'Are you sure you want to delete the organization?', input_name: 'Please enter name', select_organization: 'Please select organization', search_by_name: 'Search by name', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 16e2f4543b..1981b08af8 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -542,7 +542,7 @@ export default { create: '新建組織', modify: '修改組織', delete: '刪除組織', - delete_confirm: '刪除該組織會關聯刪除該組織的下屬組織，確定要刪除嗎?', + delete_confirm: '確定要刪除該組織嗎?', input_name: '請輸入組織名稱', select_organization: '請選擇組織', search_by_name: '根據名稱搜索', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e2d201ea11..b8a3385134 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -542,7 +542,7 @@ export default { create: '新建组织', modify: '修改组织', delete: '删除组织', - delete_confirm: '删除该组织会关联删除该组织的下属组织，确定要删除吗?', + delete_confirm: '确定要删除该组织吗?', input_name: '请输入组织名称', select_organization: '请选择组织', search_by_name: '根据名称搜索', From 6b1f54808b936b73fa391a15761c364dc077f568 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 31 Aug 2021 15:26:49 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84sql=E6=B3=A8?= =?UTF-8?q?=E5=85=A5=E6=8B=A6=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/wrapper/XssAndSqlHttpServletRequestWrapper.java | 2 +- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java index a2fc32e868..dd0f688bbe 100644 --- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java +++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java @@ -235,7 +235,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe if (Arrays.stream(whiteLists.split(",")).anyMatch(item -> url.indexOf(item) != -1)) return false; } Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" + - "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b.*)"); + "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|sleep|extractvalue|updatexml|substring|database|concat|rand)\\b.*)"); Matcher matcher=pattern.matcher(orders.toLowerCase()); return matcher.find(); } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 8532718ef6..3f3ab667a7 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -542,7 +542,7 @@ export default { create: 'Create', modify: 'Modify', delete: 'Delete', - delete_confirm: 'Deleting the organization will be associated with deleting the subordinate organization, Are you sure you want to delete it?', + delete_confirm: 'Are you sure you want to delete the organization?', input_name: 'Please enter name', select_organization: 'Please select organization', search_by_name: 'Search by name', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 16e2f4543b..1981b08af8 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -542,7 +542,7 @@ export default { create: '新建組織', modify: '修改組織', delete: '刪除組織', - delete_confirm: '刪除該組織會關聯刪除該組織的下屬組織，確定要刪除嗎?', + delete_confirm: '確定要刪除該組織嗎?', input_name: '請輸入組織名稱', select_organization: '請選擇組織', search_by_name: '根據名稱搜索', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index e2d201ea11..b8a3385134 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -542,7 +542,7 @@ export default { create: '新建组织', modify: '修改组织', delete: '删除组织', - delete_confirm: '删除该组织会关联删除该组织的下属组织，确定要删除吗?', + delete_confirm: '确定要删除该组织吗?', input_name: '请输入组织名称', select_organization: '请选择组织', search_by_name: '根据名称搜索', From ddd53d9c6973a2c81f879f90dfe5625a3bc5ce3b Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 31 Aug 2021 16:14:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E5=B1=95=E7=A4=BA...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/enshrine/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue index 578816a7a7..28b6752394 100644 --- a/frontend/src/views/panel/enshrine/index.vue +++ b/frontend/src/views/panel/enshrine/index.vue @@ -10,7 +10,7 @@