From 3a062ad619dc838f955983401190ac99dc9b29d4 Mon Sep 17 00:00:00 2001 From: Jerry <707344974@qq.com> Date: Wed, 3 Feb 2021 21:40:27 +0800 Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E5=90=8C=E6=AD=A51.4=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orange-demo-multi-service-for-app/.DS_Store | Bin 0 -> 6148 bytes orange-demo-multi-service-for-app/.idea/.name | 1 + .../.idea/compiler.xml | 5 +- .../.idea/misc.xml | 1 + .../.idea/workspace.xml | 14 +- .../OrangeMultiDemo.iml | 146 -- .../courseclassinterface/dto/StudentDto.java | 6 + .../dao/mapper/StudentClassMapper.xml | 1 - .../demo/courseclassservice/model/Grade.java | 2 - .../model/StudentClass.java | 2 - .../service/impl/StudentServiceImpl.java | 2 - .../application/gateway/pom.xml | 2 +- .../filter/AuthenticationPostFilter.java | 8 +- .../dto/StudentActionTransDto.java | 9 - .../orange/demo/statsservice/model/Grade.java | 2 - .../impl/StudentActionTransServiceImpl.java | 2 + .../demo/upmsinterface/vo/SysUserVo.java | 6 - .../controller/LoginController.java | 8 +- .../upmsservice/dao/mapper/SysUserMapper.xml | 1 - .../demo/upmsservice/model/SysUser.java | 32 +- .../service/impl/SysUserServiceImpl.java | 9 +- .../core/annotation/DeptFilterColumn.java | 16 + .../core/annotation/DisableDataFilter.java | 17 + .../core/annotation/DisableTenantFilter.java | 28 + .../core/annotation/EnableDataPerm.java | 27 + .../core/annotation/TenantFilterColumn.java | 16 + .../core/annotation/UserFilterColumn.java | 16 + .../common/core/base/model/BaseModel.java | 40 + .../demo/common/core/config/FeignConfig.java | 18 +- .../MyRequestArgumentResolver.java | 2 +- .../common/core/object/GlobalThreadLocal.java | 52 + .../demo/common/core/object/TokenData.java | 15 + .../redis/cache/RedissonCacheConfig.java | 6 +- .../redis/cache/SessionCacheHelper.java | 28 + orange-demo-multi-service-for-app/pom.xml | 2 +- .../config-data/application-dev.yaml | 2 +- .../zz-resource/config-data/upms-dev.yaml | 4 +- .../zz-resource/docker-files/.DS_Store | Bin 0 -> 6148 bytes .../docker-files/docker-compose.yml | 2 +- orange-demo-multi-service/.DS_Store | Bin 0 -> 6148 bytes orange-demo-multi-service/.idea/.name | 1 + orange-demo-multi-service/.idea/compiler.xml | 1 + orange-demo-multi-service/.idea/misc.xml | 1 + orange-demo-multi-service/.idea/workspace.xml | 20 +- orange-demo-multi-service/OrangeMultiDemo.iml | 146 -- .../courseclassinterface/dto/StudentDto.java | 6 + .../dao/mapper/StudentClassMapper.xml | 1 - .../demo/courseclassservice/model/Grade.java | 2 - .../model/StudentClass.java | 2 - .../service/impl/StudentServiceImpl.java | 2 - .../application/gateway/pom.xml | 2 +- .../filter/AuthenticationPostFilter.java | 24 +- .../dto/StudentActionTransDto.java | 9 - .../orange/demo/statsservice/model/Grade.java | 2 - .../impl/StudentActionTransServiceImpl.java | 2 + .../demo/upmsinterface/dto/SysMenuDto.java | 2 +- .../demo/upmsinterface/vo/SysUserVo.java | 6 - .../controller/LoginController.java | 38 +- .../controller/SysMenuController.java | 4 +- .../controller/SysPermModuleController.java | 4 +- .../controller/SysRoleController.java | 2 +- .../demo/upmsservice/dao/SysPermMapper.java | 4 +- .../upmsservice/dao/mapper/SysMenuMapper.xml | 4 +- .../dao/mapper/SysMenuPermCodeMapper.xml | 4 +- .../dao/mapper/SysPermCodeMapper.xml | 2 +- .../upmsservice/dao/mapper/SysPermMapper.xml | 6 +- .../dao/mapper/SysPermModuleMapper.xml | 5 +- .../upmsservice/dao/mapper/SysUserMapper.xml | 3 +- .../demo/upmsservice/model/SysMenu.java | 31 +- .../demo/upmsservice/model/SysPerm.java | 31 +- .../demo/upmsservice/model/SysPermCode.java | 31 +- .../demo/upmsservice/model/SysPermModule.java | 31 +- .../demo/upmsservice/model/SysRole.java | 31 +- .../demo/upmsservice/model/SysUser.java | 32 +- .../upmsservice/service/SysMenuService.java | 6 +- .../service/SysPermCodeService.java | 11 +- .../upmsservice/service/SysPermService.java | 6 +- .../upmsservice/service/SysUserService.java | 8 - .../service/impl/SysMenuServiceImpl.java | 20 +- .../service/impl/SysPermCodeServiceImpl.java | 22 +- .../service/impl/SysPermServiceImpl.java | 10 +- .../service/impl/SysRoleServiceImpl.java | 6 +- .../service/impl/SysUserServiceImpl.java | 23 +- .../core/annotation/DeptFilterColumn.java | 16 + .../core/annotation/DisableDataFilter.java | 17 + .../core/annotation/DisableTenantFilter.java | 28 + .../core/annotation/EnableDataPerm.java | 27 + .../core/annotation/TenantFilterColumn.java | 16 + .../core/annotation/UserFilterColumn.java | 16 + .../common/core/base/model/BaseModel.java | 40 + .../demo/common/core/config/FeignConfig.java | 18 +- .../MyRequestArgumentResolver.java | 2 +- .../common/core/object/GlobalThreadLocal.java | 52 + .../demo/common/core/object/TokenData.java | 15 + .../redis/cache/RedissonCacheConfig.java | 6 +- .../redis/cache/SessionCacheHelper.java | 28 + orange-demo-multi-service/pom.xml | 2 +- .../zz-resource/.DS_Store | Bin 0 -> 6148 bytes .../config-data/application-dev.yaml | 2 +- .../zz-resource/config-data/upms-dev.yaml | 4 +- .../zz-resource/docker-files/.DS_Store | Bin 0 -> 6148 bytes .../docker-files/docker-compose.yml | 2 +- orange-demo-single-service-for-app/.DS_Store | Bin 0 -> 6148 bytes orange-demo-single-service-for-app/README.md | 9 +- .../application/pom.xml | 10 +- .../app/controller/AreaCodeController.java | 2 - .../demo/app/controller/CourseController.java | 20 +- .../CourseTransStatsController.java | 2 - .../demo/app/controller/GradeController.java | 4 - .../app/controller/SchoolInfoController.java | 4 - .../StudentActionStatsController.java | 2 - .../StudentActionTransController.java | 10 - .../controller/StudentClassController.java | 4 - .../app/controller/StudentController.java | 16 - .../orange/demo/app/dto/ClassCourseDto.java | 6 - .../orange/demo/app/dto/ClassStudentDto.java | 5 - .../com/orange/demo/app/dto/CourseDto.java | 18 - .../demo/app/dto/CourseTransStatsDto.java | 15 - .../com/orange/demo/app/dto/GradeDto.java | 5 - .../orange/demo/app/dto/SchoolInfoDto.java | 7 - .../demo/app/dto/StudentActionStatsDto.java | 26 - .../demo/app/dto/StudentActionTransDto.java | 20 - .../orange/demo/app/dto/StudentClassDto.java | 9 - .../com/orange/demo/app/dto/StudentDto.java | 22 - .../java/com/orange/demo/app/model/Grade.java | 2 - .../orange/demo/app/model/StudentClass.java | 2 - .../app/service/impl/GradeServiceImpl.java | 13 +- .../com/orange/demo/app/vo/AreaCodeVo.java | 7 - .../com/orange/demo/app/vo/ClassCourseVo.java | 6 - .../orange/demo/app/vo/ClassStudentVo.java | 5 - .../demo/app/vo/CourseTransStatsVo.java | 15 - .../java/com/orange/demo/app/vo/CourseVo.java | 19 - .../java/com/orange/demo/app/vo/GradeVo.java | 5 - .../com/orange/demo/app/vo/SchoolInfoVo.java | 9 - .../demo/app/vo/StudentActionStatsVo.java | 27 - .../demo/app/vo/StudentActionTransVo.java | 22 - .../orange/demo/app/vo/StudentClassVo.java | 14 - .../com/orange/demo/app/vo/StudentVo.java | 26 - .../AuthenticationInterceptor.java | 6 +- .../demo/upms/controller/LoginController.java | 14 +- .../upms/controller/SysUserController.java | 10 - .../com/orange/demo/upms/dto/SysUserDto.java | 12 - .../com/orange/demo/upms/model/SysUser.java | 2 - .../upms/service/impl/SysUserServiceImpl.java | 9 +- .../com/orange/demo/upms/vo/SysUserVo.java | 21 - .../src/main/resources/application.yml | 37 +- .../application/src/main/resources/log4j2.xml | 3 - .../core/annotation/DeptFilterColumn.java | 16 + .../core/annotation/DisableDataFilter.java | 17 + .../core/annotation/DisableTenantFilter.java | 28 + .../core/annotation/EnableDataPerm.java | 27 + .../core/annotation/TenantFilterColumn.java | 16 + .../core/annotation/UserFilterColumn.java | 16 + .../demo/common/core/cache/CacheConfig.java | 90 - .../MyRequestArgumentResolver.java | 2 +- .../common/core/object/GlobalThreadLocal.java | 52 + .../demo/common/core/object/TokenData.java | 15 + .../demo/common/core/util/RedisKeyUtil.java | 36 + .../{common-swagger => common-redis}/pom.xml | 19 +- .../redis/cache/RedisDictionaryCache.java | 412 +++++ .../redis/cache/RedisTreeDictionaryCache.java | 352 ++++ .../redis/cache/RedissonCacheConfig.java | 67 + .../redis}/cache/SessionCacheHelper.java | 19 +- .../demo/common/redis/config/JedisConfig.java | 52 + .../common/redis/config/RedissonConfig.java | 50 + .../main/resources/META-INF/spring.factories | 3 + .../config/SwaggerAutoConfiguration.java | 56 - .../swagger/config/SwaggerProperties.java | 40 - .../common/swagger/plugin/ByteBodyUtils.java | 85 - .../plugin/DynamicBodyModelPlugin.java | 61 - .../plugin/DynamicBodyParameterBuilder.java | 64 - .../main/resources/META-INF/spring.factories | 2 - .../common/pom.xml | 2 +- orange-demo-single-service-for-app/pom.xml | 5 +- .../{zz-orange-demo.sql => areacode.sql} | 716 +------- .../zz-resource/db-scripts/upms-script.sql | 39 + .../docker-files/docker-compose.yml | 16 + .../docker-files/services/redis/Dockerfile | 13 + .../docker-files/services/redis/redis.conf | 1307 ++++++++++++++ orange-demo-single-service/.DS_Store | Bin 0 -> 6148 bytes orange-demo-single-service/README.md | 9 +- .../application/pom.xml | 10 +- .../app/controller/AreaCodeController.java | 2 - .../demo/app/controller/CourseController.java | 20 +- .../CourseTransStatsController.java | 2 - .../demo/app/controller/GradeController.java | 4 - .../app/controller/SchoolInfoController.java | 4 - .../StudentActionStatsController.java | 2 - .../StudentActionTransController.java | 10 - .../controller/StudentClassController.java | 4 - .../app/controller/StudentController.java | 16 - .../orange/demo/app/dto/ClassCourseDto.java | 6 - .../orange/demo/app/dto/ClassStudentDto.java | 5 - .../com/orange/demo/app/dto/CourseDto.java | 18 - .../demo/app/dto/CourseTransStatsDto.java | 15 - .../com/orange/demo/app/dto/GradeDto.java | 5 - .../orange/demo/app/dto/SchoolInfoDto.java | 7 - .../demo/app/dto/StudentActionStatsDto.java | 26 - .../demo/app/dto/StudentActionTransDto.java | 20 - .../orange/demo/app/dto/StudentClassDto.java | 9 - .../com/orange/demo/app/dto/StudentDto.java | 22 - .../java/com/orange/demo/app/model/Grade.java | 2 - .../orange/demo/app/model/StudentClass.java | 2 - .../app/service/impl/GradeServiceImpl.java | 13 +- .../com/orange/demo/app/vo/AreaCodeVo.java | 7 - .../com/orange/demo/app/vo/ClassCourseVo.java | 6 - .../orange/demo/app/vo/ClassStudentVo.java | 5 - .../demo/app/vo/CourseTransStatsVo.java | 15 - .../java/com/orange/demo/app/vo/CourseVo.java | 19 - .../java/com/orange/demo/app/vo/GradeVo.java | 5 - .../com/orange/demo/app/vo/SchoolInfoVo.java | 9 - .../demo/app/vo/StudentActionStatsVo.java | 27 - .../demo/app/vo/StudentActionTransVo.java | 22 - .../orange/demo/app/vo/StudentClassVo.java | 14 - .../com/orange/demo/app/vo/StudentVo.java | 26 - .../orange/demo/config/ApplicationConfig.java | 5 + .../AuthenticationInterceptor.java | 27 +- .../demo/upms/controller/LoginController.java | 33 +- .../upms/controller/SysMenuController.java | 8 +- .../controller/SysPermCodeController.java | 4 - .../upms/controller/SysPermController.java | 4 - .../controller/SysPermModuleController.java | 8 +- .../upms/controller/SysRoleController.java | 5 - .../upms/controller/SysUserController.java | 10 - .../orange/demo/upms/dao/SysPermMapper.java | 2 +- .../demo/upms/dao/mapper/SysMenuMapper.xml | 2 +- .../upms/dao/mapper/SysMenuPermCodeMapper.xml | 4 +- .../upms/dao/mapper/SysPermCodeMapper.xml | 2 +- .../demo/upms/dao/mapper/SysPermMapper.xml | 4 +- .../upms/dao/mapper/SysPermModuleMapper.xml | 5 +- .../com/orange/demo/upms/dto/SysMenuDto.java | 10 - .../orange/demo/upms/dto/SysPermCodeDto.java | 9 - .../com/orange/demo/upms/dto/SysPermDto.java | 9 - .../demo/upms/dto/SysPermModuleDto.java | 8 - .../com/orange/demo/upms/dto/SysRoleDto.java | 5 - .../com/orange/demo/upms/dto/SysUserDto.java | 12 - .../com/orange/demo/upms/model/SysMenu.java | 2 - .../com/orange/demo/upms/model/SysPerm.java | 2 - .../orange/demo/upms/model/SysPermCode.java | 2 - .../orange/demo/upms/model/SysPermModule.java | 2 - .../com/orange/demo/upms/model/SysRole.java | 2 - .../com/orange/demo/upms/model/SysUser.java | 2 - .../demo/upms/service/SysMenuService.java | 6 +- .../demo/upms/service/SysPermCodeService.java | 11 +- .../demo/upms/service/SysPermService.java | 24 +- .../upms/service/impl/SysMenuServiceImpl.java | 13 +- .../service/impl/SysPermCodeServiceImpl.java | 18 +- .../upms/service/impl/SysPermServiceImpl.java | 85 +- .../upms/service/impl/SysRoleServiceImpl.java | 2 +- .../upms/service/impl/SysUserServiceImpl.java | 9 +- .../com/orange/demo/upms/vo/SysMenuVo.java | 15 - .../orange/demo/upms/vo/SysPermCodeVo.java | 14 - .../orange/demo/upms/vo/SysPermModuleVo.java | 13 - .../com/orange/demo/upms/vo/SysPermVo.java | 14 - .../com/orange/demo/upms/vo/SysRoleVo.java | 10 - .../com/orange/demo/upms/vo/SysUserVo.java | 22 - .../src/main/resources/application.yml | 41 +- .../application/src/main/resources/log4j2.xml | 3 - .../core/annotation/DeptFilterColumn.java | 16 + .../core/annotation/DisableDataFilter.java | 17 + .../core/annotation/DisableTenantFilter.java | 28 + .../core/annotation/EnableDataPerm.java | 27 + .../core/annotation/TenantFilterColumn.java | 16 + .../core/annotation/UserFilterColumn.java | 16 + .../demo/common/core/cache/CacheConfig.java | 90 - .../MyRequestArgumentResolver.java | 2 +- .../common/core/object/GlobalThreadLocal.java | 52 + .../demo/common/core/object/TokenData.java | 15 + .../demo/common/core/util/RedisKeyUtil.java | 36 + .../{common-swagger => common-redis}/pom.xml | 19 +- .../redis/cache/RedisDictionaryCache.java | 412 +++++ .../redis/cache/RedisTreeDictionaryCache.java | 352 ++++ .../redis/cache/RedissonCacheConfig.java | 67 + .../redis}/cache/SessionCacheHelper.java | 19 +- .../demo/common/redis/config/JedisConfig.java | 52 + .../common/redis/config/RedissonConfig.java | 50 + .../main/resources/META-INF/spring.factories | 3 + .../config/SwaggerAutoConfiguration.java | 56 - .../swagger/config/SwaggerProperties.java | 40 - .../common/swagger/plugin/ByteBodyUtils.java | 85 - .../plugin/DynamicBodyModelPlugin.java | 61 - .../plugin/DynamicBodyParameterBuilder.java | 64 - .../main/resources/META-INF/spring.factories | 2 - orange-demo-single-service/common/pom.xml | 2 +- orange-demo-single-service/pom.xml | 5 +- .../{zz-orange-demo.sql => areacode.sql} | 1544 +---------------- .../zz-resource/db-scripts/upms-script.sql | 816 +++++++++ .../docker-files/docker-compose.yml | 16 + .../docker-files/services/redis/Dockerfile | 13 + .../docker-files/services/redis/redis.conf | 1307 ++++++++++++++ 290 files changed, 6973 insertions(+), 4845 deletions(-) create mode 100644 orange-demo-multi-service-for-app/.DS_Store create mode 100644 orange-demo-multi-service-for-app/.idea/.name delete mode 100644 orange-demo-multi-service-for-app/OrangeMultiDemo.iml create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java create mode 100644 orange-demo-multi-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java create mode 100644 orange-demo-multi-service-for-app/zz-resource/docker-files/.DS_Store create mode 100644 orange-demo-multi-service/.DS_Store create mode 100644 orange-demo-multi-service/.idea/.name delete mode 100644 orange-demo-multi-service/OrangeMultiDemo.iml create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/model/BaseModel.java create mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java create mode 100644 orange-demo-multi-service/zz-resource/.DS_Store create mode 100644 orange-demo-multi-service/zz-resource/docker-files/.DS_Store create mode 100644 orange-demo-single-service-for-app/.DS_Store create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java delete mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java create mode 100644 orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java rename orange-demo-single-service-for-app/common/{common-swagger => common-redis}/pom.xml (66%) create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java rename {orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core => orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis}/cache/SessionCacheHelper.java (77%) create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java create mode 100644 orange-demo-single-service-for-app/common/common-redis/src/main/resources/META-INF/spring.factories delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/java/com/orange/demo/common/swagger/config/SwaggerAutoConfiguration.java delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/java/com/orange/demo/common/swagger/config/SwaggerProperties.java delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/ByteBodyUtils.java delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/DynamicBodyModelPlugin.java delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/DynamicBodyParameterBuilder.java delete mode 100644 orange-demo-single-service-for-app/common/common-swagger/src/main/resources/META-INF/spring.factories rename orange-demo-single-service-for-app/zz-resource/db-scripts/{zz-orange-demo.sql => areacode.sql} (79%) create mode 100644 orange-demo-single-service-for-app/zz-resource/db-scripts/upms-script.sql create mode 100644 orange-demo-single-service-for-app/zz-resource/docker-files/docker-compose.yml create mode 100644 orange-demo-single-service-for-app/zz-resource/docker-files/services/redis/Dockerfile create mode 100644 orange-demo-single-service-for-app/zz-resource/docker-files/services/redis/redis.conf create mode 100644 orange-demo-single-service/.DS_Store create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeptFilterColumn.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableDataFilter.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DisableTenantFilter.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/EnableDataPerm.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/TenantFilterColumn.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UserFilterColumn.java delete mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/GlobalThreadLocal.java create mode 100644 orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java rename orange-demo-single-service/common/{common-swagger => common-redis}/pom.xml (66%) create mode 100644 orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java create mode 100644 orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java create mode 100644 orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java rename {orange-demo-single-service-for-app/common/common-core/src/main/java/com/orange/demo/common/core => orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis}/cache/SessionCacheHelper.java (77%) create mode 100644 orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java create mode 100644 orange-demo-single-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java create mode 100644 orange-demo-single-service/common/common-redis/src/main/resources/META-INF/spring.factories delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/java/com/orange/demo/common/swagger/config/SwaggerAutoConfiguration.java delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/java/com/orange/demo/common/swagger/config/SwaggerProperties.java delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/ByteBodyUtils.java delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/DynamicBodyModelPlugin.java delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/java/com/orange/demo/common/swagger/plugin/DynamicBodyParameterBuilder.java delete mode 100644 orange-demo-single-service/common/common-swagger/src/main/resources/META-INF/spring.factories rename orange-demo-single-service/zz-resource/db-scripts/{zz-orange-demo.sql => areacode.sql} (61%) create mode 100644 orange-demo-single-service/zz-resource/db-scripts/upms-script.sql create mode 100644 orange-demo-single-service/zz-resource/docker-files/docker-compose.yml create mode 100644 orange-demo-single-service/zz-resource/docker-files/services/redis/Dockerfile create mode 100644 orange-demo-single-service/zz-resource/docker-files/services/redis/redis.conf diff --git a/orange-demo-multi-service-for-app/.DS_Store b/orange-demo-multi-service-for-app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 - + + - @@ -28,6 +28,7 @@ + diff --git a/orange-demo-multi-service-for-app/.idea/misc.xml b/orange-demo-multi-service-for-app/.idea/misc.xml index c5f2fee0..146992f7 100644 --- a/orange-demo-multi-service-for-app/.idea/misc.xml +++ b/orange-demo-multi-service-for-app/.idea/misc.xml @@ -8,6 +8,7 @@ diff --git a/orange-demo-multi-service-for-app/.idea/workspace.xml b/orange-demo-multi-service-for-app/.idea/workspace.xml index 6840b8d1..29afe984 100644 --- a/orange-demo-multi-service-for-app/.idea/workspace.xml +++ b/orange-demo-multi-service-for-app/.idea/workspace.xml @@ -1,7 +1,7 @@ - + diff --git a/orange-demo-multi-service/.idea/workspace.xml b/orange-demo-multi-service/.idea/workspace.xml index 37da3bf8..726571d2 100644 --- a/orange-demo-multi-service/.idea/workspace.xml +++ b/orange-demo-multi-service/.idea/workspace.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/orange-demo-multi-service/OrangeMultiDemo.iml b/orange-demo-multi-service/OrangeMultiDemo.iml deleted file mode 100644 index 45fd11ef..00000000 --- a/orange-demo-multi-service/OrangeMultiDemo.iml +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java index 5bb9e077..108f5f1e 100644 --- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java +++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentDto.java @@ -117,6 +117,12 @@ public class StudentDto { @NotNull(message = "数据验证失败，所属校区不能为空！") private Long schoolId; + /** + * 注册时间。 + */ + @ApiModelProperty(value = "注册时间") + private Date registerTime; + /** * 学生状态 (0: 正常 1: 锁定 2: 注销)。 */ diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml index ea933841..5da446a6 100644 --- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml +++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/mapper/StudentClassMapper.xml @@ -31,7 +31,6 @@ AND zz_class.class_level = #{studentClassFilter.classLevel} - AND zz_class.status = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} SELECT - DISTINCT m.* + m.* FROM zz_sys_user_role ur, zz_sys_role_menu rm, @@ -83,5 +83,5 @@ ORDER BY u.user_id, r.role_id - + diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuPermCodeMapper.xml b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuPermCodeMapper.xml index 79463eae..f12c0da9 100644 --- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuPermCodeMapper.xml +++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysMenuPermCodeMapper.xml @@ -2,7 +2,7 @@ - - + + \ No newline at end of file diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermCodeMapper.xml b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermCodeMapper.xml index cc34f992..af00411b 100644 --- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermCodeMapper.xml +++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermCodeMapper.xml @@ -17,7 +17,7 @@ + + diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermModuleMapper.xml b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermModuleMapper.xml index 27c5a8c0..05d86db0 100644 --- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermModuleMapper.xml +++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysPermModuleMapper.xml @@ -2,7 +2,7 @@ - + @@ -34,9 +34,8 @@ FROM zz_sys_perm_module pm LEFT JOIN - zz_sys_perm p ON pm.module_id = p.module_id + zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} - AND p.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} AND pm.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} ORDER BY diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml index c228629e..b6bb711e 100644 --- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml +++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml @@ -42,7 +42,6 @@ AND zz_sys_user.create_time <= #{sysUserFilter.createTimeEnd} - AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL} - + SELECT - DISTINCT m.* + m.* FROM zz_sys_user_role ur, zz_sys_role_menu rm, diff --git a/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysMenuPermCodeMapper.xml b/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysMenuPermCodeMapper.xml index 23965546..69aa4f01 100644 --- a/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysMenuPermCodeMapper.xml +++ b/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysMenuPermCodeMapper.xml @@ -2,7 +2,7 @@ - - + + \ No newline at end of file diff --git a/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysPermCodeMapper.xml b/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysPermCodeMapper.xml index 1ceedbc7..2f298d6a 100644 --- a/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysPermCodeMapper.xml +++ b/orange-demo-single-service/application/src/main/java/com/orange/demo/upms/dao/mapper/SysPermCodeMapper.xml @@ -17,7 +17,7 @@ +