From 499c60a00a44cffd7ceb9c6416f48774a1b690cc Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Mon, 21 Feb 2022 15:15:09 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dao/mapper/SysDataPermMapper.xml | 2 -
.../upmsservice/dao/mapper/SysMenuMapper.xml | 1 -
.../dao/mapper/SysPermCodeMapper.xml | 1 -
.../upmsservice/dao/mapper/SysPermMapper.xml | 1 -
.../dao/mapper/SysPermModuleMapper.xml | 6 +-
.../upmsservice/dao/mapper/SysRoleMapper.xml | 2 -
.../upmsservice/model/SysDataPerm.java | 7 -
.../upmsservice/model/SysMenu.java | 7 -
.../upmsservice/model/SysPerm.java | 7 -
.../upmsservice/model/SysPermCode.java | 7 -
.../upmsservice/model/SysPermModule.java | 7 -
.../upmsservice/model/SysRole.java | 7 -
.../service/impl/SysDataPermServiceImpl.java | 2 -
.../service/impl/SysMenuServiceImpl.java | 4 -
.../service/impl/SysPermCodeServiceImpl.java | 2 -
.../impl/SysPermModuleServiceImpl.java | 2 -
.../service/impl/SysPermServiceImpl.java | 2 -
.../service/impl/SysRoleServiceImpl.java | 2 -
.../zz-resource/db-scripts/areacode.sql | 3682 --------
.../db-scripts/init-upms-data-script.sql | 727 --
.../db-scripts/operation-log-script.sql | 37 -
.../db-scripts/rollback-upms-data-script.sql | 728 --
.../zz-resource/db-scripts/seata-script.sql | 21 +
.../zz-resource/db-scripts/uaa-script.sql | 89 -
.../zz-resource/db-scripts/upms-script.sql | 330 -
.../zz-resource/db-scripts/xxl-job.sql | 181 +
.../zz-resource/db-scripts/zzdemo-multi.sql | 7810 ++++++++++++++++
.../dao/mapper/SysDataPermMapper.xml | 2 -
.../upmsservice/dao/mapper/SysMenuMapper.xml | 1 -
.../dao/mapper/SysPermCodeMapper.xml | 1 -
.../upmsservice/dao/mapper/SysPermMapper.xml | 1 -
.../dao/mapper/SysPermModuleMapper.xml | 6 +-
.../upmsservice/dao/mapper/SysRoleMapper.xml | 2 -
.../upmsservice/model/SysDataPerm.java | 7 -
.../upmsservice/model/SysMenu.java | 7 -
.../upmsservice/model/SysPerm.java | 7 -
.../upmsservice/model/SysPermCode.java | 7 -
.../upmsservice/model/SysPermModule.java | 7 -
.../upmsservice/model/SysRole.java | 7 -
.../service/impl/SysDataPermServiceImpl.java | 2 -
.../service/impl/SysMenuServiceImpl.java | 4 -
.../service/impl/SysPermCodeServiceImpl.java | 2 -
.../impl/SysPermModuleServiceImpl.java | 2 -
.../service/impl/SysPermServiceImpl.java | 2 -
.../service/impl/SysRoleServiceImpl.java | 2 -
.../zz-resource/db-scripts/areacode.sql | 3682 --------
.../db-scripts/init-upms-data-script.sql | 726 --
.../db-scripts/operation-log-script.sql | 37 -
.../db-scripts/rollback-upms-data-script.sql | 727 --
.../zz-resource/db-scripts/seata-script.sql | 21 +
.../zz-resource/db-scripts/upms-script.sql | 331 -
.../zz-resource/db-scripts/xxl-job.sql | 181 +
.../zz-resource/db-scripts/zzdemo-multi.sql | 7713 ++++++++++++++++
.../orange-demo-single-pg-service/.gitignore | 26 -
.../upms/dao/mapper/SysDataPermMapper.xml | 2 -
.../upms/dao/mapper/SysMenuMapper.xml | 1 -
.../upms/dao/mapper/SysPermCodeMapper.xml | 1 -
.../upms/dao/mapper/SysPermMapper.xml | 1 -
.../upms/dao/mapper/SysPermModuleMapper.xml | 6 +-
.../upms/dao/mapper/SysRoleMapper.xml | 2 -
.../webadmin/upms/model/SysDataPerm.java | 7 -
.../webadmin/upms/model/SysMenu.java | 7 -
.../webadmin/upms/model/SysPerm.java | 7 -
.../webadmin/upms/model/SysPermCode.java | 7 -
.../webadmin/upms/model/SysPermModule.java | 7 -
.../webadmin/upms/model/SysRole.java | 7 -
.../service/impl/SysDataPermServiceImpl.java | 2 -
.../upms/service/impl/SysMenuServiceImpl.java | 4 -
.../service/impl/SysPermCodeServiceImpl.java | 2 -
.../impl/SysPermModuleServiceImpl.java | 2 -
.../upms/service/impl/SysPermServiceImpl.java | 2 -
.../upms/service/impl/SysRoleServiceImpl.java | 2 -
.../zz-resource/db-scripts/areacode.sql | 3682 --------
.../db-scripts/init-upms-data-script.sql | 714 --
.../db-scripts/rollback-upms-data-script.sql | 712 --
.../zz-resource/db-scripts/upms-script.sql | 301 -
.../zz-resource/db-scripts/zzdemo-single.sql | 7913 +++++++++++++++++
77 files changed, 23843 insertions(+), 16735 deletions(-)
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/areacode.sql
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/init-upms-data-script.sql
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/operation-log-script.sql
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/rollback-upms-data-script.sql
create mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/seata-script.sql
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/uaa-script.sql
delete mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/upms-script.sql
create mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/xxl-job.sql
create mode 100644 orange-demo-multi-uaa/orange-demo-multi-service-uaa/zz-resource/db-scripts/zzdemo-multi.sql
delete mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/areacode.sql
delete mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/init-upms-data-script.sql
delete mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/operation-log-script.sql
delete mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/rollback-upms-data-script.sql
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/seata-script.sql
delete mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/upms-script.sql
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/xxl-job.sql
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/zzdemo-multi.sql
delete mode 100644 orange-demo-single/orange-demo-single-pg-service/.gitignore
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/areacode.sql
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/init-upms-data-script.sql
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/rollback-upms-data-script.sql
delete mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/upms-script.sql
create mode 100644 orange-demo-single/orange-demo-single-service/zz-resource/db-scripts/zzdemo-single.sql
diff --git a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml
index 9f007f71..b850b449 100644
--- a/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml
+++ b/orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/upms/upms-service/src/main/java/com/orangeforms/upmsservice/dao/mapper/SysDataPermMapper.xml
@@ -9,7 +9,6 @@
-
@@ -29,7 +28,6 @@
AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString}
- AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}