From 45de390cc2aacca184184aca4c397ee500f9b617 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Fri, 22 Oct 2021 09:50:54 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E5=90=8C=E6=AD=A52.0=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=EF=BC=88=E6=B7=BB=E5=8A=A0=E6=8C=87=E5=AE=9A=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E4=BA=BA=E5=8A=9F=E8=83=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/assets/style/element-variables.scss | 4 +-
.../src/assets/theme/dropdown.css | 4 +-
.../src/assets/theme/index.css | 20 +-
.../src/assets/theme/menu.css | 12 +-
.../src/assets/theme/table-column.css | 4 +-
.../src/staticDict/flowStaticDict.js | 5 +
.../onlineForm/components/customUpload.vue | 13 +-
.../workflow/components/HandlerFlowTask.vue | 2 +
.../views/workflow/components/TaskCommit.vue | 8 +-
.../workflow/components/TaskUserSelect.vue | 14 +
.../views/workflow/handlerFlowTask/index.vue | 7 +-
.../src/views/workflow/mixins/flowMixins.js | 4 +-
.../src/staticDict/flowStaticDict.js | 5 +
.../onlineForm/components/customUpload.vue | 13 +-
.../workflow/components/HandlerFlowTask.vue | 2 +
.../views/workflow/components/TaskCommit.vue | 8 +-
.../workflow/components/TaskUserSelect.vue | 14 +
.../views/workflow/handlerFlowTask/index.vue | 7 +-
.../src/views/workflow/mixins/flowMixins.js | 4 +-
.../orange-demo-multi-service/.idea/.name | 1 +
...Maven__com_baomidou_mybatis_plus_3_4_2.xml | 13 +
...baomidou_mybatis_plus_annotation_3_4_2.xml | 13 +
...omidou_mybatis_plus_boot_starter_3_4_2.xml | 13 +
...__com_baomidou_mybatis_plus_core_3_4_2.xml | 13 +
..._baomidou_mybatis_plus_extension_3_4_2.xml | 13 +
...Maven__com_google_code_gson_gson_2_8_6.xml | 13 +
...aven__com_thoughtworks_qdox_qdox_2_0_0.xml | 13 +
.../Maven__com_xuxueli_xxl_job_core_2_2_0.xml | 13 +
...Maven__io_netty_netty_all_4_1_63_Final.xml | 13 +
...ven__org_codehaus_groovy_groovy_2_5_14.xml | 13 +
.../Maven__org_mybatis_mybatis_3_5_5.xml | 13 +
...aven__org_mybatis_mybatis_spring_2_0_5.xml | 13 +
...work_kafka_spring_kafka_2_5_12_RELEASE.xml | 13 +
...ework_retry_spring_retry_1_2_5_RELEASE.xml | 13 +
...mework_spring_messaging_5_2_14_RELEASE.xml | 13 +
.../application-consumer.iml | 174 +
.../operation-log-consumer.iml | 238 +
.../operation-log-consumer/pom.xml | 47 +
.../OperationLogConsumerApplication.java | 20 +
.../config/DataSourceConfig.java | 30 +
.../consumer/OperationLogConsumer.java | 90 +
.../src/main/resources/bootstrap.yml | 19 +
.../src/main/resources/log4j2.xml | 79 +
.../application-consumer/pom.xml | 24 +
.../demo/upmsapi/client/SysDeptClient.java | 156 +
.../demo/upmsapi/dto/SysDataPermDeptDto.java | 28 +
.../demo/upmsapi/dto/SysDataPermDto.java | 56 +
.../orange/demo/upmsapi/dto/SysDeptDto.java | 47 +
.../demo/upmsapi/dto/SysOperationLogDto.java | 78 +
.../demo/upmsapi/vo/SysDataPermDeptVo.java | 28 +
.../orange/demo/upmsapi/vo/SysDataPermVo.java | 72 +
.../com/orange/demo/upmsapi/vo/SysDeptVo.java | 66 +
.../demo/upmsapi/vo/SysOperationLogVo.java | 145 +
.../upmsservice/config/DataSourceType.java | 47 +
.../config/MultiDataSourceConfig.java | 55 +
.../controller/SysDataPermController.java | 303 +
.../controller/SysDeptController.java | 365 ++
.../controller/SysOperationLogController.java | 61 +
.../dao/SysDataPermDeptMapper.java | 13 +
.../upmsservice/dao/SysDataPermMapper.java | 35 +
.../dao/SysDataPermUserMapper.java | 13 +
.../demo/upmsservice/dao/SysDeptMapper.java | 51 +
.../dao/SysDeptRelationMapper.java | 43 +
.../dao/mapper/SysDataPermDeptMapper.xml | 8 +
.../dao/mapper/SysDataPermMapper.xml | 62 +
.../dao/mapper/SysDataPermUserMapper.xml | 8 +
.../upmsservice/dao/mapper/SysDeptMapper.xml | 89 +
.../dao/mapper/SysDeptRelationMapper.xml | 29 +
.../demo/upmsservice/model/SysDataPerm.java | 92 +
.../upmsservice/model/SysDataPermDept.java | 29 +
.../upmsservice/model/SysDataPermUser.java | 27 +
.../demo/upmsservice/model/SysDept.java | 58 +
.../upmsservice/model/SysDeptRelation.java | 31 +
.../service/SysDataPermService.java | 104 +
.../upmsservice/service/SysDeptService.java | 104 +
.../service/impl/SysDataPermServiceImpl.java | 336 ++
.../service/impl/SysDeptServiceImpl.java | 279 +
.../common-datafilter/common-datafilter.iml | 232 +
.../common/common-datafilter/pom.xml | 29 +
.../aop/DisableDataFilterAspect.java | 41 +
.../config/DataFilterAutoConfig.java | 13 +
.../config/DataFilterProperties.java | 44 +
.../config/DataFilterWebMvcConfigurer.java | 21 +
.../datafilter/constant/DataPermRuleType.java | 69 +
.../interceptor/DataFilterInterceptor.java | 42 +
.../MybatisDataFilterInterceptor.java | 469 ++
.../listener/LoadDataFilterInfoListener.java | 25 +
.../main/resources/META-INF/spring.factories | 2 +
.../common/common-log/common-log.iml | 218 +
.../common/common-log/pom.xml | 47 +
.../common/log/annotation/OperationLog.java | 33 +
.../common/log/aop/OperationLogAspect.java | 251 +
.../log/config/CommonLogAutoConfig.java | 13 +
.../log/config/OperationLogProperties.java | 24 +
.../common/log/dao/SysOperationLogMapper.java | 34 +
.../log/dao/mapper/SysOperationLogMapper.xml | 99 +
.../common/log/model/SysOperationLog.java | 170 +
.../model/constant/SysOperationLogType.java | 149 +
.../log/service/SysOperationLogService.java | 45 +
.../impl/SysOperationLogServiceImpl.java | 84 +
.../main/resources/META-INF/spring.factories | 2 +
.../common/common-xxljob/common-xxljob.iml | 217 +
.../common/common-xxljob/pom.xml | 33 +
.../common/xxljob/aop/JobHandlerAspect.java | 38 +
.../common/xxljob/config/XxlJobConfig.java | 45 +
.../framework/apidoc-tools/apidoc-tools.iml | 215 +
.../framework/apidoc-tools/pom.xml | 29 +
.../demo/apidoc/tools/ExportApiApp.java | 28 +
.../demo/apidoc/tools/ExportDocApp.java | 28 +
.../tools/codeparser/ApiCodeConfig.java | 83 +
.../tools/codeparser/ApiCodeParser.java | 672 +++
.../ApiCodeConfigParseException.java | 27 +
.../tools/exception/MapperParseException.java | 27 +
.../apidoc/tools/export/ApiDocExporter.java | 84 +
.../tools/export/ApiPostmanExporter.java | 53 +
.../apidoc/tools/util/FreeMarkerUtils.java | 28 +
.../src/main/resources/export-api-config.json | 44 +
.../main/resources/templates/api-doc.md.ftl | 144 +
.../templates/postman_collection.json.ftl | 42 +
.../resources/templates/postman_common.ftl | 120 +
.../operation-log-consumer-dev.yaml | 92 +
.../zz-resource/db-scripts/zzdemo-multi.sql | 4993 +++++++++++++++++
.../.kafka_cleanshutdown | 0
.../data/kafka/kafka-logs-f72147b765a8/.lock | 0
.../00000000000000000000.index | Bin 0 -> 32 bytes
.../00000000000000000000.log | Bin 0 -> 19266 bytes
.../00000000000000000000.timeindex | Bin 0 -> 60 bytes
.../00000000000000000021.snapshot | Bin 0 -> 10 bytes
.../SysOperationLog-0/leader-epoch-checkpoint | 3 +
.../cleaner-offset-checkpoint | 0
.../log-start-offset-checkpoint | 2 +
.../kafka-logs-f72147b765a8/meta.properties | 5 +
.../recovery-point-offset-checkpoint | 4 +
.../replication-offset-checkpoint | 4 +
.../zz-log-topic-0/00000000000000000000.index | Bin 0 -> 712 bytes
.../zz-log-topic-0/00000000000000000000.log | Bin 0 -> 395859 bytes
.../00000000000000000000.timeindex | Bin 0 -> 1044 bytes
.../00000000000000001101.snapshot | Bin 0 -> 10 bytes
.../zz-log-topic-0/leader-epoch-checkpoint | 3 +
.../derby-data/README_DO_NOT_TOUCH_FILES.txt | 9 +
.../docker-files/data/nacos/derby-data/db.lck | Bin 0 -> 38 bytes
.../data/nacos/derby-data/dbex.lck | Bin 0 -> 4 bytes
.../log/README_DO_NOT_TOUCH_FILES.txt | 8 +
.../data/nacos/derby-data/log/log.ctrl | Bin 0 -> 48 bytes
.../data/nacos/derby-data/log/log1.dat | Bin 0 -> 1048576 bytes
.../data/nacos/derby-data/log/logmirror.ctrl | Bin 0 -> 48 bytes
.../seg0/README_DO_NOT_TOUCH_FILES.txt | 8 +
.../data/nacos/derby-data/seg0/c10.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c101.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c111.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c121.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c130.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c141.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c150.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c161.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c171.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c180.dat | Bin 0 -> 40960 bytes
.../data/nacos/derby-data/seg0/c191.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c1a1.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c1b1.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c1c0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c1d1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c1e0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c1f1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c20.dat | Bin 0 -> 69632 bytes
.../data/nacos/derby-data/seg0/c200.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c211.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c221.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c230.dat | Bin 0 -> 118784 bytes
.../data/nacos/derby-data/seg0/c241.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c251.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c260.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c271.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c281.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c290.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2a1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2b1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2c1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2d0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2e1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c2f0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c300.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c31.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c311.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c321.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c331.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c340.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c351.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c361.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c371.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c380.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c391.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3a1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3b1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3c0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3d1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3e1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c3f1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c400.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c41.dat | Bin 0 -> 20480 bytes
.../data/nacos/derby-data/seg0/c411.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c421.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c430.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c441.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c451.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c461.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c470.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c481.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c490.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c4a1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c4b1.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c4c1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c4d1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c4e1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c4f0.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c501.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c51.dat | Bin 0 -> 16384 bytes
.../data/nacos/derby-data/seg0/c511.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c521.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c531.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c540.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c551.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c561.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c570.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c581.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c591.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c5a0.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c5b1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c5c1.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c5d0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c5e1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c5f1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c60.dat | Bin 0 -> 12288 bytes
.../data/nacos/derby-data/seg0/c600.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c611.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c621.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c630.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c641.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c651.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c660.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c671.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c681.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c691.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6a0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6b1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6c1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6d0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6e1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c6f1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c700.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c71.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c711.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c721.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c731.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c740.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c751.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c760.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c771.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c780.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c791.dat | Bin 0 -> 65536 bytes
.../data/nacos/derby-data/seg0/c81.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/c90.dat | Bin 0 -> 69632 bytes
.../data/nacos/derby-data/seg0/ca1.dat | Bin 0 -> 36864 bytes
.../data/nacos/derby-data/seg0/cb1.dat | Bin 0 -> 24576 bytes
.../data/nacos/derby-data/seg0/cc0.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/cd1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/ce1.dat | Bin 0 -> 8192 bytes
.../data/nacos/derby-data/seg0/cf0.dat | Bin 0 -> 12288 bytes
.../data/nacos/derby-data/service.properties | 23 +
.../data/nacos/naming/meta.properties | 0
.../docker-files/data/redis/dump.rdb | Bin 0 -> 1235 bytes
.../data/zookeeper/version-2/log.1 | Bin 0 -> 67108880 bytes
.../docker-files/docker-compose-full.yml | 148 +
.../docker-files/logs/nacos/alipay-jraft.log | 0
.../docker-files/logs/nacos/cmdb-main.log | 0
.../logs/nacos/config-client-request.log | 868 +++
.../docker-files/logs/nacos/config-dump.log | 0
.../docker-files/logs/nacos/config-fatal.log | 2 +
.../docker-files/logs/nacos/config-memory.log | 2462 ++++++++
.../docker-files/logs/nacos/config-notify.log | 0
.../logs/nacos/config-pull-check.log | 12 +
.../docker-files/logs/nacos/config-pull.log | 0
.../docker-files/logs/nacos/config-server.log | 48 +
.../docker-files/logs/nacos/config-trace.log | 49 +
.../docker-files/logs/nacos/core-auth.log | 0
.../docker-files/logs/nacos/istio-main.log | 0
.../docker-files/logs/nacos/nacos-address.log | 0
.../docker-files/logs/nacos/nacos-cluster.log | 6 +
.../docker-files/logs/nacos/nacos.log | 103 +
.../logs/nacos/nacos_gc.log.0.current | 12 +
.../docker-files/logs/nacos/naming-distro.log | 2 +
.../docker-files/logs/nacos/naming-event.log | 48 +
.../logs/nacos/naming-performance.log | 28 +
.../docker-files/logs/nacos/naming-push.log | 138 +
.../docker-files/logs/nacos/naming-raft.log | 50 +
.../docker-files/logs/nacos/naming-rt.log | 0
.../docker-files/logs/nacos/naming-server.log | 56 +
.../logs/nacos/protocol-distro.log | 0
.../docker-files/logs/nacos/protocol-raft.log | 0
.../docker-files/logs/nacos/start.out | 44 +
.../docker-files/logs/redis/redis_6379.log | 85 +
.../docker-files/logs/zookeeper/myid | 1 +
.../logs/zookeeper/version-2/snapshot.0 | Bin 0 -> 424 bytes
.../services/elasticsearch/Dockerfile | 7 +
.../services/elasticsearch/elasticsearch.yml | 15 +
.../docker-files/services/kibana/Dockerfile | 3 +
.../docker-files/services/kibana/kibana.yml | 13 +
.../docker-files/services/logstash/Dockerfile | 3 +
.../services/logstash/config/logstash.yml | 2 +
.../services/logstash/config/pipelines.yml | 6 +
.../services/logstash/pipeline/kafka.conf | 15 +
.../314334322e4448e493c624ce6cfe220a.png | Bin 0 -> 9808 bytes
.../api/Controller/SysDataPermController.js | 61 +
.../src/api/Controller/SysDeptController.js | 25 +
.../views/upms/formEditSysDataPerm/index.vue | 243 +
.../src/views/upms/formEditSysDept/index.vue | 201 +
.../upms/formSetSysDataPermUser/index.vue | 211 +
.../src/views/upms/formSysDataPerm/index.vue | 479 ++
.../src/views/upms/formSysDept/index.vue | 178 +
.../views/upms/formSysOperationLog/index.vue | 215 +
.../upms/formViewSysOperationLog/index.vue | 120 +
321 files changed, 19171 insertions(+), 40 deletions(-)
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/.name
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_0.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_xuxueli_xxl_job_core_2_2_0.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__io_netty_netty_all_4_1_63_Final.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_kafka_spring_kafka_2_5_12_RELEASE.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_14_RELEASE.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/application-consumer.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/operation-log-consumer.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/OperationLogConsumerApplication.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/config/DataSourceConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/consumer/OperationLogConsumer.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/bootstrap.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/log4j2.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application-consumer/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysDeptClient.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDeptDto.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDto.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDeptDto.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysOperationLogDto.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermDeptVo.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermVo.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDeptVo.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysOperationLogVo.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceType.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/MultiDataSourceConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysDataPermController.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysDeptController.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysOperationLogController.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysDataPermDeptMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysDataPermMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysDataPermUserMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysDeptMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysDeptRelationMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysDataPermDeptMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysDataPermMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysDataPermUserMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysDeptMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysDeptRelationMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysDataPerm.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysDataPermDept.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysDataPermUser.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysDept.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysDeptRelation.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysDataPermService.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysDeptService.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysDataPermServiceImpl.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysDeptServiceImpl.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/common-datafilter.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/aop/DisableDataFilterAspect.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterAutoConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterProperties.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/config/DataFilterWebMvcConfigurer.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/constant/DataPermRuleType.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/DataFilterInterceptor.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/interceptor/MybatisDataFilterInterceptor.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/java/com/orange/demo/common/datafilter/listener/LoadDataFilterInfoListener.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-datafilter/src/main/resources/META-INF/spring.factories
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/common-log.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/annotation/OperationLog.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/aop/OperationLogAspect.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/config/CommonLogAutoConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/config/OperationLogProperties.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/SysOperationLogMapper.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/dao/mapper/SysOperationLogMapper.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/model/SysOperationLog.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/model/constant/SysOperationLogType.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/service/SysOperationLogService.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/java/com/orange/demo/common/log/service/impl/SysOperationLogServiceImpl.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-log/src/main/resources/META-INF/spring.factories
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-xxljob/common-xxljob.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-xxljob/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-xxljob/src/main/java/com/orange/demo/common/xxljob/aop/JobHandlerAspect.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/common/common-xxljob/src/main/java/com/orange/demo/common/xxljob/config/XxlJobConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/apidoc-tools.iml
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/pom.xml
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportApiApp.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/ExportDocApp.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeConfig.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/codeparser/ApiCodeParser.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/ApiCodeConfigParseException.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/exception/MapperParseException.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiDocExporter.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/export/ApiPostmanExporter.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/java/com/orange/demo/apidoc/tools/util/FreeMarkerUtils.java
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/resources/export-api-config.json
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/resources/templates/api-doc.md.ftl
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/resources/templates/postman_collection.json.ftl
create mode 100644 orange-demo-multi/orange-demo-multi-service/framework/apidoc-tools/src/main/resources/templates/postman_common.ftl
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/config-data/operation-log-consumer-dev.yaml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/db-scripts/zzdemo-multi.sql
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/.kafka_cleanshutdown
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/.lock
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/SysOperationLog-0/00000000000000000000.index
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/SysOperationLog-0/00000000000000000000.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/SysOperationLog-0/00000000000000000000.timeindex
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/SysOperationLog-0/00000000000000000021.snapshot
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/SysOperationLog-0/leader-epoch-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/cleaner-offset-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/log-start-offset-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/meta.properties
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/recovery-point-offset-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/replication-offset-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/zz-log-topic-0/00000000000000000000.index
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/zz-log-topic-0/00000000000000000000.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/zz-log-topic-0/00000000000000000000.timeindex
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/zz-log-topic-0/00000000000000001101.snapshot
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/kafka/kafka-logs-f72147b765a8/zz-log-topic-0/leader-epoch-checkpoint
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/README_DO_NOT_TOUCH_FILES.txt
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/db.lck
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/dbex.lck
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/log/README_DO_NOT_TOUCH_FILES.txt
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/log/log.ctrl
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/log/log1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/log/logmirror.ctrl
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/README_DO_NOT_TOUCH_FILES.txt
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c10.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c101.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c111.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c121.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c130.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c141.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c150.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c161.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c171.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c180.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c191.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1a1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1c0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1d1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1e0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c1f1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c20.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c200.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c211.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c221.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c230.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c241.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c251.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c260.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c271.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c281.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c290.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2a1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2c1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2d0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2e1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c2f0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c300.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c31.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c311.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c321.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c331.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c340.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c351.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c361.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c371.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c380.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c391.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3a1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3c0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3d1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3e1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c3f1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c400.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c41.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c411.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c421.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c430.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c441.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c451.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c461.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c470.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c481.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c490.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4a1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4c1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4d1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4e1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c4f0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c501.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c51.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c511.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c521.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c531.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c540.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c551.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c561.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c570.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c581.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c591.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5a0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5c1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5d0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5e1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c5f1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c60.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c600.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c611.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c621.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c630.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c641.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c651.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c660.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c671.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c681.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c691.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6a0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6b1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6c1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6d0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6e1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c6f1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c700.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c71.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c711.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c721.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c731.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c740.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c751.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c760.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c771.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c780.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c791.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c81.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/c90.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/ca1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/cb1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/cc0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/cd1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/ce1.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/seg0/cf0.dat
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/derby-data/service.properties
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/nacos/naming/meta.properties
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/redis/dump.rdb
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/data/zookeeper/version-2/log.1
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/docker-compose-full.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/alipay-jraft.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/cmdb-main.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-client-request.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-dump.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-fatal.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-memory.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-notify.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-pull-check.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-pull.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-server.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/config-trace.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/core-auth.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/istio-main.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/nacos-address.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/nacos-cluster.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/nacos.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/nacos_gc.log.0.current
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-distro.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-event.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-performance.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-push.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-raft.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-rt.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/naming-server.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/protocol-distro.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/protocol-raft.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/nacos/start.out
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/redis/redis_6379.log
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/zookeeper/myid
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/logs/zookeeper/version-2/snapshot.0
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/elasticsearch/Dockerfile
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/elasticsearch/elasticsearch.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/kibana/Dockerfile
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/kibana/kibana.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/logstash/Dockerfile
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/logstash/config/logstash.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/logstash/config/pipelines.yml
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/docker-files/services/logstash/pipeline/kafka.conf
create mode 100644 orange-demo-multi/orange-demo-multi-service/zz-resource/upload-files/course-class/image/Course/pictureUrl/314334322e4448e493c624ce6cfe220a.png
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/api/Controller/SysDataPermController.js
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/api/Controller/SysDeptController.js
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formEditSysDataPerm/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formEditSysDept/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formSetSysDataPermUser/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysDataPerm/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysDept/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysOperationLog/index.vue
create mode 100644 orange-demo-multi/orange-demo-multi-web/src/views/upms/formViewSysOperationLog/index.vue
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss b/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss
index f75588ca..45ba475d 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/style/element-variables.scss
@@ -1,5 +1,5 @@
-// @import "../element-variables-light.scss";
-@import "../element-variables-dark.scss";
+@import "../element-variables-light.scss";
+// @import "../element-variables-dark.scss";
// @import "../element-variables-green.scss";
// @import "../element-variables-orange.scss";
// @import "../element-variables-blue.scss";
\ No newline at end of file
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css
index efe9d7ab..74aecbef 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/dropdown.css
@@ -1398,8 +1398,8 @@
cursor: pointer;
outline: none; }
.el-dropdown-menu__item:not(.is-disabled):hover, .el-dropdown-menu__item:focus {
- background-color: #409EFF;
- color: #FFFFFF; }
+ background-color: #ecf5ff;
+ color: #66b1ff; }
.el-dropdown-menu__item i {
margin-right: 5px; }
.el-dropdown-menu__item--divided {
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css
index b34f94c4..d9dac33d 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/index.css
@@ -8039,8 +8039,8 @@
cursor: pointer;
outline: none; }
.el-dropdown-menu__item:not(.is-disabled):hover, .el-dropdown-menu__item:focus {
- background-color: #409EFF;
- color: #FFFFFF; }
+ background-color: #ecf5ff;
+ color: #66b1ff; }
.el-dropdown-menu__item i {
margin-right: 5px; }
.el-dropdown-menu__item--divided {
@@ -8583,7 +8583,7 @@
position: relative;
margin: 0;
padding-left: 0;
- background-color: #272C34; }
+ background-color: #FFFFFF; }
.el-menu::before,
.el-menu::after {
display: table;
@@ -8700,7 +8700,7 @@
height: 56px;
line-height: 56px;
font-size: 14px;
- color: #FFFFFF;
+ color: #303133;
padding: 0 20px;
list-style: none;
cursor: pointer;
@@ -8716,7 +8716,7 @@
color: #909399; }
.el-menu-item:hover, .el-menu-item:focus {
outline: none;
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-menu-item.is-disabled {
opacity: 0.25;
cursor: not-allowed;
@@ -8740,7 +8740,7 @@
height: 56px;
line-height: 56px;
font-size: 14px;
- color: #FFFFFF;
+ color: #303133;
padding: 0 20px;
list-style: none;
cursor: pointer;
@@ -8756,13 +8756,13 @@
color: #909399; }
.el-submenu__title:hover, .el-submenu__title:focus {
outline: none;
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-submenu__title.is-disabled {
opacity: 0.25;
cursor: not-allowed;
background: none !important; }
.el-submenu__title:hover {
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-submenu .el-menu {
border: none; }
.el-submenu .el-menu-item {
@@ -19440,8 +19440,8 @@
cursor: pointer;
font-size: 14px; }
.el-table-filter__list-item:hover {
- background-color: #409EFF;
- color: #FFFFFF; }
+ background-color: #ecf5ff;
+ color: #66b1ff; }
.el-table-filter__list-item.is-active {
background-color: #409EFF;
color: #FFFFFF; }
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css
index 07fe584e..f43f172f 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/menu.css
@@ -490,7 +490,7 @@
position: relative;
margin: 0;
padding-left: 0;
- background-color: #272C34; }
+ background-color: #FFFFFF; }
.el-menu::before,
.el-menu::after {
display: table;
@@ -607,7 +607,7 @@
height: 56px;
line-height: 56px;
font-size: 14px;
- color: #FFFFFF;
+ color: #303133;
padding: 0 20px;
list-style: none;
cursor: pointer;
@@ -623,7 +623,7 @@
color: #909399; }
.el-menu-item:hover, .el-menu-item:focus {
outline: none;
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-menu-item.is-disabled {
opacity: 0.25;
cursor: not-allowed;
@@ -647,7 +647,7 @@
height: 56px;
line-height: 56px;
font-size: 14px;
- color: #FFFFFF;
+ color: #303133;
padding: 0 20px;
list-style: none;
cursor: pointer;
@@ -663,13 +663,13 @@
color: #909399; }
.el-submenu__title:hover, .el-submenu__title:focus {
outline: none;
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-submenu__title.is-disabled {
opacity: 0.25;
cursor: not-allowed;
background: none !important; }
.el-submenu__title:hover {
- background-color: #409EFF; }
+ background-color: #ecf5ff; }
.el-submenu .el-menu {
border: none; }
.el-submenu .el-menu-item {
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css
index d1d98ede..de08606c 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/assets/theme/table-column.css
@@ -1373,8 +1373,8 @@
cursor: pointer;
font-size: 14px; }
.el-table-filter__list-item:hover {
- background-color: #409EFF;
- color: #FFFFFF; }
+ background-color: #ecf5ff;
+ color: #66b1ff; }
.el-table-filter__list-item.is-active {
background-color: #409EFF;
color: #FFFFFF; }
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js b/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js
index 8472e8c6..6d5635fe 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/staticDict/flowStaticDict.js
@@ -101,6 +101,11 @@ const SysFlowTaskOperationType = new DictionaryBase('任务操作类型', [
id: 'multi_abstain',
name: '弃权(会签)',
symbol: 'MULTI_ABSTAIN'
+ },
+ {
+ id: 'set_assignee',
+ name: '指定审批人',
+ symbol: 'SET_ASSIGNEE'
}
]);
Vue.prototype.SysFlowTaskOperationType = SysFlowTaskOperationType;
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue
index c72b1687..9cc5184f 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/onlineForm/components/customUpload.vue
@@ -35,12 +35,15 @@
-
-
-
- {{item.name}}
-
+
+
+
+
+ {{item.name}}
+
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/HandlerFlowTask.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/HandlerFlowTask.vue
index c1fe7b32..b48a1654 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/HandlerFlowTask.vue
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/HandlerFlowTask.vue
@@ -136,6 +136,7 @@ export default {
case this.SysFlowTaskOperationType.CO_SIGN:
case this.SysFlowTaskOperationType.MULTI_AGREE:
case this.SysFlowTaskOperationType.MULTI_SIGN:
+ case this.SysFlowTaskOperationType.SET_ASSIGNEE:
return 'primary';
case this.SysFlowTaskOperationType.SAVE:
return 'success';
@@ -150,6 +151,7 @@ export default {
switch (type) {
case this.SysFlowTaskOperationType.AGREE:
case this.SysFlowTaskOperationType.MULTI_AGREE:
+ case this.SysFlowTaskOperationType.SET_ASSIGNEE:
return 'success';
case this.SysFlowTaskOperationType.REFUSE:
case this.SysFlowTaskOperationType.PARALLEL_REFUSE:
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskCommit.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskCommit.vue
index 7c4d473c..a0b7d4d9 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskCommit.vue
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskCommit.vue
@@ -74,6 +74,7 @@ export default {
this.$dialog.show('选择用户', TaskUserSelect, {
area: ['1000px', '600px']
}, {
+ showAssignee: false,
multiple: this.multiSelect
}).then(res => {
let assignee = null;
@@ -88,7 +89,12 @@ export default {
},
computed: {
showAssignSelect () {
- return [this.SysFlowTaskOperationType.TRANSFER, this.SysFlowTaskOperationType.CO_SIGN, this.SysFlowTaskOperationType.MULTI_SIGN].indexOf(this.operation.type) !== -1;
+ return [
+ this.SysFlowTaskOperationType.TRANSFER,
+ this.SysFlowTaskOperationType.CO_SIGN,
+ this.SysFlowTaskOperationType.MULTI_SIGN,
+ this.SysFlowTaskOperationType.SET_ASSIGNEE
+ ].indexOf(this.operation.type) !== -1;
},
multiSelect () {
return this.operation.type === this.SysFlowTaskOperationType.CO_SIGN || this.operation.type === this.SysFlowTaskOperationType.MULTI_SIGN;
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskUserSelect.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskUserSelect.vue
index 6415f2de..634cba0c 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskUserSelect.vue
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/components/TaskUserSelect.vue
@@ -13,6 +13,9 @@
流程发起人
+
+ 使用指定审批人
+
添加用户
@@ -77,6 +80,11 @@ import { SystemController } from '@/api';
export default {
name: 'TaskUserSelect',
props: {
+ // 是否显示指定审批人
+ showAssignee: {
+ type: Boolean,
+ default: true
+ },
// 是否多选
multiple: {
type: Boolean,
@@ -122,6 +130,12 @@ export default {
loginName: '${startUserName}'
});
},
+ useAppointedAssignee () {
+ this.onCancel(true, {
+ /* eslint-disable-next-line */
+ loginName: '${appointedAssignee}'
+ });
+ },
canSelect (row) {
if (Array.isArray(this.usedUserIdList) && this.usedUserIdList.length > 0) {
return this.usedUserIdList.indexOf(row.loginName) === -1;
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/handlerFlowTask/index.vue b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/handlerFlowTask/index.vue
index 4b3b6733..9536591b 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/handlerFlowTask/index.vue
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/handlerFlowTask/index.vue
@@ -136,10 +136,15 @@ export default {
if (this.isOnlineForm) {
this.$refs.workflowForm.getFormData().then(formData => {
formData.taskVariableData = this.$refs.workflowForm.getVariableData(this.variableList);
- // 会签操作设置多实例处理人集合
+
if (operationType === this.SysFlowTaskOperationType.MULTI_SIGN) {
+ // 会签操作设置多实例处理人集合
if (formData.taskVariableData == null) formData.taskVariableData = {};
formData.taskVariableData.assigneeList = assignee.split(',');
+ } else if (operationType === this.SysFlowTaskOperationType.SET_ASSIGNEE) {
+ // 设置下一个任务节点处理人
+ if (formData.taskVariableData == null) formData.taskVariableData = {};
+ formData.taskVariableData.appointedAssignee = assignee;
}
resolve(formData);
}).catch(e => {
diff --git a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/mixins/flowMixins.js b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/mixins/flowMixins.js
index 3a15ebaa..cd80e534 100644
--- a/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/mixins/flowMixins.js
+++ b/orange-demo-activiti/orange-demo-activiti-web/src/views/workflow/mixins/flowMixins.js
@@ -50,8 +50,8 @@ export default {
isStart ? resolve() : reject();
return;
}
- // 会签或者审批操作
- if (!isStart || operation.type === this.SysFlowTaskOperationType.MULTI_SIGN) {
+ // 会签、指定审批人或者审批操作
+ if (!isStart || operation.type === this.SysFlowTaskOperationType.MULTI_SIGN || operation.type === this.SysFlowTaskOperationType.SET_ASSIGNEE) {
let title = isStart ? '提交' : (operation.type === this.SysFlowTaskOperationType.CO_SIGN ? '加签' : '审批');
this.$dialog.show(title, TaskCommit, {
area: '500px'
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/staticDict/flowStaticDict.js b/orange-demo-flowable/orange-demo-flowable-web/src/staticDict/flowStaticDict.js
index 8472e8c6..6d5635fe 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/staticDict/flowStaticDict.js
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/staticDict/flowStaticDict.js
@@ -101,6 +101,11 @@ const SysFlowTaskOperationType = new DictionaryBase('任务操作类型', [
id: 'multi_abstain',
name: '弃权(会签)',
symbol: 'MULTI_ABSTAIN'
+ },
+ {
+ id: 'set_assignee',
+ name: '指定审批人',
+ symbol: 'SET_ASSIGNEE'
}
]);
Vue.prototype.SysFlowTaskOperationType = SysFlowTaskOperationType;
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/components/customUpload.vue b/orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/components/customUpload.vue
index c72b1687..9cc5184f 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/components/customUpload.vue
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/onlineForm/components/customUpload.vue
@@ -35,12 +35,15 @@
-
-
-
- {{item.name}}
-
+
+
+
+
+ {{item.name}}
+
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/HandlerFlowTask.vue b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/HandlerFlowTask.vue
index c1fe7b32..b48a1654 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/HandlerFlowTask.vue
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/HandlerFlowTask.vue
@@ -136,6 +136,7 @@ export default {
case this.SysFlowTaskOperationType.CO_SIGN:
case this.SysFlowTaskOperationType.MULTI_AGREE:
case this.SysFlowTaskOperationType.MULTI_SIGN:
+ case this.SysFlowTaskOperationType.SET_ASSIGNEE:
return 'primary';
case this.SysFlowTaskOperationType.SAVE:
return 'success';
@@ -150,6 +151,7 @@ export default {
switch (type) {
case this.SysFlowTaskOperationType.AGREE:
case this.SysFlowTaskOperationType.MULTI_AGREE:
+ case this.SysFlowTaskOperationType.SET_ASSIGNEE:
return 'success';
case this.SysFlowTaskOperationType.REFUSE:
case this.SysFlowTaskOperationType.PARALLEL_REFUSE:
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskCommit.vue b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskCommit.vue
index 7c4d473c..a0b7d4d9 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskCommit.vue
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskCommit.vue
@@ -74,6 +74,7 @@ export default {
this.$dialog.show('选择用户', TaskUserSelect, {
area: ['1000px', '600px']
}, {
+ showAssignee: false,
multiple: this.multiSelect
}).then(res => {
let assignee = null;
@@ -88,7 +89,12 @@ export default {
},
computed: {
showAssignSelect () {
- return [this.SysFlowTaskOperationType.TRANSFER, this.SysFlowTaskOperationType.CO_SIGN, this.SysFlowTaskOperationType.MULTI_SIGN].indexOf(this.operation.type) !== -1;
+ return [
+ this.SysFlowTaskOperationType.TRANSFER,
+ this.SysFlowTaskOperationType.CO_SIGN,
+ this.SysFlowTaskOperationType.MULTI_SIGN,
+ this.SysFlowTaskOperationType.SET_ASSIGNEE
+ ].indexOf(this.operation.type) !== -1;
},
multiSelect () {
return this.operation.type === this.SysFlowTaskOperationType.CO_SIGN || this.operation.type === this.SysFlowTaskOperationType.MULTI_SIGN;
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskUserSelect.vue b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskUserSelect.vue
index 6415f2de..634cba0c 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskUserSelect.vue
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/components/TaskUserSelect.vue
@@ -13,6 +13,9 @@
流程发起人
+
+ 使用指定审批人
+
添加用户
@@ -77,6 +80,11 @@ import { SystemController } from '@/api';
export default {
name: 'TaskUserSelect',
props: {
+ // 是否显示指定审批人
+ showAssignee: {
+ type: Boolean,
+ default: true
+ },
// 是否多选
multiple: {
type: Boolean,
@@ -122,6 +130,12 @@ export default {
loginName: '${startUserName}'
});
},
+ useAppointedAssignee () {
+ this.onCancel(true, {
+ /* eslint-disable-next-line */
+ loginName: '${appointedAssignee}'
+ });
+ },
canSelect (row) {
if (Array.isArray(this.usedUserIdList) && this.usedUserIdList.length > 0) {
return this.usedUserIdList.indexOf(row.loginName) === -1;
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/handlerFlowTask/index.vue b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/handlerFlowTask/index.vue
index 4b3b6733..9536591b 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/handlerFlowTask/index.vue
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/handlerFlowTask/index.vue
@@ -136,10 +136,15 @@ export default {
if (this.isOnlineForm) {
this.$refs.workflowForm.getFormData().then(formData => {
formData.taskVariableData = this.$refs.workflowForm.getVariableData(this.variableList);
- // 会签操作设置多实例处理人集合
+
if (operationType === this.SysFlowTaskOperationType.MULTI_SIGN) {
+ // 会签操作设置多实例处理人集合
if (formData.taskVariableData == null) formData.taskVariableData = {};
formData.taskVariableData.assigneeList = assignee.split(',');
+ } else if (operationType === this.SysFlowTaskOperationType.SET_ASSIGNEE) {
+ // 设置下一个任务节点处理人
+ if (formData.taskVariableData == null) formData.taskVariableData = {};
+ formData.taskVariableData.appointedAssignee = assignee;
}
resolve(formData);
}).catch(e => {
diff --git a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/mixins/flowMixins.js b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/mixins/flowMixins.js
index 3a15ebaa..cd80e534 100644
--- a/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/mixins/flowMixins.js
+++ b/orange-demo-flowable/orange-demo-flowable-web/src/views/workflow/mixins/flowMixins.js
@@ -50,8 +50,8 @@ export default {
isStart ? resolve() : reject();
return;
}
- // 会签或者审批操作
- if (!isStart || operation.type === this.SysFlowTaskOperationType.MULTI_SIGN) {
+ // 会签、指定审批人或者审批操作
+ if (!isStart || operation.type === this.SysFlowTaskOperationType.MULTI_SIGN || operation.type === this.SysFlowTaskOperationType.SET_ASSIGNEE) {
let title = isStart ? '提交' : (operation.type === this.SysFlowTaskOperationType.CO_SIGN ? '加签' : '审批');
this.$dialog.show(title, TaskCommit, {
area: '500px'
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/.name b/orange-demo-multi/orange-demo-multi-service/.idea/.name
new file mode 100644
index 00000000..eaf507fb
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/.name
@@ -0,0 +1 @@
+OrangeMultiDemo
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
new file mode 100644
index 00000000..2303492c
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_3_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
new file mode 100644
index 00000000..6aa04155
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_annotation_3_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
new file mode 100644
index 00000000..7038c58d
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_boot_starter_3_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
new file mode 100644
index 00000000..ce4ef9dc
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_core_3_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
new file mode 100644
index 00000000..3a86667f
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_baomidou_mybatis_plus_extension_3_4_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
new file mode 100644
index 00000000..82a9f20a
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_google_code_gson_gson_2_8_6.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_0.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_0.xml
new file mode 100644
index 00000000..4e5902a8
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_thoughtworks_qdox_qdox_2_0_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_xuxueli_xxl_job_core_2_2_0.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_xuxueli_xxl_job_core_2_2_0.xml
new file mode 100644
index 00000000..9b1db26c
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__com_xuxueli_xxl_job_core_2_2_0.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__io_netty_netty_all_4_1_63_Final.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__io_netty_netty_all_4_1_63_Final.xml
new file mode 100644
index 00000000..0026f782
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__io_netty_netty_all_4_1_63_Final.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml
new file mode 100644
index 00000000..179c9746
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_codehaus_groovy_groovy_2_5_14.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml
new file mode 100644
index 00000000..c6b73345
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_3_5_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml
new file mode 100644
index 00000000..eb39604a
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_mybatis_mybatis_spring_2_0_5.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_kafka_spring_kafka_2_5_12_RELEASE.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_kafka_spring_kafka_2_5_12_RELEASE.xml
new file mode 100644
index 00000000..398288fb
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_kafka_spring_kafka_2_5_12_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
new file mode 100644
index 00000000..3077cc07
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_retry_spring_retry_1_2_5_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_14_RELEASE.xml b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_14_RELEASE.xml
new file mode 100644
index 00000000..5c55c7ff
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/.idea/libraries/Maven__org_springframework_spring_messaging_5_2_14_RELEASE.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/application-consumer.iml b/orange-demo-multi/orange-demo-multi-service/application-consumer/application-consumer.iml
new file mode 100644
index 00000000..c621af8b
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/application-consumer.iml
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/operation-log-consumer.iml b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/operation-log-consumer.iml
new file mode 100644
index 00000000..b6f3ace0
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/operation-log-consumer.iml
@@ -0,0 +1,238 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/pom.xml b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/pom.xml
new file mode 100644
index 00000000..ef38b9d5
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/pom.xml
@@ -0,0 +1,47 @@
+
+
+
+ application-consumer
+ com.orange.demo
+ 1.0.0
+
+ 4.0.0
+
+ operation-log-consumer
+
+
+
+ com.orange.demo
+ common-log
+ 1.0.0
+
+
+
+
+
+
+ src/main/resources
+
+ **/*.*
+
+ false
+
+
+ src/main/java
+
+ **/*.xml
+
+ false
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+ ${spring-boot.version}
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/OperationLogConsumerApplication.java b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/OperationLogConsumerApplication.java
new file mode 100644
index 00000000..9e3e2f6a
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/OperationLogConsumerApplication.java
@@ -0,0 +1,20 @@
+package com.orange.demo.operationlogconsumer;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.context.annotation.ComponentScan;
+
+/**
+ * 操作日志消费者服务启动类。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@SpringCloudApplication
+@ComponentScan("com.orange.demo")
+public class OperationLogConsumerApplication {
+
+ public static void main(String[] args) {
+ SpringApplication.run(OperationLogConsumerApplication.class, args);
+ }
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/config/DataSourceConfig.java b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/config/DataSourceConfig.java
new file mode 100644
index 00000000..26082981
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/config/DataSourceConfig.java
@@ -0,0 +1,30 @@
+package com.orange.demo.operationlogconsumer.config;
+
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.mybatis.spring.annotation.MapperScan;
+
+import javax.sql.DataSource;
+
+/**
+ * 数据源配置Bean对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Configuration
+@EnableTransactionManagement
+@MapperScan(value = {"com.orange.demo.*.dao", "com.orange.demo.common.*.dao"})
+public class DataSourceConfig {
+
+ @Bean(initMethod = "init", destroyMethod = "close")
+ @Primary
+ @ConfigurationProperties(prefix = "spring.datasource.druid")
+ public DataSource druidDataSource() {
+ return DruidDataSourceBuilder.create().build();
+ }
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/consumer/OperationLogConsumer.java b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/consumer/OperationLogConsumer.java
new file mode 100644
index 00000000..c52dc765
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/java/com/orange/demo/operationlogconsumer/consumer/OperationLogConsumer.java
@@ -0,0 +1,90 @@
+package com.orange.demo.operationlogconsumer.consumer;
+
+import com.alibaba.fastjson.JSON;
+import com.orange.demo.common.log.model.SysOperationLog;
+import com.orange.demo.common.log.service.SysOperationLogService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory;
+import org.springframework.kafka.config.KafkaListenerContainerFactory;
+import org.springframework.kafka.core.ConsumerFactory;
+import org.springframework.kafka.listener.ContainerProperties;
+import org.springframework.kafka.support.Acknowledgment;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 各个微服务操作日志的消费者对象。该消费者会集中处理操作日志。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Component
+@Slf4j
+public class OperationLogConsumer {
+
+ @Autowired
+ private SysOperationLogService sysOperationLogService;
+
+ @Bean
+ public KafkaListenerContainerFactory> batchFactory(ConsumerFactory consumerFactory) {
+ ConcurrentKafkaListenerContainerFactory factory =
+ new ConcurrentKafkaListenerContainerFactory<>();
+ factory.setConsumerFactory(consumerFactory);
+ factory.setConcurrency(10);
+ factory.getContainerProperties().setPollTimeout(1500);
+ //设置为批量消费,每个批次数量在Kafka配置参数中设置
+ factory.setBatchListener(true);
+ factory.getContainerProperties().setAckMode(ContainerProperties.AckMode.MANUAL_IMMEDIATE);
+ return factory;
+ }
+
+ @KafkaListener(
+ topics = {"${common-log.operation-log.kafkaTopic}"},
+ containerFactory = "batchFactory",
+ groupId = "operation-log")
+ public void listen(List> recordList, Acknowledgment ack) {
+ if (CollectionUtils.isNotEmpty(recordList)) {
+ List operationLogList = new LinkedList<>();
+ for (ConsumerRecord, ?> record : recordList) {
+ Optional> message = Optional.ofNullable(record.value());
+ if (message.isPresent()) {
+ SysOperationLog operationLog =
+ JSON.parseObject(message.get().toString(), SysOperationLog.class);
+ operationLogList.add(operationLog);
+ }
+ }
+ if (CollectionUtils.isNotEmpty(operationLogList)) {
+ try {
+ sysOperationLogService.batchSave(operationLogList);
+ } catch (Exception e) {
+ log.error("Failed to batchSave SysOperationLog and try again one by one", e);
+ this.safeSave(operationLogList);
+ }
+ }
+ }
+ ack.acknowledge();
+ }
+
+ private void safeSave(List operationLogList) {
+ for (SysOperationLog operationLog : operationLogList) {
+ try {
+ // 如果批量插入失败,为了确保最大限度的将操作日志数据插入到目的表。
+ // 这里我们将逐条插入,对于重复插入直接忽略错误,对于其他异常,需要用户修改后自行处理。
+ sysOperationLogService.saveNew(operationLog);
+ } catch (DuplicateKeyException e1) {
+ // 出现重复的场景,很大可能是因为之前插入数据库成功了,但是提交kafka offset失败了。
+ // 因此就会出现重复消费的情况,我们通过logId主键进行了去重。
+ log.warn("Duplicated Key for logId [{}]", operationLog.getLogId());
+ }
+ }
+ }
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/bootstrap.yml b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/bootstrap.yml
new file mode 100644
index 00000000..c82c159c
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/bootstrap.yml
@@ -0,0 +1,19 @@
+spring:
+ application:
+ name: operation-log-consumer
+ profiles:
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ server-addr: localhost:8848
+ config:
+ server-addr: localhost:8848
+ file-extension: yaml
+ # 共享配置文件,排序越高后,优先级越高。
+ shared-configs:
+ - data-id: application-dev.yaml
+ group: DEFAULT_GROUP
+ refresh: true
+ main:
+ allow-bean-definition-overriding: true
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/log4j2.xml b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..d810ffbd
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/operation-log-consumer/src/main/resources/log4j2.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+ ./zzlogs/operation-log-consumer
+
+ ./zzlogs/operation-log-consumer/backup
+
+ info
+
+
+
+
+
+
+
+ [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] [%t] ==> %msg%n
+
+
+
+ [%-5p] [%d{YYYY-MM-dd HH:mm:ss}] [%t] ==> [TxId: %X{PtxId}, SpanId: %X{PspanId}] %msg%n
+
+
+ 31
+
+ 20M
+
+
+
+
+
+
+ localhost:9092
+ 10000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/orange-demo-multi/orange-demo-multi-service/application-consumer/pom.xml b/orange-demo-multi/orange-demo-multi-service/application-consumer/pom.xml
new file mode 100644
index 00000000..599b66ac
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application-consumer/pom.xml
@@ -0,0 +1,24 @@
+
+
+
+ OrangeMultiDemo
+ com.orange.demo
+ 1.0.0
+
+ 4.0.0
+
+ application-consumer
+ pom
+
+ operation-log-consumer
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysDeptClient.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysDeptClient.java
new file mode 100644
index 00000000..559e8dac
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/client/SysDeptClient.java
@@ -0,0 +1,156 @@
+package com.orange.demo.upmsapi.client;
+
+import com.orange.demo.common.core.base.client.BaseFallbackFactory;
+import com.orange.demo.common.core.config.FeignConfig;
+import com.orange.demo.common.core.base.client.BaseClient;
+import com.orange.demo.common.core.object.*;
+import com.orange.demo.upmsapi.dto.SysDeptDto;
+import com.orange.demo.upmsapi.vo.SysDeptVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 部门管理服务远程数据操作访问接口。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@FeignClient(
+ name = "upms",
+ configuration = FeignConfig.class,
+ fallbackFactory = SysDeptClient.SysDeptClientFallbackFactory.class)
+public interface SysDeptClient extends BaseClient {
+
+ /**
+ * 基于主键的(In-list)条件获取远程数据接口。
+ *
+ * @param deptIds 主键Id集合。
+ * @param withDict 是否包含字典关联。
+ * @return 应答结果对象,包含主对象的数据集合。
+ */
+ @Override
+ @PostMapping("/sysDept/listByIds")
+ ResponseResult> listByIds(
+ @RequestParam("deptIds") Set deptIds,
+ @RequestParam("withDict") Boolean withDict);
+
+ /**
+ * 基于主键Id,获取远程对象。
+ *
+ * @param deptId 主键Id。
+ * @param withDict 是否包含字典关联。
+ * @return 应答结果对象,包含主对象数据。
+ */
+ @Override
+ @PostMapping("/sysDept/getById")
+ ResponseResult getById(
+ @RequestParam("deptId") Long deptId,
+ @RequestParam("withDict") Boolean withDict);
+
+ /**
+ * 判断参数列表中指定的主键Id,是否都存在。
+ *
+ * @param deptIds 主键Id集合。
+ * @return 应答结果对象,包含true全部存在,否则false。
+ */
+ @Override
+ @PostMapping("/sysDept/existIds")
+ ResponseResult existIds(@RequestParam("deptIds") Set deptIds);
+
+ /**
+ * 判断主键Id是否存在。
+ *
+ * @param deptId 参数主键Id。
+ * @return 应答结果对象,包含true表示存在,否则false。
+ */
+ @Override
+ @PostMapping("/sysDept/existId")
+ ResponseResult existId(@RequestParam("deptId") Long deptId);
+
+ /**
+ * 删除主键Id关联的对象。
+ *
+ * @param deptId 主键Id。
+ * @return 应答结果对象。
+ */
+ @Override
+ @PostMapping("/sysDept/deleteById")
+ ResponseResult deleteById(@RequestParam("deptId") Long deptId);
+
+ /**
+ * 删除符合过滤条件的数据。
+ *
+ * @param filter 过滤对象。
+ * @return 应答结果对象,包含删除数量。
+ */
+ @Override
+ @PostMapping("/sysDept/deleteBy")
+ ResponseResult deleteBy(@RequestBody SysDeptDto filter);
+
+ /**
+ * 获取远程主对象中符合查询条件的数据列表。
+ *
+ * @param queryParam 查询参数。
+ * @return 应答结果对象,包含实体对象集合。
+ */
+ @Override
+ @PostMapping("/sysDept/listBy")
+ ResponseResult> listBy(@RequestBody MyQueryParam queryParam);
+
+ /**
+ * 获取远程主对象中符合查询条件的单条数据对象。
+ *
+ * @param queryParam 查询参数。
+ * @return 应答结果对象,包含实体对象。
+ */
+ @Override
+ @PostMapping("/sysDept/getBy")
+ ResponseResult getBy(@RequestBody MyQueryParam queryParam);
+
+ /**
+ * 获取远程主对象中符合查询条件的数据列表。
+ * 和listBy接口相比,以Map列表的方式返回的主要目的是,降低服务之间的耦合度。
+ *
+ * @param queryParam 查询参数。
+ * @return 应答结果对象,包含主对象集合。
+ */
+ @Override
+ @PostMapping("/sysDept/listMapBy")
+ ResponseResult>> listMapBy(@RequestBody MyQueryParam queryParam);
+
+ /**
+ * 获取远程主对象中符合查询条件的数据数量。
+ *
+ * @param queryParam 查询参数。
+ * @return 应答结果对象,包含结果数量。
+ */
+ @Override
+ @PostMapping("/sysDept/countBy")
+ ResponseResult countBy(@RequestBody MyQueryParam queryParam);
+
+ /**
+ * 获取远程对象中符合查询条件的分组聚合计算Map列表。
+ *
+ * @param aggregationParam 聚合参数。
+ * @return 应该结果对象,包含聚合计算后的分组Map列表。
+ */
+ @Override
+ @PostMapping("/sysDept/aggregateBy")
+ ResponseResult>> aggregateBy(@RequestBody MyAggregationParam aggregationParam);
+
+ @Component("UpmsSysDeptClientFallbackFactory")
+ @Slf4j
+ class SysDeptClientFallbackFactory
+ extends BaseFallbackFactory implements SysDeptClient {
+
+ @Override
+ public SysDeptClient create(Throwable throwable) {
+ log.error("Exception For Feign Remote Call.", throwable);
+ return new SysDeptClientFallbackFactory();
+ }
+ }
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDeptDto.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDeptDto.java
new file mode 100644
index 00000000..d8ec0ec1
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDeptDto.java
@@ -0,0 +1,28 @@
+package com.orange.demo.upmsapi.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 数据权限与部门关联Dto。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("数据权限与部门关联Dto")
+@Data
+public class SysDataPermDeptDto {
+
+ /**
+ * 数据权限Id。
+ */
+ @ApiModelProperty(value = "数据权限Id", required = true)
+ private Long dataPermId;
+
+ /**
+ * 关联部门Id。
+ */
+ @ApiModelProperty(value = "关联部门Id", required = true)
+ private Long deptId;
+}
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDto.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDto.java
new file mode 100644
index 00000000..aafeb702
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDataPermDto.java
@@ -0,0 +1,56 @@
+package com.orange.demo.upmsapi.dto;
+
+import com.orange.demo.common.core.validator.UpdateGroup;
+import com.orange.demo.common.core.validator.ConstDictRef;
+import com.orange.demo.common.datafilter.constant.DataPermRuleType;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.*;
+
+/**
+ * 数据权限Dto。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("数据权限Dto")
+@Data
+public class SysDataPermDto {
+
+ /**
+ * 数据权限Id。
+ */
+ @ApiModelProperty(value = "数据权限Id", required = true)
+ @NotNull(message = "数据权限Id不能为空!", groups = {UpdateGroup.class})
+ private Long dataPermId;
+
+ /**
+ * 显示名称。
+ */
+ @ApiModelProperty(value = "显示名称", required = true)
+ @NotBlank(message = "数据权限名称不能为空!")
+ private String dataPermName;
+
+ /**
+ * 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。
+ */
+ @ApiModelProperty(value = "数据权限规则类型", required = true)
+ @NotNull(message = "数据权限规则类型不能为空!")
+ @ConstDictRef(constDictClass = DataPermRuleType.class)
+ private Integer ruleType;
+
+ /**
+ * 部门Id列表(逗号分隔)。
+ */
+ @ApiModelProperty(hidden = true)
+ private String deptIdListString;
+
+ /**
+ * 搜索字符串。
+ */
+ @ApiModelProperty(value = "LIKE 模糊搜索字符串")
+ private String searchString;
+}
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDeptDto.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDeptDto.java
new file mode 100644
index 00000000..8269c944
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysDeptDto.java
@@ -0,0 +1,47 @@
+package com.orange.demo.upmsapi.dto;
+
+import com.orange.demo.common.core.validator.UpdateGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.*;
+
+/**
+ * SysDeptDto对象。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("SysDeptDto对象")
+@Data
+public class SysDeptDto {
+
+ /**
+ * 部门Id。
+ */
+ @ApiModelProperty(value = "部门Id", required = true)
+ @NotNull(message = "数据验证失败,部门Id不能为空!", groups = {UpdateGroup.class})
+ private Long deptId;
+
+ /**
+ * 部门名称。
+ */
+ @ApiModelProperty(value = "部门名称", required = true)
+ @NotBlank(message = "数据验证失败,部门名称不能为空!")
+ private String deptName;
+
+ /**
+ * 显示顺序。
+ */
+ @ApiModelProperty(value = "显示顺序", required = true)
+ @NotNull(message = "数据验证失败,显示顺序不能为空!")
+ private Integer showOrder;
+
+ /**
+ * 父部门Id。
+ */
+ @ApiModelProperty(value = "父部门Id")
+ private Long parentId;
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysOperationLogDto.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysOperationLogDto.java
new file mode 100644
index 00000000..695540a9
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/dto/SysOperationLogDto.java
@@ -0,0 +1,78 @@
+package com.orange.demo.upmsapi.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 操作日志记录表
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("操作日志Dto")
+@Data
+public class SysOperationLogDto {
+
+ /**
+ * 主键Id。
+ */
+ @ApiModelProperty(value = "主键Id")
+ private Long logId;
+
+ /**
+ * 操作类型。
+ * 常量值定义可参考SysOperationLogType对象。
+ */
+ @ApiModelProperty(value = "操作类型")
+ private Integer operationType;
+
+ /**
+ * 每次请求的Id。
+ * 对于微服务之间的调用,在同一个请求的调用链中,该值是相同的。
+ */
+ @ApiModelProperty(value = "每次请求的Id")
+ private String traceId;
+
+ /**
+ * HTTP 请求地址。
+ */
+ @ApiModelProperty(value = "HTTP 请求地址")
+ private String requestUrl;
+
+ /**
+ * 应答状态。
+ */
+ @ApiModelProperty(value = "应答状态")
+ private Boolean success;
+
+ /**
+ * 操作员名称。
+ */
+ @ApiModelProperty(value = "操作员名称")
+ private String operatorName;
+
+ /**
+ * 调用时长最小值。
+ */
+ @ApiModelProperty(value = "调用时长最小值")
+ private Long elapseMin;
+
+ /**
+ * 调用时长最大值。
+ */
+ @ApiModelProperty(value = "调用时长最大值")
+ private Long elapseMax;
+
+ /**
+ * 操作开始时间。
+ */
+ @ApiModelProperty(value = "操作开始时间")
+ private String operationTimeStart;
+
+ /**
+ * 操作开始时间。
+ */
+ @ApiModelProperty(value = "操作开始时间")
+ private String operationTimeEnd;
+}
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermDeptVo.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermDeptVo.java
new file mode 100644
index 00000000..93462a96
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermDeptVo.java
@@ -0,0 +1,28 @@
+package com.orange.demo.upmsapi.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 数据权限与部门关联VO。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("数据权限与部门关联VO")
+@Data
+public class SysDataPermDeptVo {
+
+ /**
+ * 数据权限Id。
+ */
+ @ApiModelProperty(value = "数据权限Id")
+ private Long dataPermId;
+
+ /**
+ * 关联部门Id。
+ */
+ @ApiModelProperty(value = "关联部门Id")
+ private Long deptId;
+}
\ No newline at end of file
diff --git a/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermVo.java b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermVo.java
new file mode 100644
index 00000000..2a7f28b8
--- /dev/null
+++ b/orange-demo-multi/orange-demo-multi-service/application/upms/upms-api/src/main/java/com/orange/demo/upmsapi/vo/SysDataPermVo.java
@@ -0,0 +1,72 @@
+package com.orange.demo.upmsapi.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.*;
+
+/**
+ * 数据权限VO。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@ApiModel("数据权限VO")
+@Data
+public class SysDataPermVo {
+
+ /**
+ * 数据权限Id。
+ */
+ @ApiModelProperty(value = "数据权限Id")
+ private Long dataPermId;
+
+ /**
+ * 显示名称。
+ */
+ @ApiModelProperty(value = "显示名称")
+ private String dataPermName;
+
+ /**
+ * 数据权限规则类型(0: 全部可见 1: 只看自己 2: 只看本部门 3: 本部门及子部门 4: 多部门及子部门 5: 自定义部门列表)。
+ */
+ @ApiModelProperty(value = "数据权限规则类型")
+ private Integer ruleType;
+
+ /**
+ * 部门Id列表(逗号分隔)。
+ */
+ @ApiModelProperty(value = "部门Id列表")
+ private String deptIdListString;
+
+ /**
+ * 创建者Id。
+ */
+ @ApiModelProperty(value = "创建者Id")
+ private Long createUserId;
+
+ /**
+ * 创建时间。
+ */
+ @ApiModelProperty(value = "创建时间")
+ private Date createTime;
+
+ /**
+ * 更新者Id。
+ */
+ @ApiModelProperty(value = "更新者Id")
+ private Long updateUserId;
+
+ /**
+ * 更新时间。
+ */
+ @ApiModelProperty(value = "更新时间")
+ private Date updateTime;
+
+ /**
+ * 数据权限与部门关联对象列表。
+ */
+ @ApiModelProperty(value = "数据权限与部门关联对象列表")
+ private List