From 307588694e5dadc2f00d84dc430246daf551dd15 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Sun, 27 Sep 2020 22:22:59 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E6=B7=BB=E5=8A=A0=E5=A4=9A?=
=?UTF-8?q?=E5=AF=B9=E5=A4=9A=E5=85=B3=E8=81=94=E4=B8=AD=E9=97=B4=E8=A1=A8?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E6=8C=81=EF=BC=8C=E5=8A=9F=E8=83=BD?=
=?UTF-8?q?=E4=BD=8D=E4=BA=8E=20=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86=20->?=
=?UTF-8?q?=20=E8=AF=BE=E7=A8=8B=20->=20=E7=BC=96=E8=BE=91=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
orange-demo-multi-service/OrangeMultiDemo.iml | 146 ++++
.../admin-monitor/admin-monitor.iml | 226 ++++++
.../admin-monitor/pom.xml | 2 +-
.../adminmonitor/AdminMonitorApplication.java | 4 +-
.../application-common/application-common.iml | 259 +++++++
.../common/constant/DeviceType.java | 4 +-
.../application/common/constant/ExpLevel.java | 4 +-
.../application/common/constant/Gender.java | 4 +-
.../common/constant/StudentActionType.java | 4 +-
.../common/constant/StudentStatus.java | 4 +-
.../application/common/constant/Subject.java | 4 +-
.../application/application.iml | 193 +++++
.../course-class-interface.iml | 260 +++++++
.../client/AreaCodeClient.java | 4 +-
.../client/CourseClient.java | 4 +-
.../client/GradeClient.java | 4 +-
.../client/SchoolInfoClient.java | 4 +-
.../client/StudentClassClient.java | 4 +-
.../client/StudentClient.java | 4 +-
.../constant/ClassLevel.java | 4 +-
.../constant/ClassStatus.java | 4 +-
.../constant/CourseDifficult.java | 4 +-
.../courseclassinterface/dto/AreaCodeDto.java | 4 +-
.../dto/ClassCourseDto.java | 34 +
.../dto/ClassStudentDto.java | 29 +
.../courseclassinterface/dto/CourseDto.java | 4 +-
.../courseclassinterface/dto/GradeDto.java | 10 +-
.../dto/SchoolInfoDto.java | 4 +-
.../dto/StudentClassDto.java | 4 +-
.../courseclassinterface/dto/StudentDto.java | 10 +-
.../course-class-service.iml | 277 +++++++
.../CourseClassApplication.java | 4 +-
.../config/ApplicationConfig.java | 4 +-
.../config/DataSourceConfig.java | 4 +-
.../controller/AreaCodeController.java | 4 +-
.../controller/CourseController.java | 50 +-
.../controller/GradeController.java | 4 +-
.../controller/SchoolInfoController.java | 4 +-
.../controller/StudentClassController.java | 82 ++-
.../controller/StudentController.java | 4 +-
.../dao/AreaCodeMapper.java | 4 +-
.../dao/ClassCourseMapper.java | 4 +-
.../dao/ClassStudentMapper.java | 4 +-
.../courseclassservice/dao/CourseMapper.java | 4 +-
.../courseclassservice/dao/GradeMapper.java | 4 +-
.../dao/MaterialEditionMapper.java | 4 +-
.../dao/SchoolInfoMapper.java | 4 +-
.../dao/StudentClassMapper.java | 20 +-
.../courseclassservice/dao/StudentMapper.java | 4 +-
.../dao/mapper/StudentClassMapper.xml | 14 -
.../courseclassservice/model/AreaCode.java | 4 +-
.../courseclassservice/model/ClassCourse.java | 5 +-
.../model/ClassStudent.java | 4 +-
.../demo/courseclassservice/model/Course.java | 4 +-
.../demo/courseclassservice/model/Grade.java | 11 +-
.../model/MaterialEdition.java | 4 +-
.../courseclassservice/model/SchoolInfo.java | 4 +-
.../courseclassservice/model/Student.java | 4 +-
.../model/StudentClass.java | 4 +-
.../service/AreaCodeService.java | 4 +-
.../service/CourseService.java | 5 +-
.../service/GradeService.java | 12 +-
.../service/SchoolInfoService.java | 5 +-
.../service/StudentClassService.java | 54 +-
.../service/StudentService.java | 15 +-
.../application/course-class/course-class.iml | 193 +++++
.../application/gateway/gateway.iml | 278 +++++++
.../demo/gateway/GatewayApplication.java | 4 +-
.../gateway/config/ApplicationConfig.java | 4 +-
.../demo/gateway/config/CorsConfig.java | 4 +-
.../demo/gateway/config/FilterConfig.java | 4 +-
.../demo/gateway/config/SentinelConfig.java | 4 +-
.../gateway/constant/GatewayConstant.java | 4 +-
.../filter/AuthenticationPostFilter.java | 4 +-
.../filter/AuthenticationPreFilter.java | 42 +-
.../demo/gateway/filter/RequestLogFilter.java | 4 +-
.../gateway/filter/ResponseLogFilter.java | 4 +-
orange-demo-multi-service/application/pom.xml | 2 +-
.../client/CourseTransStatsClient.java | 4 +-
.../client/StudentActionStatsClient.java | 4 +-
.../client/StudentActionTransClient.java | 4 +-
.../dto/CourseTransStatsDto.java | 4 +-
.../dto/StudentActionStatsDto.java | 4 +-
.../dto/StudentActionTransDto.java | 2 +-
.../stats/stats-interface/stats-interface.iml | 260 +++++++
.../demo/statsservice/StatsApplication.java | 4 +-
.../config/ApplicationConfig.java | 4 +-
.../statsservice/config/DataSourceConfig.java | 4 +-
.../CourseTransStatsController.java | 4 +-
.../StudentActionStatsController.java | 4 +-
.../StudentActionTransController.java | 4 +-
.../dao/CourseTransStatsMapper.java | 4 +-
.../demo/statsservice/dao/GradeMapper.java | 13 +
.../statsservice/dao/SchoolInfoMapper.java | 13 +
.../dao/StudentActionStatsMapper.java | 4 +-
.../dao/StudentActionTransMapper.java | 4 +-
.../statsservice/dao/mapper/GradeMapper.xml | 9 +
.../dao/mapper/SchoolInfoMapper.xml | 10 +
.../statsservice/model/CourseTransStats.java | 4 +-
.../orange/demo/statsservice/model/Grade.java | 41 ++
.../demo/statsservice/model/SchoolInfo.java | 45 ++
.../model/StudentActionStats.java | 4 +-
.../model/StudentActionTrans.java | 2 +-
.../service/CourseTransStatsService.java | 4 +-
.../service/StudentActionStatsService.java | 4 +-
.../service/StudentActionTransService.java | 5 +-
.../stats/stats-service/stats-service.iml | 278 +++++++
.../application/stats/stats.iml | 193 +++++
.../upmsinterface/client/SysUserClient.java | 4 +-
.../upmsinterface/constant/SysMenuType.java | 4 +-
.../constant/SysPermCodeType.java | 4 +-
.../constant/SysPermModuleType.java | 4 +-
.../upmsinterface/constant/SysUserStatus.java | 4 +-
.../upmsinterface/constant/SysUserType.java | 4 +-
.../upmsinterface/dto/SysDataPermDeptDto.java | 23 -
.../demo/upmsinterface/dto/SysMenuDto.java | 4 +-
.../upmsinterface/dto/SysPermCodeDto.java | 4 +-
.../demo/upmsinterface/dto/SysPermDto.java | 4 +-
.../upmsinterface/dto/SysPermModuleDto.java | 4 +-
.../demo/upmsinterface/dto/SysRoleDto.java | 4 +-
.../demo/upmsinterface/dto/SysUserDto.java | 7 +-
.../upms/upms-interface/upms-interface.iml | 260 +++++++
.../demo/upmsservice/UpmsApplication.java | 4 +-
.../upmsservice/config/ApplicationConfig.java | 4 +-
.../upmsservice/config/DataSourceConfig.java | 4 +-
.../controller/LoginController.java | 8 +-
.../controller/SysMenuController.java | 4 +-
.../controller/SysPermCodeController.java | 4 +-
.../controller/SysPermController.java | 4 +-
.../controller/SysPermModuleController.java | 4 +-
.../controller/SysRoleController.java | 4 +-
.../controller/SysUserController.java | 7 +-
.../demo/upmsservice/dao/SysMenuMapper.java | 4 +-
.../dao/SysMenuPermCodeMapper.java | 4 +-
.../upmsservice/dao/SysPermCodeMapper.java | 4 +-
.../dao/SysPermCodePermMapper.java | 4 +-
.../demo/upmsservice/dao/SysPermMapper.java | 4 +-
.../upmsservice/dao/SysPermModuleMapper.java | 4 +-
.../dao/SysPermWhitelistMapper.java | 4 +-
.../demo/upmsservice/dao/SysRoleMapper.java | 4 +-
.../upmsservice/dao/SysRoleMenuMapper.java | 4 +-
.../demo/upmsservice/dao/SysUserMapper.java | 4 +-
.../upmsservice/dao/SysUserRoleMapper.java | 4 +-
.../demo/upmsservice/model/SysMenu.java | 4 +-
.../upmsservice/model/SysMenuPermCode.java | 4 +-
.../demo/upmsservice/model/SysPerm.java | 4 +-
.../demo/upmsservice/model/SysPermCode.java | 4 +-
.../upmsservice/model/SysPermCodePerm.java | 4 +-
.../demo/upmsservice/model/SysPermModule.java | 4 +-
.../upmsservice/model/SysPermWhitelist.java | 4 +-
.../demo/upmsservice/model/SysRole.java | 4 +-
.../demo/upmsservice/model/SysRoleMenu.java | 4 +-
.../demo/upmsservice/model/SysUser.java | 4 +-
.../demo/upmsservice/model/SysUserRole.java | 4 +-
.../upmsservice/service/SysMenuService.java | 4 +-
.../service/SysPermCodeService.java | 4 +-
.../service/SysPermModuleService.java | 4 +-
.../upmsservice/service/SysPermService.java | 4 +-
.../service/SysPermWhitelistService.java | 4 +-
.../upmsservice/service/SysRoleService.java | 4 +-
.../upmsservice/service/SysUserService.java | 4 +-
.../upms/upms-service/upms-service.iml | 277 +++++++
.../application/upms/upms.iml | 193 +++++
.../common/common-core/common-core.iml | 216 ++++++
.../common/common-core/pom.xml | 10 -
.../core/advice/MyControllerAdvice.java | 4 +-
.../core/advice/MyExceptionHandler.java | 4 +-
.../core/annotation/DeletedFlagColumn.java | 4 +-
.../core/annotation/JobUpdateTimeColumn.java | 4 +-
.../common/core/annotation/MyDataSource.java | 4 +-
.../common/core/annotation/MyRequestBody.java | 4 +-
.../core/annotation/NoAuthInterface.java | 4 +-
.../core/annotation/RelationConstDict.java | 4 +-
.../common/core/annotation/RelationDict.java | 4 +-
.../core/annotation/RelationManyToMany.java | 4 +-
.../RelationManyToManyAggregation.java | 4 +-
.../RelationOneToManyAggregation.java | 4 +-
.../core/annotation/RelationOneToOne.java | 4 +-
.../demo/common/core/aop/AccessLogAspect.java | 4 +-
.../common/core/base/client/BaseClient.java | 4 +-
.../core/base/controller/BaseController.java | 4 +-
.../common/core/base/dao/BaseDaoMapper.java | 4 +-
.../core/base/mapper/BaseModelMapper.java | 4 +-
.../core/base/mapper/DummyModelMapper.java | 4 +-
.../core/base/service/BaseDictService.java | 4 +-
.../common/core/base/service/BaseService.java | 4 +-
.../demo/common/core/cache/CacheConfig.java | 83 ---
.../common/core/cache/DictionaryCache.java | 4 +-
.../common/core/cache/MapDictionaryCache.java | 4 +-
.../core/cache/MapTreeDictionaryCache.java | 4 +-
.../core/config/CommonWebMvcConfig.java | 4 +-
.../common/core/config/EncryptConfig.java | 4 +-
.../demo/common/core/config/FeignConfig.java | 4 +-
.../core/config/RestTemplateConfig.java | 4 +-
.../demo/common/core/config/TomcatConfig.java | 4 +-
.../common/core/constant/AggregationKind.java | 4 +-
.../common/core/constant/AggregationType.java | 4 +-
.../core/constant/ApplicationConstant.java | 4 +-
.../common/core/constant/ErrorCodeEnum.java | 4 +-
.../core/constant/GlobalDeletedFlag.java | 4 +-
.../exception/DataValidationException.java | 4 +-
.../exception/InvalidClassFieldException.java | 4 +-
.../exception/InvalidDataFieldException.java | 4 +-
.../exception/InvalidDataModelException.java | 4 +-
.../core/exception/MyRuntimeException.java | 4 +-
.../core/exception/NoDataAffectException.java | 4 +-
.../core/exception/NoDataPermException.java | 4 +-
.../exception/RedisCacheAccessException.java | 4 +-
.../exception/RemoteDataBuildException.java | 4 +-
.../MyRequestArgumentResolver.java | 4 +-
.../core/listener/LoadCachedDataListener.java | 4 +-
.../listener/LoadServiceRelationListener.java | 4 +-
.../demo/common/core/object/CallResult.java | 4 +-
.../demo/common/core/object/DummyClass.java | 4 +-
.../core/object/MyAggregationParam.java | 4 +-
.../common/core/object/MyGroupCriteria.java | 4 +-
.../demo/common/core/object/MyGroupParam.java | 4 +-
.../demo/common/core/object/MyOrderParam.java | 4 +-
.../demo/common/core/object/MyPageParam.java | 4 +-
.../demo/common/core/object/MyQueryParam.java | 4 +-
.../common/core/object/MyRelationParam.java | 4 +-
.../common/core/object/MyWhereCriteria.java | 4 +-
.../common/core/object/ResponseResult.java | 4 +-
.../demo/common/core/object/TokenData.java | 4 +-
.../demo/common/core/object/Tuple2.java | 4 +-
.../demo/common/core/util/AopTargetUtil.java | 4 +-
.../core/util/ApplicationContextHolder.java | 4 +-
.../demo/common/core/util/ContextUtil.java | 4 +-
.../demo/common/core/util/ExportUtil.java | 4 +-
.../demo/common/core/util/ImportUtil.java | 4 +-
.../orange/demo/common/core/util/IpUtil.java | 4 +-
.../orange/demo/common/core/util/JwtUtil.java | 4 +-
.../demo/common/core/util/LogMessageUtil.java | 4 +-
.../demo/common/core/util/MyCommonUtil.java | 4 +-
.../demo/common/core/util/MyDateUtil.java | 4 +-
.../demo/common/core/util/MyModelUtil.java | 57 +-
.../demo/common/core/util/MyPageUtil.java | 4 +-
.../demo/common/core/util/RedisKeyUtil.java | 4 +-
.../orange/demo/common/core/util/RsaUtil.java | 4 +-
.../demo/common/core/util/TreeNode.java | 4 +-
.../demo/common/core/util/UpDownloadUtil.java | 12 +-
.../demo/common/core/validator/AddGroup.java | 4 +-
.../common/core/validator/ConstDictRef.java | 4 +-
.../core/validator/ConstDictValidator.java | 4 +-
.../common/core/validator/TextLength.java | 4 +-
.../core/validator/TextLengthValidator.java | 4 +-
.../common/core/validator/UpdateGroup.java | 4 +-
.../common/common-redis/common-redis.iml | 233 ++++++
.../redis/cache/RedisDictionaryCache.java | 4 +-
.../redis/cache/RedisTreeDictionaryCache.java | 4 +-
.../redis/cache/RedissonCacheConfig.java | 63 ++
.../redis/cache/SessionCacheHelper.java | 72 ++
.../demo/common/redis/config/JedisConfig.java | 4 +-
.../common/redis/config/RedissonConfig.java | 4 +-
.../common-sequence/common-sequence.iml | 214 ++++++
.../config/IdGeneratorAutoConfigure.java | 4 +-
.../config/IdGeneratorProperties.java | 4 +-
.../sequence/generator/BasicIdGenerator.java | 4 +-
.../sequence/generator/MyIdGenerator.java | 4 +-
.../generator/SnowflakeIdGenerator.java | 2 +-
.../generator/SnowflakeZookeeperHolder.java | 2 +-
.../sequence/wrapper/IdGeneratorWrapper.java | 4 +-
orange-demo-multi-service/common/common.iml | 146 ++++
orange-demo-multi-service/common/pom.xml | 2 +-
orange-demo-multi-service/pom.xml | 4 +-
.../zz-resource/config-data/gateway-dev.yaml | 2 +-
.../zz-resource/docker-files/.DS_Store | Bin 0 -> 6148 bytes
.../36c9370678cb45afa772d3e9d0056d57.png | Bin 1892 -> 0 bytes
.../8c818ee4bcb040f9bd06c85c42d598ff.jpg | Bin 208715 -> 0 bytes
.../zzlogs/course-class/course-class.log | 449 +++++++++++
.../zzlogs/gateway/gateway.log | 108 +++
.../zzlogs/upms/upms.log | 19 +
orange-demo-multi-web/public/index.html | 4 +-
.../src/api/Controller/ClassController.js | 65 --
.../api/Controller/StudentClassController.js | 12 +-
.../src/api/Controller/SysDeptController.js | 25 -
.../src/assets/img/login_bg.jpg | Bin 920832 -> 494030 bytes
.../src/router/systemRouters.js | 8 +-
.../src/views/generated/formClass/index.vue | 72 +-
.../views/generated/formClassCourse/index.vue | 22 +
.../generated/formClassStudent/index.vue | 4 +-
.../src/views/generated/formCourse/index.vue | 2 +
.../views/generated/formCourseStats/index.vue | 2 +
.../views/generated/formCreateClass/index.vue | 34 +-
.../generated/formCreateCourse/index.vue | 2 +
.../generated/formCreateSchool/index.vue | 2 +
.../generated/formCreateStudent/index.vue | 18 +-
.../views/generated/formEditClass/index.vue | 34 +-
.../formEditClassCourseOrder/index.vue | 157 ++++
.../views/generated/formEditCourse/index.vue | 2 +
.../views/generated/formEditSchool/index.vue | 2 +
.../src/views/generated/formSchool/index.vue | 2 +
.../generated/formSetClassCourse/index.vue | 10 +-
.../generated/formSetClassStudent/index.vue | 16 +-
.../src/views/generated/formStudent/index.vue | 2 +
.../formStudentActionDetail/index.vue | 2 +
.../formStudentActionStats/index.vue | 2 +
.../src/views/upms/formEditSysUser/index.vue | 2 +-
.../src/views/welcome/index.vue | 18 +-
orange-demo-single-service/.DS_Store | Bin 0 -> 6148 bytes
.../common/constant/DeviceType.java | 2 +-
.../application/common/constant/ExpLevel.java | 2 +-
.../application/common/constant/Gender.java | 2 +-
.../common/constant/StudentActionType.java | 2 +-
.../common/constant/StudentStatus.java | 2 +-
.../application/common/constant/Subject.java | 2 +-
.../java/com/orange/demo/MyApplication.java | 2 +-
.../app/controller/AreaCodeController.java | 2 +-
.../demo/app/controller/CourseController.java | 2 +-
.../CourseTransStatsController.java | 2 +-
.../demo/app/controller/GradeController.java | 2 +-
.../app/controller/SchoolInfoController.java | 2 +-
.../StudentActionStatsController.java | 2 +-
.../StudentActionTransController.java | 2 +-
.../controller/StudentClassController.java | 2 +-
.../app/controller/StudentController.java | 2 +-
.../orange/demo/app/dao/AreaCodeMapper.java | 2 +-
.../demo/app/dao/ClassCourseMapper.java | 2 +-
.../demo/app/dao/ClassStudentMapper.java | 2 +-
.../com/orange/demo/app/dao/CourseMapper.java | 2 +-
.../demo/app/dao/CourseTransStatsMapper.java | 2 +-
.../com/orange/demo/app/dao/GradeMapper.java | 2 +-
.../demo/app/dao/MaterialEditionMapper.java | 2 +-
.../orange/demo/app/dao/SchoolInfoMapper.java | 2 +-
.../app/dao/StudentActionStatsMapper.java | 2 +-
.../app/dao/StudentActionTransMapper.java | 2 +-
.../demo/app/dao/StudentClassMapper.java | 2 +-
.../orange/demo/app/dao/StudentMapper.java | 2 +-
.../com/orange/demo/app/model/AreaCode.java | 2 +-
.../orange/demo/app/model/ClassCourse.java | 2 +-
.../orange/demo/app/model/ClassStudent.java | 2 +-
.../com/orange/demo/app/model/Course.java | 2 +-
.../demo/app/model/CourseTransStats.java | 2 +-
.../java/com/orange/demo/app/model/Grade.java | 2 +-
.../demo/app/model/MaterialEdition.java | 2 +-
.../com/orange/demo/app/model/SchoolInfo.java | 2 +-
.../com/orange/demo/app/model/Student.java | 4 +-
.../demo/app/model/StudentActionStats.java | 2 +-
.../demo/app/model/StudentActionTrans.java | 2 +-
.../orange/demo/app/model/StudentClass.java | 2 +-
.../demo/app/model/constant/ClassLevel.java | 2 +-
.../demo/app/model/constant/ClassStatus.java | 2 +-
.../app/model/constant/CourseDifficult.java | 2 +-
.../demo/app/service/AreaCodeService.java | 2 +-
.../demo/app/service/CourseService.java | 2 +-
.../app/service/CourseTransStatsService.java | 2 +-
.../orange/demo/app/service/GradeService.java | 2 +-
.../demo/app/service/SchoolInfoService.java | 2 +-
.../service/StudentActionStatsService.java | 2 +-
.../service/StudentActionTransService.java | 2 +-
.../demo/app/service/StudentClassService.java | 2 +-
.../demo/app/service/StudentService.java | 2 +-
.../orange/demo/config/ApplicationConfig.java | 2 +-
.../orange/demo/config/DataSourceConfig.java | 2 +-
.../com/orange/demo/config/FilterConfig.java | 2 +-
.../orange/demo/config/InterceptorConfig.java | 2 +-
.../AuthenticationInterceptor.java | 2 +-
.../demo/upms/controller/LoginController.java | 2 +-
.../upms/controller/SysMenuController.java | 2 +-
.../controller/SysPermCodeController.java | 2 +-
.../upms/controller/SysPermController.java | 2 +-
.../controller/SysPermModuleController.java | 2 +-
.../upms/controller/SysRoleController.java | 2 +-
.../upms/controller/SysUserController.java | 2 +-
.../orange/demo/upms/dao/SysMenuMapper.java | 2 +-
.../demo/upms/dao/SysMenuPermCodeMapper.java | 2 +-
.../demo/upms/dao/SysPermCodeMapper.java | 2 +-
.../demo/upms/dao/SysPermCodePermMapper.java | 2 +-
.../orange/demo/upms/dao/SysPermMapper.java | 2 +-
.../demo/upms/dao/SysPermModuleMapper.java | 2 +-
.../demo/upms/dao/SysPermWhitelistMapper.java | 2 +-
.../orange/demo/upms/dao/SysRoleMapper.java | 2 +-
.../demo/upms/dao/SysRoleMenuMapper.java | 2 +-
.../orange/demo/upms/dao/SysUserMapper.java | 2 +-
.../demo/upms/dao/SysUserRoleMapper.java | 2 +-
.../com/orange/demo/upms/model/SysMenu.java | 2 +-
.../demo/upms/model/SysMenuPermCode.java | 2 +-
.../com/orange/demo/upms/model/SysPerm.java | 2 +-
.../orange/demo/upms/model/SysPermCode.java | 2 +-
.../demo/upms/model/SysPermCodePerm.java | 2 +-
.../orange/demo/upms/model/SysPermModule.java | 2 +-
.../demo/upms/model/SysPermWhitelist.java | 2 +-
.../com/orange/demo/upms/model/SysRole.java | 2 +-
.../orange/demo/upms/model/SysRoleMenu.java | 2 +-
.../com/orange/demo/upms/model/SysUser.java | 2 +-
.../orange/demo/upms/model/SysUserRole.java | 2 +-
.../demo/upms/model/constant/SysMenuType.java | 2 +-
.../upms/model/constant/SysPermCodeType.java | 2 +-
.../model/constant/SysPermModuleType.java | 2 +-
.../upms/model/constant/SysUserStatus.java | 2 +-
.../demo/upms/model/constant/SysUserType.java | 2 +-
.../demo/upms/service/SysMenuService.java | 2 +-
.../demo/upms/service/SysPermCodeService.java | 2 +-
.../upms/service/SysPermModuleService.java | 2 +-
.../demo/upms/service/SysPermService.java | 2 +-
.../upms/service/SysPermWhitelistService.java | 2 +-
.../demo/upms/service/SysRoleService.java | 2 +-
.../demo/upms/service/SysUserService.java | 2 +-
.../core/advice/MyControllerAdvice.java | 2 +-
.../core/advice/MyExceptionHandler.java | 2 +-
.../core/annotation/DeletedFlagColumn.java | 2 +-
.../core/annotation/JobUpdateTimeColumn.java | 2 +-
.../common/core/annotation/MyDataSource.java | 2 +-
.../common/core/annotation/MyRequestBody.java | 2 +-
.../core/annotation/NoAuthInterface.java | 2 +-
.../core/annotation/RelationConstDict.java | 2 +-
.../common/core/annotation/RelationDict.java | 2 +-
.../core/annotation/RelationManyToMany.java | 2 +-
.../RelationManyToManyAggregation.java | 2 +-
.../RelationOneToManyAggregation.java | 2 +-
.../core/annotation/RelationOneToOne.java | 2 +-
.../demo/common/core/aop/AccessLogAspect.java | 2 +-
.../common/core/base/dao/BaseDaoMapper.java | 2 +-
.../core/base/mapper/BaseModelMapper.java | 2 +-
.../core/base/mapper/DummyModelMapper.java | 2 +-
.../core/base/service/BaseDictService.java | 2 +-
.../common/core/base/service/BaseService.java | 2 +-
.../demo/common/core/cache/CacheConfig.java | 2 +-
.../common/core/cache/DictionaryCache.java | 2 +-
.../common/core/cache/MapDictionaryCache.java | 2 +-
.../core/cache/MapTreeDictionaryCache.java | 2 +-
.../common/core/cache/SessionCacheHelper.java | 2 +-
.../core/config/CommonWebMvcConfig.java | 2 +-
.../common/core/config/EncryptConfig.java | 2 +-
.../core/config/RestTemplateConfig.java | 2 +-
.../demo/common/core/config/TomcatConfig.java | 2 +-
.../common/core/constant/AggregationType.java | 2 +-
.../core/constant/ApplicationConstant.java | 2 +-
.../common/core/constant/ErrorCodeEnum.java | 2 +-
.../core/constant/GlobalDeletedFlag.java | 2 +-
.../exception/DataValidationException.java | 2 +-
.../exception/InvalidClassFieldException.java | 2 +-
.../exception/InvalidDataFieldException.java | 2 +-
.../exception/InvalidDataModelException.java | 2 +-
.../core/exception/MyRuntimeException.java | 2 +-
.../core/exception/NoDataAffectException.java | 2 +-
.../core/exception/NoDataPermException.java | 2 +-
.../exception/RedisCacheAccessException.java | 2 +-
.../MyRequestArgumentResolver.java | 2 +-
.../core/listener/LoadCachedDataListener.java | 2 +-
.../listener/LoadServiceRelationListener.java | 2 +-
.../demo/common/core/object/CallResult.java | 2 +-
.../common/core/object/MyGroupCriteria.java | 2 +-
.../demo/common/core/object/MyGroupParam.java | 2 +-
.../demo/common/core/object/MyOrderParam.java | 2 +-
.../demo/common/core/object/MyPageParam.java | 2 +-
.../common/core/object/MyRelationParam.java | 2 +-
.../common/core/object/MyWhereCriteria.java | 2 +-
.../common/core/object/ResponseResult.java | 2 +-
.../demo/common/core/object/TokenData.java | 2 +-
.../demo/common/core/object/Tuple2.java | 2 +-
.../demo/common/core/util/AopTargetUtil.java | 2 +-
.../core/util/ApplicationContextHolder.java | 2 +-
.../demo/common/core/util/ContextUtil.java | 2 +-
.../demo/common/core/util/ExportUtil.java | 2 +-
.../demo/common/core/util/ImportUtil.java | 2 +-
.../orange/demo/common/core/util/IpUtil.java | 2 +-
.../orange/demo/common/core/util/JwtUtil.java | 2 +-
.../demo/common/core/util/LogMessageUtil.java | 2 +-
.../demo/common/core/util/MyCommonUtil.java | 2 +-
.../demo/common/core/util/MyDateUtil.java | 2 +-
.../demo/common/core/util/MyModelUtil.java | 2 +-
.../demo/common/core/util/MyPageUtil.java | 2 +-
.../orange/demo/common/core/util/RsaUtil.java | 2 +-
.../demo/common/core/util/TreeNode.java | 2 +-
.../demo/common/core/util/UpDownloadUtil.java | 2 +-
.../demo/common/core/validator/AddGroup.java | 2 +-
.../common/core/validator/ConstDictRef.java | 2 +-
.../core/validator/ConstDictValidator.java | 2 +-
.../common/core/validator/TextLength.java | 2 +-
.../core/validator/TextLengthValidator.java | 2 +-
.../common/core/validator/UpdateGroup.java | 2 +-
.../config/IdGeneratorAutoConfigure.java | 2 +-
.../config/IdGeneratorProperties.java | 2 +-
.../sequence/generator/BasicIdGenerator.java | 2 +-
.../sequence/generator/MyIdGenerator.java | 2 +-
.../sequence/wrapper/IdGeneratorWrapper.java | 2 +-
.../zz-resource/.DS_Store | Bin 0 -> 6148 bytes
.../eef356943ce74b7b809dcce178cb92d2.png | Bin 806 -> 0 bytes
.../f405e57c332649bc8f2319d9c6703343.png | Bin 0 -> 4152 bytes
.../zzlogs/server/server.log | 694 ++++++++++++++++++
orange-demo-single-web/README.md | 2 +-
orange-demo-single-web/public/index.html | 4 +-
.../api/Controller/StudentClassController.js | 8 +-
.../src/core/config/development.js | 2 +-
.../src/router/systemRouters.js | 12 +-
.../src/views/generated/formClass/index.vue | 4 +-
.../views/generated/formClassCourse/index.vue | 36 +-
.../generated/formClassStudent/index.vue | 20 +-
.../views/generated/formCreateClass/index.vue | 32 +-
.../generated/formCreateStudent/index.vue | 2 +-
.../views/generated/formEditClass/index.vue | 65 +-
.../formEditClassCourseOrder/index.vue | 157 ++++
.../generated/formSetClassCourse/index.vue | 2 +-
.../generated/formSetClassStudent/index.vue | 2 +-
495 files changed, 7134 insertions(+), 1183 deletions(-)
create mode 100644 orange-demo-multi-service/OrangeMultiDemo.iml
create mode 100644 orange-demo-multi-service/admin-monitor/admin-monitor.iml
create mode 100644 orange-demo-multi-service/application/application-common/application-common.iml
create mode 100644 orange-demo-multi-service/application/application.iml
create mode 100644 orange-demo-multi-service/application/course-class/course-class-interface/course-class-interface.iml
create mode 100644 orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
create mode 100644 orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
create mode 100644 orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
create mode 100644 orange-demo-multi-service/application/course-class/course-class.iml
create mode 100644 orange-demo-multi-service/application/gateway/gateway.iml
create mode 100644 orange-demo-multi-service/application/stats/stats-interface/stats-interface.iml
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/GradeMapper.java
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/SchoolInfoMapper.java
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/GradeMapper.xml
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/SchoolInfoMapper.xml
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
create mode 100644 orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
create mode 100644 orange-demo-multi-service/application/stats/stats-service/stats-service.iml
create mode 100644 orange-demo-multi-service/application/stats/stats.iml
delete mode 100644 orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysDataPermDeptDto.java
create mode 100644 orange-demo-multi-service/application/upms/upms-interface/upms-interface.iml
create mode 100644 orange-demo-multi-service/application/upms/upms-service/upms-service.iml
create mode 100644 orange-demo-multi-service/application/upms/upms.iml
create mode 100644 orange-demo-multi-service/common/common-core/common-core.iml
delete mode 100644 orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java
create mode 100644 orange-demo-multi-service/common/common-redis/common-redis.iml
create mode 100644 orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java
create mode 100644 orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java
create mode 100644 orange-demo-multi-service/common/common-sequence/common-sequence.iml
create mode 100644 orange-demo-multi-service/common/common.iml
create mode 100644 orange-demo-multi-service/zz-resource/docker-files/.DS_Store
delete mode 100644 orange-demo-multi-service/zz-resource/upload-files/course-class/image/Course/pictureUrl/36c9370678cb45afa772d3e9d0056d57.png
delete mode 100644 orange-demo-multi-service/zz-resource/upload-files/course-class/image/Course/pictureUrl/8c818ee4bcb040f9bd06c85c42d598ff.jpg
create mode 100644 orange-demo-multi-service/zzlogs/course-class/course-class.log
create mode 100644 orange-demo-multi-service/zzlogs/gateway/gateway.log
create mode 100644 orange-demo-multi-service/zzlogs/upms/upms.log
delete mode 100644 orange-demo-multi-web/src/api/Controller/ClassController.js
delete mode 100644 orange-demo-multi-web/src/api/Controller/SysDeptController.js
create mode 100644 orange-demo-multi-web/src/views/generated/formEditClassCourseOrder/index.vue
create mode 100644 orange-demo-single-service/.DS_Store
create mode 100644 orange-demo-single-service/zz-resource/.DS_Store
delete mode 100644 orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/eef356943ce74b7b809dcce178cb92d2.png
create mode 100644 orange-demo-single-service/zz-resource/upload-files/app/image/Course/pictureUrl/f405e57c332649bc8f2319d9c6703343.png
create mode 100644 orange-demo-single-service/zzlogs/server/server.log
create mode 100644 orange-demo-single-web/src/views/generated/formEditClassCourseOrder/index.vue
diff --git a/orange-demo-multi-service/OrangeMultiDemo.iml b/orange-demo-multi-service/OrangeMultiDemo.iml
new file mode 100644
index 00000000..45fd11ef
--- /dev/null
+++ b/orange-demo-multi-service/OrangeMultiDemo.iml
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/admin-monitor/admin-monitor.iml b/orange-demo-multi-service/admin-monitor/admin-monitor.iml
new file mode 100644
index 00000000..d0c4ed63
--- /dev/null
+++ b/orange-demo-multi-service/admin-monitor/admin-monitor.iml
@@ -0,0 +1,226 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/admin-monitor/pom.xml b/orange-demo-multi-service/admin-monitor/pom.xml
index 67352a7a..0d4c2984 100644
--- a/orange-demo-multi-service/admin-monitor/pom.xml
+++ b/orange-demo-multi-service/admin-monitor/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
com.orange.demo
- OrangeDemo
+ OrangeMultiDemo
1.0.0
4.0.0
diff --git a/orange-demo-multi-service/admin-monitor/src/main/java/com/orange/demo/adminmonitor/AdminMonitorApplication.java b/orange-demo-multi-service/admin-monitor/src/main/java/com/orange/demo/adminmonitor/AdminMonitorApplication.java
index efd7fddb..099c81e9 100644
--- a/orange-demo-multi-service/admin-monitor/src/main/java/com/orange/demo/adminmonitor/AdminMonitorApplication.java
+++ b/orange-demo-multi-service/admin-monitor/src/main/java/com/orange/demo/adminmonitor/AdminMonitorApplication.java
@@ -8,8 +8,8 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
* 服务指标监控启动类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@SpringBootApplication
@EnableAdminServer
diff --git a/orange-demo-multi-service/application/application-common/application-common.iml b/orange-demo-multi-service/application/application-common/application-common.iml
new file mode 100644
index 00000000..382c9947
--- /dev/null
+++ b/orange-demo-multi-service/application/application-common/application-common.iml
@@ -0,0 +1,259 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java
index 01f6abee..0e8b47f2 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/DeviceType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 设备类型常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class DeviceType {
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java
index c5ef85fd..ef5a760c 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/ExpLevel.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 经验等级常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class ExpLevel {
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java
index f99c60b3..e7569526 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Gender.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 性别常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class Gender {
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java
index 77e4d3b2..c53a1d2e 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentActionType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 学生行为常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class StudentActionType {
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java
index 64cfb279..23c7bece 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/StudentStatus.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 学生状态常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class StudentStatus {
diff --git a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java
index a4abe567..9fe2ed98 100644
--- a/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java
+++ b/orange-demo-multi-service/application/application-common/src/main/java/com/orange/demo/application/common/constant/Subject.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 学科常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class Subject {
diff --git a/orange-demo-multi-service/application/application.iml b/orange-demo-multi-service/application/application.iml
new file mode 100644
index 00000000..ee4abb7e
--- /dev/null
+++ b/orange-demo-multi-service/application/application.iml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/course-class-interface.iml b/orange-demo-multi-service/application/course-class/course-class-interface/course-class-interface.iml
new file mode 100644
index 00000000..6cc7f266
--- /dev/null
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/course-class-interface.iml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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/client/AreaCodeClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
index 8a8b02fc..eeb7ac45 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/AreaCodeClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 行政区划远程访问接口类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(name = "system-service", fallbackFactory = AreaCodeClient.AreaCodeClientFallbackFactory.class)
public interface AreaCodeClient extends BaseClient {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
index 51908709..c94cfd23 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/CourseClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 课程数据服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "course-class",
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
index 2cee5041..7ecf9ae2 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/GradeClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "course-class",
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
index c9e3cd58..dae8f5f4 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/SchoolInfoClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 校区数据服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "course-class",
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
index ec5570d8..c32152ff 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClassClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 班级数据服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "course-class",
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
index 4a5d31e9..a4aeac2d 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/client/StudentClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 学生数据服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "course-class",
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassLevel.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassLevel.java
index 32cf85c0..7ac9f7ee 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassLevel.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassLevel.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 班级级别常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class ClassLevel {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassStatus.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassStatus.java
index 98453a31..deee73c0 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassStatus.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/ClassStatus.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 班级状态常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class ClassStatus {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/CourseDifficult.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/CourseDifficult.java
index 15d394e4..8e3cee38 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/CourseDifficult.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/constant/CourseDifficult.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 课程难度常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class CourseDifficult {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
index 6d543bab..2a5fdacd 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/AreaCodeDto.java
@@ -5,8 +5,8 @@ import lombok.Data;
/**
* 行政区划Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class AreaCodeDto {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
new file mode 100644
index 00000000..0fc0aa51
--- /dev/null
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassCourseDto.java
@@ -0,0 +1,34 @@
+package com.orange.demo.courseclassinterface.dto;
+
+import com.orange.demo.common.core.validator.UpdateGroup;
+
+import lombok.Data;
+
+import javax.validation.constraints.*;
+
+/**
+ * ClassCourseDto对象。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@Data
+public class ClassCourseDto {
+
+ /**
+ * 班级Id。
+ */
+ @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
+ private Long classId;
+
+ /**
+ * 课程Id。
+ */
+ @NotNull(message = "数据验证失败，课程Id不能为空！", groups = {UpdateGroup.class})
+ private Long courseId;
+
+ /**
+ * 课程顺序(数值越小越靠前)。
+ */
+ private Integer courseOrder;
+}
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
new file mode 100644
index 00000000..1c1bafb8
--- /dev/null
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/ClassStudentDto.java
@@ -0,0 +1,29 @@
+package com.orange.demo.courseclassinterface.dto;
+
+import com.orange.demo.common.core.validator.UpdateGroup;
+
+import lombok.Data;
+
+import javax.validation.constraints.*;
+
+/**
+ * ClassStudentDto对象。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@Data
+public class ClassStudentDto {
+
+ /**
+ * 班级Id。
+ */
+ @NotNull(message = "数据验证失败，班级Id不能为空！", groups = {UpdateGroup.class})
+ private Long classId;
+
+ /**
+ * 学生Id。
+ */
+ @NotNull(message = "数据验证失败，学生Id不能为空！", groups = {UpdateGroup.class})
+ private Long studentId;
+}
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
index 60aaa773..d75219e3 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/CourseDto.java
@@ -16,8 +16,8 @@ import java.util.Map;
/**
* CourseDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class CourseDto {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
index 56daf3af..e4b76e7d 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/GradeDto.java
@@ -9,8 +9,8 @@ import javax.validation.constraints.*;
/**
* GradeDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class GradeDto {
@@ -26,10 +26,4 @@ public class GradeDto {
*/
@NotBlank(message = "数据验证失败，年级名称不能为空！")
private String gradeName;
-
- /**
- * 是否正在使用（0：不是，1：是）。
- */
- @NotNull(message = "数据验证失败，是否正在使用（0：不是，1：是）不能为空！")
- private Integer status;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
index 7ee0cc24..ed7faabe 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/SchoolInfoDto.java
@@ -11,8 +11,8 @@ import java.util.Map;
/**
* SchoolInfoDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SchoolInfoDto {
diff --git a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
index 186336da..2f9185e8 100644
--- a/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
+++ b/orange-demo-multi-service/application/course-class/course-class-interface/src/main/java/com/orange/demo/courseclassinterface/dto/StudentClassDto.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* StudentClassDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class StudentClassDto {
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 e024bec7..f9593c72 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
@@ -16,8 +16,8 @@ import java.util.Map;
/**
* StudentDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class StudentDto {
@@ -81,13 +81,13 @@ public class StudentDto {
/**
* 总共充值学币数量。
*/
- @NotNull(message = "数据验证失败，充值学币不能为空！")
+ @NotNull(message = "数据验证失败，充值学币不能为空！", groups = {UpdateGroup.class})
private Integer totalCoin;
/**
* 可用学币数量。
*/
- @NotNull(message = "数据验证失败，剩余学币不能为空！")
+ @NotNull(message = "数据验证失败，剩余学币不能为空！", groups = {UpdateGroup.class})
private Integer leftCoin;
/**
@@ -110,7 +110,7 @@ public class StudentDto {
/**
* 学生状态 (0: 正常 1: 锁定 2: 注销)。
*/
- @NotNull(message = "数据验证失败，状态 不能为空！")
+ @NotNull(message = "数据验证失败，状态 不能为空！", groups = {UpdateGroup.class})
@ConstDictRef(constDictClass = StudentStatus.class, message = "数据验证失败，状态 为无效值！")
private Integer status;
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml b/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
new file mode 100644
index 00000000..0eafbe81
--- /dev/null
+++ b/orange-demo-multi-service/application/course-class/course-class-service/course-class-service.iml
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/CourseClassApplication.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/CourseClassApplication.java
index ac3e9bdb..320a1c8a 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/CourseClassApplication.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/CourseClassApplication.java
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
/**
* course-class服务启动类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@SpringCloudApplication
@EnableFeignClients(basePackages = "com.orange.demo")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/ApplicationConfig.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/ApplicationConfig.java
index f9cf319a..60b845cc 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/ApplicationConfig.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/ApplicationConfig.java
@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration;
* uploadFileBaseDir: /user/xxx/fileRoot/
* defaultSomething: defaultValue
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@RefreshScope
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
index 4e2c0827..dc974116 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/config/DataSourceConfig.java
@@ -13,8 +13,8 @@ import javax.sql.DataSource;
/**
* 数据源配置Bean对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
@EnableTransactionManagement
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
index 0386b3b9..48e15feb 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/AreaCodeController.java
@@ -18,8 +18,8 @@ import java.util.*;
/**
* 行政区划数据访问接口类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@RestController
@RequestMapping("/areaCode")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
index d1ba77e3..3c45475a 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/CourseController.java
@@ -15,6 +15,7 @@ import com.orange.demo.common.core.base.controller.BaseController;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
import com.orange.demo.common.core.validator.UpdateGroup;
+import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.courseclassservice.config.ApplicationConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,8 @@ import java.util.*;
/**
* 课程数据操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
@@ -41,6 +42,8 @@ public class CourseController extends BaseController {
private CourseService courseService;
@Autowired
private ApplicationConfig appConfig;
+ @Autowired
+ private SessionCacheHelper cacheHelper;
@Override
protected BaseService service() {
@@ -191,31 +194,39 @@ public class CourseController extends BaseController {
*/
@GetMapping("/download")
public void download(
- @RequestParam Long courseId,
+ @RequestParam(required = false) Long courseId,
@RequestParam String fieldName,
@RequestParam String filename,
@RequestParam Boolean asImage,
HttpServletResponse response) {
- if (MyCommonUtil.existBlankArgument(courseId, fieldName, filename, asImage)) {
+ if (MyCommonUtil.existBlankArgument(fieldName, filename, asImage)) {
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
return;
}
// 使用try来捕获异常，是为了保证一旦出现异常可以返回500的错误状态，便于调试。
// 否则有可能给前端返回的是200的错误码。
try {
- Course course = courseService.getById(courseId);
- if (course == null) {
- response.setStatus(HttpServletResponse.SC_NOT_FOUND);
- return;
- }
- String fieldJsonData = (String) ReflectUtil.getFieldValue(course, fieldName);
- if (fieldJsonData == null) {
- response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
- return;
- }
- if (!UpDownloadUtil.containFile(fieldJsonData, filename)) {
- response.setStatus(HttpServletResponse.SC_FORBIDDEN);
- return;
+ // 如果请求参数中没有包含主键Id，就判断该文件是否为当前session上传的。
+ if (courseId == null) {
+ if (!cacheHelper.existSessionUploadFile(filename)) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ return;
+ }
+ } else {
+ Course course = courseService.getById(courseId);
+ if (course == null) {
+ response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ return;
+ }
+ String fieldJsonData = (String) ReflectUtil.getFieldValue(course, fieldName);
+ if (fieldJsonData == null) {
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ return;
+ }
+ if (!UpDownloadUtil.containFile(fieldJsonData, filename)) {
+ response.setStatus(HttpServletResponse.SC_FORBIDDEN);
+ return;
+ }
}
UpDownloadUtil.doDownload(appConfig.getUploadFileBaseDir(),
Course.class.getSimpleName(), fieldName, filename, asImage, response);
@@ -240,8 +251,11 @@ public class CourseController extends BaseController {
@RequestParam Boolean asImage,
@RequestParam("uploadFile") MultipartFile uploadFile,
HttpServletResponse response) throws IOException {
- UpDownloadUtil.doUpload(appConfig.getUploadFileBaseDir(), appConfig.getServiceContextPath(),
+ String filename = UpDownloadUtil.doUpload(appConfig.getUploadFileBaseDir(), appConfig.getServiceContextPath(),
Course.class.getSimpleName(), fieldName, asImage, uploadFile, response);
+ if (filename != null) {
+ cacheHelper.putSessionUploadFile(filename);
+ }
}
/**
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
index 99ba7f94..675c9490 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/GradeController.java
@@ -24,8 +24,8 @@ import java.util.*;
/**
* 年级操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
index 6c4b12ad..9035fc41 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/SchoolInfoController.java
@@ -24,8 +24,8 @@ import java.util.*;
/**
* 校区数据操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
index 69416278..f19a0908 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentClassController.java
@@ -24,8 +24,8 @@ import java.util.stream.Collectors;
/**
* 班级数据操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
@@ -245,37 +245,75 @@ public class StudentClassController extends BaseController addClassCourse(
@MyRequestBody Long classId,
- @MyRequestBody(elementType = ClassCourse.class) List classCourseList) {
- if (MyCommonUtil.existBlankArgument(classId, classCourseList)) {
+ @MyRequestBody(value = "classCourseList", elementType = ClassCourseDto.class) List classCourseDtoList) {
+ if (MyCommonUtil.existBlankArgument(classId, classCourseDtoList)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
- for (ClassCourse classCourse : classCourseList) {
- // NOTE: 如果中间表 [ClassCourse] 除了两个关联主键之外还包括其他NotNull或NotBlank字段，
- // 请在执行下面验证之前手动赋值缺省值。如果没有此种情况，请忽略并删除该TODO注释。
- // 如：classCourse.setCourseOrder(0) 或 classCourse.setStarCourse(false)等。
- classCourse.setClassId(classId);
- classCourse.setCourseOrder(0);
+ for (ClassCourseDto classCourse : classCourseDtoList) {
String errorMessage = MyCommonUtil.getModelValidationError(classCourse);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
}
}
Set courseIdSet =
- classCourseList.stream().map(ClassCourse::getCourseId).collect(Collectors.toSet());
+ classCourseDtoList.stream().map(ClassCourseDto::getCourseId).collect(Collectors.toSet());
if (!studentClassService.existId(classId)
|| !courseService.existUniqueKeyList("courseId", courseIdSet)) {
return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
}
- studentClassService.addClassCourseList(classCourseList);
+ List classCourseList =
+ MyModelUtil.copyCollectionTo(classCourseDtoList, ClassCourse.class);
+ studentClassService.addClassCourseList(classCourseList, classId);
return ResponseResult.success();
}
+ /**
+ * 更新指定班级数据和指定 [课程数据] 的多对多关联数据。
+ *
+ * @param classCourseDto 对多对中间表对象。
+ * @return 应答结果对象。
+ */
+ @PostMapping("/updateClassCourse")
+ public ResponseResult updateClassCourse(
+ @MyRequestBody("classCourse") ClassCourseDto classCourseDto) {
+ String errorMessage = MyCommonUtil.getModelValidationError(classCourseDto);
+ if (errorMessage != null) {
+ return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
+ }
+ ClassCourse classCourse = MyModelUtil.copyTo(classCourseDto, ClassCourse.class);
+ if (!studentClassService.updateClassCourse(classCourse)) {
+ return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
+ }
+ return ResponseResult.success();
+ }
+
+ /**
+ * 显示班级数据和指定 [课程数据] 的多对多关联详情数据。
+ *
+ * @param classId 主表主键Id。
+ * @param courseId 从表主键Id。
+ * @return 应答结果对象，包括中间表详情。
+ */
+ @GetMapping("/viewClassCourse")
+ public ResponseResult viewClassCourse(
+ @RequestParam Long classId, @RequestParam Long courseId) {
+ if (MyCommonUtil.existBlankArgument(classId, courseId)) {
+ return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
+ }
+ ClassCourse classCourse = studentClassService.getClassCourse(classId, courseId);
+ if (classCourse == null) {
+ return ResponseResult.error(ErrorCodeEnum.DATA_NOT_EXIST);
+ }
+ ClassCourseDto classCourseDto = MyModelUtil.copyTo(classCourse, ClassCourseDto.class);
+ return ResponseResult.success(classCourseDto);
+ }
+
/**
* 移除指定班级数据和指定 [课程数据] 的多对多关联关系。
*
@@ -364,33 +402,31 @@ public class StudentClassController extends BaseController addClassStudent(
@MyRequestBody Long classId,
- @MyRequestBody(elementType = ClassStudent.class) List classStudentList) {
- if (MyCommonUtil.existBlankArgument(classId, classStudentList)) {
+ @MyRequestBody(value = "classStudentList", elementType = ClassStudentDto.class) List classStudentDtoList) {
+ if (MyCommonUtil.existBlankArgument(classId, classStudentDtoList)) {
return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
}
- for (ClassStudent classStudent : classStudentList) {
- // NOTE: 如果中间表 [ClassCourse] 除了两个关联主键之外还包括其他NotNull或NotBlank字段，
- // 请在执行下面验证之前手动赋值缺省值。如果没有此种情况，请忽略并删除该TODO注释。
- // 如：classCourse.setCourseOrder(0) 或 classCourse.setStarCourse(false)等。
- classStudent.setClassId(classId);
+ for (ClassStudentDto classStudent : classStudentDtoList) {
String errorMessage = MyCommonUtil.getModelValidationError(classStudent);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
}
}
Set studentIdSet =
- classStudentList.stream().map(ClassStudent::getStudentId).collect(Collectors.toSet());
+ classStudentDtoList.stream().map(ClassStudentDto::getStudentId).collect(Collectors.toSet());
if (!studentClassService.existId(classId)
|| !studentService.existUniqueKeyList("studentId", studentIdSet)) {
return ResponseResult.error(ErrorCodeEnum.INVALID_RELATED_RECORD_ID);
}
- studentClassService.addClassStudentList(classStudentList);
+ List classStudentList =
+ MyModelUtil.copyCollectionTo(classStudentDtoList, ClassStudent.class);
+ studentClassService.addClassStudentList(classStudentList, classId);
return ResponseResult.success();
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
index 57d17c7a..3c17025a 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/controller/StudentController.java
@@ -24,8 +24,8 @@ import java.util.*;
/**
* 学生数据操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/AreaCodeMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/AreaCodeMapper.java
index 6db0562d..c0c05280 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/AreaCodeMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/AreaCodeMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.courseclassservice.model.AreaCode;
/**
* 行政区划数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface AreaCodeMapper extends BaseDaoMapper {
}
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassCourseMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassCourseMapper.java
index 6157b39b..eb3f25b9 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassCourseMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassCourseMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.courseclassservice.model.ClassCourse;
/**
* 数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface ClassCourseMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassStudentMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassStudentMapper.java
index f3aa1273..b9b946ee 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassStudentMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/ClassStudentMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.courseclassservice.model.ClassStudent;
/**
* 数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface ClassStudentMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/CourseMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/CourseMapper.java
index 109cf042..29822dd9 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/CourseMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/CourseMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 课程数据数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface CourseMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/GradeMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/GradeMapper.java
index ec34b168..a46bffd1 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/GradeMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/GradeMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.courseclassservice.model.Grade;
/**
* 年级数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface GradeMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/MaterialEditionMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/MaterialEditionMapper.java
index 8119abfa..4d211e80 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/MaterialEditionMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/MaterialEditionMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.courseclassservice.model.MaterialEdition;
/**
* 数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface MaterialEditionMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/SchoolInfoMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/SchoolInfoMapper.java
index a6e27477..7a32ab34 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/SchoolInfoMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/SchoolInfoMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 校区数据数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SchoolInfoMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentClassMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentClassMapper.java
index c85c002e..1f7d95f5 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentClassMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentClassMapper.java
@@ -2,8 +2,6 @@ package com.orange.demo.courseclassservice.dao;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
import com.orange.demo.courseclassservice.model.StudentClass;
-import com.orange.demo.courseclassservice.model.ClassCourse;
-import com.orange.demo.courseclassservice.model.ClassStudent;
import org.apache.ibatis.annotations.Param;
import java.util.*;
@@ -11,8 +9,8 @@ import java.util.*;
/**
* 班级数据数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface StudentClassMapper extends BaseDaoMapper {
@@ -43,18 +41,4 @@ public interface StudentClassMapper extends BaseDaoMapper {
@Param("inFilterColumn") String inFilterColumn,
@Param("inFilterValues") Set inFilterValues,
@Param("studentClassFilter") StudentClass studentClassFilter);
-
- /**
- * 插入一组关联关系数据。
- *
- * @param classCourseList 关联关系数据项列表。
- */
- void addClassCourseList(List classCourseList);
-
- /**
- * 插入一组关联关系数据。
- *
- * @param classStudentList 关联关系数据项列表。
- */
- void addClassStudentList(List classStudentList);
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentMapper.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentMapper.java
index 8abb58ea..4d64e013 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentMapper.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/dao/StudentMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 学生数据数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface StudentMapper extends BaseDaoMapper {
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 00a827cf..57fc8f91 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
@@ -56,18 +56,4 @@
-
-
- REPLACE INTO zz_class_course(class_id, course_id) VALUES
-
- (#{item.classId}, #{item.courseId})
-
-
-
-
- REPLACE INTO zz_class_student(class_id, student_id) VALUES
-
- (#{item.classId}, #{item.studentId})
-
-
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
index b3261f21..abef3c6d 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/AreaCode.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 行政区划实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_area_code")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
index 23e11a21..078088c8 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassCourse.java
@@ -7,8 +7,8 @@ import javax.validation.constraints.*;
/**
* ClassCourse实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_class_course")
@@ -33,7 +33,6 @@ public class ClassCourse {
/**
* 课程顺序(数值越小越靠前)。
*/
- @NotNull(message = "数据验证失败，课程顺序(数值越小越靠前)不能为空！")
@Column(name = "course_order")
private Integer courseOrder;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
index 656fc38a..a635e953 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/ClassStudent.java
@@ -7,8 +7,8 @@ import javax.validation.constraints.*;
/**
* ClassStudent实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_class_student")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
index 9b84620b..cecc500c 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Course.java
@@ -20,8 +20,8 @@ import java.util.Map;
/**
* Course实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_course")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
index a9ed2056..4828f6a3 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Grade.java
@@ -1,5 +1,7 @@
package com.orange.demo.courseclassservice.model;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
import lombok.Data;
import javax.persistence.*;
import javax.validation.constraints.*;
@@ -7,8 +9,8 @@ import javax.validation.constraints.*;
/**
* Grade实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_grade")
@@ -31,8 +33,9 @@ public class Grade {
private String gradeName;
/**
- * 是否正在使用（0：不是，1：是）。
+ * 逻辑删除标记字段(1: 正常 -1: 已删除)。
*/
- @NotNull(message = "数据验证失败，是否正在使用（0：不是，1：是）不能为空！")
+ @JSONField(serialize = false)
+ @DeletedFlagColumn
private Integer status;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
index 43f0eb16..e27f2fd8 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/MaterialEdition.java
@@ -7,8 +7,8 @@ import javax.validation.constraints.*;
/**
* MaterialEdition实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_material_edition")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
index d1cf78ce..361d4817 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/SchoolInfo.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* SchoolInfo实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_school_info")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
index 44f68969..49b482d1 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/Student.java
@@ -20,8 +20,8 @@ import java.util.Map;
/**
* Student实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_student")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
index 18c5cdef..5eab25ac 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/model/StudentClass.java
@@ -20,8 +20,8 @@ import java.util.Map;
/**
* StudentClass实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_class")
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
index be99a308..fbdf6e92 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/AreaCodeService.java
@@ -16,8 +16,8 @@ import java.util.List;
/**
* 行政区划的Service类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class AreaCodeService extends BaseDictService {
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
index fbfa26e9..6171dfc3 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/CourseService.java
@@ -20,8 +20,8 @@ import java.util.*;
/**
* 课程数据数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class CourseService extends BaseService {
@@ -75,6 +75,7 @@ public class CourseService extends BaseService {
course.setCreateUserId(originalCourse.getCreateUserId());
course.setCreateTime(originalCourse.getCreateTime());
course.setUpdateTime(new Date());
+ // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return courseMapper.updateByPrimaryKey(course) == 1;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
index cd083310..beb5431d 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/GradeService.java
@@ -3,6 +3,7 @@ package com.orange.demo.courseclassservice.service;
import com.orange.demo.common.redis.cache.RedisDictionaryCache;
import com.orange.demo.common.core.base.service.BaseDictService;
import com.orange.demo.common.core.base.dao.BaseDaoMapper;
+import com.orange.demo.common.core.constant.GlobalDeletedFlag;
import com.orange.demo.courseclassservice.dao.GradeMapper;
import com.orange.demo.courseclassservice.model.Grade;
import com.orange.demo.courseclassinterface.dto.GradeDto;
@@ -16,8 +17,8 @@ import javax.annotation.PostConstruct;
/**
* 年级数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class GradeService extends BaseDictService {
@@ -55,6 +56,7 @@ public class GradeService extends BaseDictService {
*/
@Transactional(rollbackFor = Exception.class)
public Grade saveNew(Grade grade) {
+ grade.setStatus(GlobalDeletedFlag.NORMAL);
gradeMapper.insert(grade);
dictionaryCache.put(grade.getGradeId(), grade);
return grade;
@@ -69,6 +71,7 @@ public class GradeService extends BaseDictService {
*/
@Transactional(rollbackFor = Exception.class)
public boolean update(Grade grade, Grade originalGrade) {
+ grade.setStatus(GlobalDeletedFlag.NORMAL);
if (gradeMapper.updateByPrimaryKey(grade) != 1) {
return false;
}
@@ -84,7 +87,10 @@ public class GradeService extends BaseDictService {
*/
@Transactional(rollbackFor = Exception.class)
public boolean remove(Integer gradeId) {
- if (gradeMapper.deleteByPrimaryKey(gradeId) != 1) {
+ Grade deletedObject = new Grade();
+ deletedObject.setGradeId(gradeId);
+ deletedObject.setStatus(GlobalDeletedFlag.DELETED);
+ if (gradeMapper.updateByPrimaryKeySelective(deletedObject) != 1) {
return false;
}
dictionaryCache.invalidate(gradeId);
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
index a474021a..009f96b7 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/SchoolInfoService.java
@@ -19,8 +19,8 @@ import java.util.*;
/**
* 校区数据数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SchoolInfoService extends BaseService {
@@ -64,6 +64,7 @@ public class SchoolInfoService extends BaseService {
@@ -80,6 +80,7 @@ public class StudentClassService extends BaseService classCourseList) {
- studentClassMapper.addClassCourseList(classCourseList);
+ public void addClassCourseList(List classCourseList, Long classId) {
+ for (ClassCourse classCourse : classCourseList) {
+ classCourse.setClassId(classId);
+ if (classCourse.getCourseOrder() == null) {
+ classCourse.setCourseOrder(0);
+ }
+ }
+ classCourseMapper.insertList(classCourseList);
+ }
+
+ /**
+ * 更新中间表数据。
+ *
+ * @param classCourse 中间表对象。
+ * @return 更新成功与否。
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public boolean updateClassCourse(ClassCourse classCourse) {
+ Example e = new Example(ClassCourse.class);
+ e.createCriteria()
+ .andEqualTo("classId", classCourse.getClassId())
+ .andEqualTo("courseId", classCourse.getCourseId());
+ return classCourseMapper.updateByExample(classCourse, e) > 0;
+ }
+
+ /**
+ * 获取中间表数据。
+ *
+ * @param classId 主表Id。
+ * @param courseId 从表Id。
+ * @return 中间表对象。
+ */
+ public ClassCourse getClassCourse(Long classId, Long courseId) {
+ Example e = new Example(ClassCourse.class);
+ e.createCriteria()
+ .andEqualTo("classId", classId)
+ .andEqualTo("courseId", courseId);
+ return classCourseMapper.selectOneByExample(e);
}
/**
@@ -204,10 +242,14 @@ public class StudentClassService extends BaseService classStudentList) {
- studentClassMapper.addClassStudentList(classStudentList);
+ public void addClassStudentList(List classStudentList, Long classId) {
+ for (ClassStudent classStudent : classStudentList) {
+ classStudent.setClassId(classId);
+ }
+ classStudentMapper.insertList(classStudentList);
}
/**
diff --git a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentService.java b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentService.java
index e7c4322c..237b96cf 100644
--- a/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentService.java
+++ b/orange-demo-multi-service/application/course-class/course-class-service/src/main/java/com/orange/demo/courseclassservice/service/StudentService.java
@@ -1,5 +1,6 @@
package com.orange.demo.courseclassservice.service;
+import com.orange.demo.application.common.constant.StudentStatus;
import com.orange.demo.courseclassservice.dao.*;
import com.orange.demo.courseclassservice.model.*;
import com.orange.demo.courseclassinterface.dto.*;
@@ -19,8 +20,8 @@ import java.util.*;
/**
* 学生数据数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class StudentService extends BaseService {
@@ -58,6 +59,15 @@ public class StudentService extends BaseService {
public Student saveNew(Student student) {
student.setStudentId(idGenerator.nextLongId());
student.setRegisterTime(new Date());
+ if (student.getTotalCoin() == null) {
+ student.setTotalCoin(0);
+ }
+ if (student.getLeftCoin() == null) {
+ student.setLeftCoin(0);
+ }
+ if (student.getStatus() == null) {
+ student.setStatus(StudentStatus.NORMAL);
+ }
studentMapper.insert(student);
return student;
}
@@ -72,6 +82,7 @@ public class StudentService extends BaseService {
@Transactional(rollbackFor = Exception.class)
public boolean update(Student student, Student originalStudent) {
student.setRegisterTime(originalStudent.getRegisterTime());
+ // 这里重点提示，在执行主表数据更新之前，如果有哪些字段不支持修改操作，请用原有数据对象字段替换当前数据字段。
return studentMapper.updateByPrimaryKey(student) == 1;
}
diff --git a/orange-demo-multi-service/application/course-class/course-class.iml b/orange-demo-multi-service/application/course-class/course-class.iml
new file mode 100644
index 00000000..ee4abb7e
--- /dev/null
+++ b/orange-demo-multi-service/application/course-class/course-class.iml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/gateway/gateway.iml b/orange-demo-multi-service/application/gateway/gateway.iml
new file mode 100644
index 00000000..23eaf765
--- /dev/null
+++ b/orange-demo-multi-service/application/gateway/gateway.iml
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/GatewayApplication.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/GatewayApplication.java
index 7caf0f31..bb5e15a7 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/GatewayApplication.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/GatewayApplication.java
@@ -17,8 +17,8 @@ import org.springframework.web.bind.annotation.RestController;
/**
* 网关服务启动类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
@SpringCloudApplication
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/ApplicationConfig.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/ApplicationConfig.java
index 99bda626..8fe610e9 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/ApplicationConfig.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/ApplicationConfig.java
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.Configuration;
/**
* 网关业务配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@RefreshScope
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/CorsConfig.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/CorsConfig.java
index c9fcf8bd..7752867c 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/CorsConfig.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/CorsConfig.java
@@ -11,8 +11,8 @@ import org.springframework.web.util.pattern.PathPatternParser;
/**
* 跨域信任配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class CorsConfig {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/FilterConfig.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/FilterConfig.java
index f618a9cf..74f0abe6 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/FilterConfig.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/FilterConfig.java
@@ -10,8 +10,8 @@ import java.nio.charset.StandardCharsets;
/**
* Web通用过滤器配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class FilterConfig {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SentinelConfig.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SentinelConfig.java
index b0e999a8..62a1cbf8 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SentinelConfig.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/config/SentinelConfig.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* Spring Cloud Gateway的Sentinel流控配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class SentinelConfig {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/constant/GatewayConstant.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/constant/GatewayConstant.java
index 8266b48b..b58f4d1b 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/constant/GatewayConstant.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/constant/GatewayConstant.java
@@ -3,8 +3,8 @@ package com.orange.demo.gateway.constant;
/**
* 网关业务相关的常量对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class GatewayConstant {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java
index bf40dcd7..9a2d8a4d 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPostFilter.java
@@ -45,8 +45,8 @@ import java.util.Map;
/**
* 全局后处理过滤器。主要用于将用户的会话信息存到缓存服务器，以及在登出时清除缓存中的会话数据。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class AuthenticationPostFilter implements GlobalFilter, Ordered {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPreFilter.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPreFilter.java
index 4c91b696..4eafcc60 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPreFilter.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/AuthenticationPreFilter.java
@@ -37,8 +37,8 @@ import java.util.Map;
/**
* 全局前处理过滤器。主要用于用户操作权限验证。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class AuthenticationPreFilter implements GlobalFilter, Ordered {
@@ -60,7 +60,6 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
ServerHttpResponse response = exchange.getResponse();
String url = request.getURI().getPath();
// 登录请求，直接转发给login验证服务器。
- // NOTE: 所有不需要登录验证的url，都可以添加在下面。
if (url.equals(GatewayConstant.ADMIN_LOGIN_URL)) {
return chain.filter(exchange);
}
@@ -70,9 +69,8 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
log.warn("EXPIRED request [{}] from REMOTE-IP [{}].", url, IpUtil.getRemoteIpAddress(request));
response.setStatusCode(HttpStatus.UNAUTHORIZED);
response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- byte[] responseBody = JSON.toJSONString(
- ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
- "用户登录已过期，请重新登录！")).getBytes(StandardCharsets.UTF_8);
+ byte[] responseBody = JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
+ "用户登录已过期，请重新登录！")).getBytes(StandardCharsets.UTF_8);
return response.writeWith(Flux.just(response.bufferFactory().wrap(responseBody)));
}
// 这里判断是否需要定时刷新token
@@ -85,25 +83,22 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
String sessionId = (String) c.get(GatewayConstant.SESSION_ID_KEY_NAME);
Map userMap = jedis.hgetAll(RedisKeyUtil.makeSessionIdKeyForRedis(sessionId));
if (userMap == null) {
- log.warn("UNAUTHORIZED request [{}] from REMOTE-IP [{}] because no sessionId exists in redis."
- , url, IpUtil.getRemoteIpAddress(request));
+ log.warn("UNAUTHORIZED request [{}] from REMOTE-IP [{}] because no sessionId exists in redis.",
+ url, IpUtil.getRemoteIpAddress(request));
response.setStatusCode(HttpStatus.UNAUTHORIZED);
response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- byte[] responseBody = JSON.toJSONString(
- ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
- "用户会话已失效，请重新登录！")).getBytes(StandardCharsets.UTF_8);
+ byte[] responseBody = JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
+ "用户会话已失效，请重新登录！")).getBytes(StandardCharsets.UTF_8);
return response.writeWith(Flux.just(response.bufferFactory().wrap(responseBody)));
}
-
String userId = userMap.get("userId");
if (StringUtils.isBlank(userId)) {
- log.warn("UNAUTHORIZED request [{}] from REMOTE-IP [{}] because userId is empty in redis."
- , url, IpUtil.getRemoteIpAddress(request));
+ log.warn("UNAUTHORIZED request [{}] from REMOTE-IP [{}] because userId is empty in redis.",
+ url, IpUtil.getRemoteIpAddress(request));
response.setStatusCode(HttpStatus.UNAUTHORIZED);
response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- byte[] responseBody = JSON.toJSONString(
- ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
- "用户登录验证信息已过期，请重新登录！")).getBytes(StandardCharsets.UTF_8);
+ byte[] responseBody = JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.UNAUTHORIZED_LOGIN,
+ "用户登录验证信息已过期，请重新登录！")).getBytes(StandardCharsets.UTF_8);
return response.writeWith(Flux.just(response.bufferFactory().wrap(responseBody)));
}
boolean isAdmin = false;
@@ -119,16 +114,13 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
} catch (UnsupportedEncodingException e) {
log.error("Failed to call AuthenticationPreFilter.filter.", e);
}
- // 对于isAdmin == false的用户，继续查找权限资源信息是否存在
- if (Boolean.FALSE.equals(isAdmin)
- && !this.hasPermission(jedis, sessionId, url)) {
- log.warn("FORBIDDEN request [{}] from REMOTE-IP [{}] for USER [{} -- {}] no perm!"
- , url, IpUtil.getRemoteIpAddress(request), userId, showName);
+ if (Boolean.FALSE.equals(isAdmin) && !this.hasPermission(jedis, sessionId, url)) {
+ log.warn("FORBIDDEN request [{}] from REMOTE-IP [{}] for USER [{} -- {}] no perm!",
+ url, IpUtil.getRemoteIpAddress(request), userId, showName);
response.setStatusCode(HttpStatus.FORBIDDEN);
response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
- byte[] responseBody = JSON.toJSONString(
- ResponseResult.error(ErrorCodeEnum.NO_OPERATION_PERMISSION,
- "用户对该URL没有访问权限，请核对！")).getBytes(StandardCharsets.UTF_8);
+ byte[] responseBody = JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.NO_OPERATION_PERMISSION,
+ "用户对该URL没有访问权限，请核对！")).getBytes(StandardCharsets.UTF_8);
return response.writeWith(Flux.just(response.bufferFactory().wrap(responseBody)));
}
// 将session中关联的用户信息，添加到当前的Request中。转发后，业务服务可以根据需要自定读取。
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/RequestLogFilter.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/RequestLogFilter.java
index f0797b9f..8149f41a 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/RequestLogFilter.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/RequestLogFilter.java
@@ -16,8 +16,8 @@ import reactor.core.publisher.Mono;
* 链路日志前置过虑器。
* 为整个链路生成唯一的traceId，并存储在Request Head中。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class RequestLogFilter implements GlobalFilter, Ordered {
diff --git a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/ResponseLogFilter.java b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/ResponseLogFilter.java
index f40f7725..accf0145 100644
--- a/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/ResponseLogFilter.java
+++ b/orange-demo-multi-service/application/gateway/src/main/java/com/orange/demo/gateway/filter/ResponseLogFilter.java
@@ -15,8 +15,8 @@ import reactor.core.publisher.Mono;
* 链路日志后置过虑器。
* 将整个链路的traceId存储在Response Head中，并返回给前端，便于问题定位。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class ResponseLogFilter implements GlobalFilter, Ordered {
diff --git a/orange-demo-multi-service/application/pom.xml b/orange-demo-multi-service/application/pom.xml
index 97400ae5..ae8b0e69 100644
--- a/orange-demo-multi-service/application/pom.xml
+++ b/orange-demo-multi-service/application/pom.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- OrangeDemo
+ OrangeMultiDemo
com.orange.demo
1.0.0
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/CourseTransStatsClient.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/CourseTransStatsClient.java
index 72b73916..021f3fc0 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/CourseTransStatsClient.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/CourseTransStatsClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 课程统计服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "stats",
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionStatsClient.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionStatsClient.java
index 4684bbf0..071bfa62 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionStatsClient.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionStatsClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 学生行为统计服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "stats",
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionTransClient.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionTransClient.java
index 4f373ef8..8e29ff99 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionTransClient.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/client/StudentActionTransClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 学生行为流水服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "stats",
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/CourseTransStatsDto.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/CourseTransStatsDto.java
index cec80e95..1d39cf27 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/CourseTransStatsDto.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/CourseTransStatsDto.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* CourseTransStatsDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class CourseTransStatsDto {
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionStatsDto.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionStatsDto.java
index 93ba247f..b752fd3b 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionStatsDto.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionStatsDto.java
@@ -12,8 +12,8 @@ import java.util.Map;
/**
* StudentActionStatsDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class StudentActionStatsDto {
diff --git a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java
index 7ae3959d..43e510c9 100644
--- a/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java
+++ b/orange-demo-multi-service/application/stats/stats-interface/src/main/java/com/orange/demo/statsinterface/dto/StudentActionTransDto.java
@@ -16,7 +16,7 @@ import java.util.Map;
* StudentActionTransDto对象。
*
* @author Jerry
- * @date 2020-08-13
+ * @date 2020-09-27
*/
@Data
public class StudentActionTransDto {
diff --git a/orange-demo-multi-service/application/stats/stats-interface/stats-interface.iml b/orange-demo-multi-service/application/stats/stats-interface/stats-interface.iml
new file mode 100644
index 00000000..6cc7f266
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-interface/stats-interface.iml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/StatsApplication.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/StatsApplication.java
index f7e5bad8..ba4d7307 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/StatsApplication.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/StatsApplication.java
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
/**
* stats服务启动类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@SpringCloudApplication
@EnableFeignClients(basePackages = "com.orange.demo")
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/ApplicationConfig.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/ApplicationConfig.java
index fca42fe0..9743fc8a 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/ApplicationConfig.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/ApplicationConfig.java
@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration;
* uploadFileBaseDir: /user/xxx/fileRoot/
* defaultSomething: defaultValue
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@RefreshScope
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
index 4299ddbb..5e7213ee 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/config/DataSourceConfig.java
@@ -13,8 +13,8 @@ import javax.sql.DataSource;
/**
* 数据源配置Bean对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
@EnableTransactionManagement
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java
index 765d0b09..784eda7c 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/CourseTransStatsController.java
@@ -21,8 +21,8 @@ import java.util.*;
/**
* 课程统计操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java
index 93cca159..470a582f 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionStatsController.java
@@ -21,8 +21,8 @@ import java.util.*;
/**
* 学生行为统计操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java
index da2f750d..4a6bd5e4 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/controller/StudentActionTransController.java
@@ -23,8 +23,8 @@ import java.util.*;
/**
* 学生行为流水操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/CourseTransStatsMapper.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/CourseTransStatsMapper.java
index 6a4a8ee5..7d853aa2 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/CourseTransStatsMapper.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/CourseTransStatsMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 课程统计数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface CourseTransStatsMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/GradeMapper.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/GradeMapper.java
new file mode 100644
index 00000000..8cd0bbba
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/GradeMapper.java
@@ -0,0 +1,13 @@
+package com.orange.demo.statsservice.dao;
+
+import com.orange.demo.common.core.base.dao.BaseDaoMapper;
+import com.orange.demo.statsservice.model.Grade;
+
+/**
+ * 数据操作访问接口。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+public interface GradeMapper extends BaseDaoMapper {
+}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/SchoolInfoMapper.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/SchoolInfoMapper.java
new file mode 100644
index 00000000..24710013
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/SchoolInfoMapper.java
@@ -0,0 +1,13 @@
+package com.orange.demo.statsservice.dao;
+
+import com.orange.demo.common.core.base.dao.BaseDaoMapper;
+import com.orange.demo.statsservice.model.SchoolInfo;
+
+/**
+ * 数据操作访问接口。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+public interface SchoolInfoMapper extends BaseDaoMapper {
+}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionStatsMapper.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionStatsMapper.java
index 559d5d2d..0d27a8fd 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionStatsMapper.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionStatsMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 学生行为统计数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface StudentActionStatsMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionTransMapper.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionTransMapper.java
index 967febba..7273127b 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionTransMapper.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/StudentActionTransMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 学生行为流水数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface StudentActionTransMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/GradeMapper.xml b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/GradeMapper.xml
new file mode 100644
index 00000000..d08aaae7
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/GradeMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/SchoolInfoMapper.xml b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/SchoolInfoMapper.xml
new file mode 100644
index 00000000..50238878
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/dao/mapper/SchoolInfoMapper.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
index 06de053b..cfd62cb2 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/CourseTransStats.java
@@ -22,8 +22,8 @@ import java.util.Map;
/**
* CourseTransStats实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_course_trans_stats")
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
new file mode 100644
index 00000000..e8df4178
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/Grade.java
@@ -0,0 +1,41 @@
+package com.orange.demo.statsservice.model;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.orange.demo.common.core.annotation.DeletedFlagColumn;
+import lombok.Data;
+import javax.persistence.*;
+import javax.validation.constraints.*;
+
+/**
+ * Grade实体对象。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@Data
+@Table(name = "zz_grade")
+public class Grade {
+
+ /**
+ * 主键Id。
+ */
+ @NotNull(message = "数据验证失败，主键Id不能为空！")
+ @Id
+ @GeneratedValue(strategy = GenerationType.IDENTITY)
+ @Column(name = "grade_id")
+ private Integer gradeId;
+
+ /**
+ * 年级名称。
+ */
+ @NotBlank(message = "数据验证失败，年级名称不能为空！")
+ @Column(name = "grade_name")
+ private String gradeName;
+
+ /**
+ * 逻辑删除标记字段(1: 正常 -1: 已删除)。
+ */
+ @JSONField(serialize = false)
+ @DeletedFlagColumn
+ private Integer status;
+}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
new file mode 100644
index 00000000..26c455ce
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/SchoolInfo.java
@@ -0,0 +1,45 @@
+package com.orange.demo.statsservice.model;
+
+import lombok.Data;
+import javax.persistence.*;
+import javax.validation.constraints.*;
+
+/**
+ * SchoolInfo实体对象。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@Data
+@Table(name = "zz_school_info")
+public class SchoolInfo {
+
+ /**
+ * 学校Id。
+ */
+ @NotNull(message = "数据验证失败，学校Id不能为空！")
+ @Id
+ @Column(name = "school_id")
+ private Long schoolId;
+
+ /**
+ * 学校名称。
+ */
+ @NotBlank(message = "数据验证失败，学校名称不能为空！")
+ @Column(name = "school_name")
+ private String schoolName;
+
+ /**
+ * 所在省Id。
+ */
+ @NotNull(message = "数据验证失败，所在省Id不能为空！")
+ @Column(name = "province_id")
+ private Long provinceId;
+
+ /**
+ * 所在城市Id。
+ */
+ @NotNull(message = "数据验证失败，所在城市Id不能为空！")
+ @Column(name = "city_id")
+ private Long cityId;
+}
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
index 79366943..21b63d61 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionStats.java
@@ -19,8 +19,8 @@ import java.util.Map;
/**
* StudentActionStats实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_student_action_stats")
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
index 6257cd5d..11fd603f 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/model/StudentActionTrans.java
@@ -24,7 +24,7 @@ import java.util.Map;
* StudentActionTrans实体对象。
*
* @author Jerry
- * @date 2020-08-13
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_student_action_trans")
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/CourseTransStatsService.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/CourseTransStatsService.java
index 5bad5919..858bc9da 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/CourseTransStatsService.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/CourseTransStatsService.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 课程统计数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class CourseTransStatsService extends BaseService {
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionStatsService.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionStatsService.java
index c705ccde..f5a1c19e 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionStatsService.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionStatsService.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 学生行为统计数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class StudentActionStatsService extends BaseService {
diff --git a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionTransService.java b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionTransService.java
index cd28b76d..03b407ef 100644
--- a/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionTransService.java
+++ b/orange-demo-multi-service/application/stats/stats-service/src/main/java/com/orange/demo/statsservice/service/StudentActionTransService.java
@@ -21,8 +21,8 @@ import java.util.*;
/**
* 学生行为流水数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class StudentActionTransService extends BaseService {
@@ -68,6 +68,7 @@ public class StudentActionTransService extends BaseService
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/stats/stats.iml b/orange-demo-multi-service/application/stats/stats.iml
new file mode 100644
index 00000000..ee4abb7e
--- /dev/null
+++ b/orange-demo-multi-service/application/stats/stats.iml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/client/SysUserClient.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/client/SysUserClient.java
index f37d8553..8dfbb095 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/client/SysUserClient.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/client/SysUserClient.java
@@ -16,8 +16,8 @@ import java.util.*;
/**
* 用户管理服务远程数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@FeignClient(
name = "upms",
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysMenuType.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysMenuType.java
index bd3c813c..c326aab1 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysMenuType.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysMenuType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 菜单类型常量对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class SysMenuType {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermCodeType.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermCodeType.java
index 7cf5eafe..748b0cfb 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermCodeType.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermCodeType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 权限字类型常量对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class SysPermCodeType {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermModuleType.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermModuleType.java
index 7d46b568..4a5425c8 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermModuleType.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysPermModuleType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 权限资源模块类型常量对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class SysPermModuleType {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserStatus.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserStatus.java
index e7ff8ac2..c8da08e3 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserStatus.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserStatus.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 用户状态常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class SysUserStatus {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserType.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserType.java
index 84afcacb..28cc651a 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserType.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/constant/SysUserType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 用户类型常量字典对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class SysUserType {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysDataPermDeptDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysDataPermDeptDto.java
deleted file mode 100644
index 364bcf3d..00000000
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysDataPermDeptDto.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.orange.demo.upmsinterface.dto;
-
-import lombok.Data;
-
-/**
- * 数据权限与部门关联Dto。
- *
- * @author Orange Team
- * @date 2020-08-08
- */
-@Data
-public class SysDataPermDeptDto {
-
- /**
- * 数据权限Id。
- */
- private Long dataPermId;
-
- /**
- * 关联部门Id。
- */
- private Long menuId;
-}
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysMenuDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysMenuDto.java
index ed1d294c..ccb026bb 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysMenuDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysMenuDto.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* 菜单Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysMenuDto {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermCodeDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermCodeDto.java
index 4d6446e4..04cb35f3 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermCodeDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermCodeDto.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* 权限字Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysPermCodeDto {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermDto.java
index b51e4697..728b139b 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermDto.java
@@ -11,8 +11,8 @@ import java.util.Map;
/**
* 权限资源Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysPermDto {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermModuleDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermModuleDto.java
index 903a310e..136907ff 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermModuleDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysPermModuleDto.java
@@ -13,8 +13,8 @@ import java.util.List;
/**
* 权限资源模块Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysPermModuleDto {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysRoleDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysRoleDto.java
index c4b2943b..373e4abc 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysRoleDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysRoleDto.java
@@ -11,8 +11,8 @@ import java.util.Map;
/**
* 角色Dto。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysRoleDto {
diff --git a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysUserDto.java b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysUserDto.java
index edd1eb95..fcddab36 100644
--- a/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysUserDto.java
+++ b/orange-demo-multi-service/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysUserDto.java
@@ -1,5 +1,6 @@
package com.orange.demo.upmsinterface.dto;
+import com.orange.demo.common.core.validator.AddGroup;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.common.core.validator.ConstDictRef;
import com.orange.demo.upmsinterface.constant.SysUserType;
@@ -16,8 +17,8 @@ import java.util.List;
/**
* SysUserDto对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class SysUserDto {
@@ -37,7 +38,7 @@ public class SysUserDto {
/**
* 用户密码。
*/
- @NotBlank(message = "数据验证失败，用户密码不能为空！")
+ @NotBlank(message = "数据验证失败，用户密码不能为空！", groups = {AddGroup.class})
private String password;
/**
diff --git a/orange-demo-multi-service/application/upms/upms-interface/upms-interface.iml b/orange-demo-multi-service/application/upms/upms-interface/upms-interface.iml
new file mode 100644
index 00000000..d3469491
--- /dev/null
+++ b/orange-demo-multi-service/application/upms/upms-interface/upms-interface.iml
@@ -0,0 +1,260 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/UpmsApplication.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/UpmsApplication.java
index e2e76cae..b9c41e83 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/UpmsApplication.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/UpmsApplication.java
@@ -8,8 +8,8 @@ import org.springframework.context.annotation.ComponentScan;
/**
* upms服务启动类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@SpringCloudApplication
@EnableFeignClients(basePackages = "com.orange.demo")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/ApplicationConfig.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/ApplicationConfig.java
index 026997cb..7bdf1397 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/ApplicationConfig.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/ApplicationConfig.java
@@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration;
* 应用程序自定义的程序属性配置文件。
* NOTE: 和multiDataSource相关的配置没有包含进来，因为涉及到条件属性，所以由其相关的配置对象自己处理。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@RefreshScope
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
index 44919dd9..246427b2 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/config/DataSourceConfig.java
@@ -13,8 +13,8 @@ import javax.sql.DataSource;
/**
* 数据源配置Bean对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
@EnableTransactionManagement
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
index c73c370c..bed5f57d 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
@@ -9,6 +9,7 @@ import com.orange.demo.common.core.object.ResponseResult;
import com.orange.demo.common.core.object.TokenData;
import com.orange.demo.common.core.util.MyCommonUtil;
import com.orange.demo.common.core.util.RsaUtil;
+import com.orange.demo.common.redis.cache.SessionCacheHelper;
import com.orange.demo.upmsinterface.constant.SysUserStatus;
import com.orange.demo.upmsinterface.constant.SysUserType;
import com.orange.demo.upmsservice.config.ApplicationConfig;
@@ -27,8 +28,8 @@ import java.util.*;
/**
* 登录接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
@@ -46,6 +47,8 @@ public class LoginController {
@Autowired
private ApplicationConfig appConfig;
@Autowired
+ private SessionCacheHelper cacheHelper;
+ @Autowired
private PasswordEncoder passwordEncoder;
/**
@@ -85,6 +88,7 @@ public class LoginController {
*/
@PostMapping("/doLogout")
public ResponseResult doLogout() {
+ cacheHelper.removeAllSessionCache();
return ResponseResult.success();
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java
index ac139764..0d8e21c9 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysMenuController.java
@@ -23,8 +23,8 @@ import java.util.*;
/**
* 菜单管理接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermCodeController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermCodeController.java
index b1f18fe2..a2245d54 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermCodeController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermCodeController.java
@@ -26,8 +26,8 @@ import java.util.*;
/**
* 权限字管理接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermController.java
index f0c4d0e3..808a6ae9 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermController.java
@@ -27,8 +27,8 @@ import java.util.Map;
/**
* 权限资源管理接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java
index 0323f3ed..cb4da4de 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysPermModuleController.java
@@ -25,8 +25,8 @@ import java.util.Map;
/**
* 权限资源模块管理接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java
index a215f3d3..6e453cd5 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysRoleController.java
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
/**
* 角色管理接口控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
index ae1a2c00..46164c7d 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
@@ -12,6 +12,7 @@ import com.orange.demo.common.core.constant.ErrorCodeEnum;
import com.orange.demo.common.core.base.controller.BaseController;
import com.orange.demo.common.core.base.service.BaseService;
import com.orange.demo.common.core.annotation.MyRequestBody;
+import com.orange.demo.common.core.validator.AddGroup;
import com.orange.demo.common.core.validator.UpdateGroup;
import com.orange.demo.upmsservice.config.ApplicationConfig;
import lombok.extern.slf4j.Slf4j;
@@ -24,8 +25,8 @@ import java.util.*;
/**
* 用户管理操作控制器类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestController
@@ -53,7 +54,7 @@ public class SysUserController extends BaseController
@PostMapping("/add")
public ResponseResult add(
@MyRequestBody("sysUser") SysUserDto sysUserDto, @MyRequestBody String roleIdListString) {
- String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto);
+ String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, Default.class, AddGroup.class);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATAED_FAILED, errorMessage);
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuMapper.java
index f7694124..dace4da3 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuMapper.java
@@ -8,8 +8,8 @@ import java.util.List;
/**
* 菜单数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysMenuMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuPermCodeMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuPermCodeMapper.java
index 126e06c0..8561f7dc 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuPermCodeMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysMenuPermCodeMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysMenuPermCode;
/**
* 菜单与权限字关系数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysMenuPermCodeMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodeMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodeMapper.java
index bc7a106f..ea986749 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodeMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodeMapper.java
@@ -10,8 +10,8 @@ import java.util.Map;
/**
* 权限字数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysPermCodeMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodePermMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodePermMapper.java
index 94d03de2..d986b8ce 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodePermMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermCodePermMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysPermCodePerm;
/**
* 权限字与权限资源关系数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysPermCodePermMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermMapper.java
index bc745601..eef975d2 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermMapper.java
@@ -10,8 +10,8 @@ import java.util.Map;
/**
* 权限资源数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysPermMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermModuleMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermModuleMapper.java
index 6b156763..8f7624d5 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermModuleMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermModuleMapper.java
@@ -8,8 +8,8 @@ import java.util.List;
/**
* 权限资源模块数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysPermModuleMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermWhitelistMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermWhitelistMapper.java
index 3ef8bf83..fa6131c7 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermWhitelistMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysPermWhitelistMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysPermWhitelist;
/**
* 权限资源白名单数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysPermWhitelistMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMapper.java
index 74e9211e..f5f5cf02 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMapper.java
@@ -9,8 +9,8 @@ import java.util.List;
/**
* 角色数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysRoleMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMenuMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMenuMapper.java
index 8003650f..cdecf6b5 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMenuMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysRoleMenuMapper.java
@@ -6,8 +6,8 @@ import com.orange.demo.upmsservice.model.SysRoleMenu;
/**
* 角色与菜单操作关联关系数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysRoleMenuMapper extends BaseDaoMapper {
}
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserMapper.java
index 9ef2589c..c4a55436 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserMapper.java
@@ -9,8 +9,8 @@ import java.util.*;
/**
* 用户管理数据操作访问接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysUserMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserRoleMapper.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserRoleMapper.java
index ca000f2f..a17a5e31 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserRoleMapper.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/SysUserRoleMapper.java
@@ -8,8 +8,8 @@ import java.util.List;
/**
* 用户与角色关联关系数据访问操作接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface SysUserRoleMapper extends BaseDaoMapper {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
index b9c6f8f8..5f9ec8c7 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenu.java
@@ -20,8 +20,8 @@ import java.util.List;
/**
* 菜单实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_menu")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
index 36e5b253..926e5ce0 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysMenuPermCode.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 菜单与权限字关联实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_menu_perm_code")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
index 25ab4f91..92515760 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPerm.java
@@ -13,8 +13,8 @@ import java.util.Map;
/**
* 权限资源实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_perm")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
index 35b63ebf..d5165b6c 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCode.java
@@ -20,8 +20,8 @@ import java.util.List;
/**
* 权限字实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_perm_code")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
index 7c7c6d7b..c1d3f360 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermCodePerm.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 权限字与权限资源关联实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_perm_code_perm")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
index c0fed365..5c4ccd36 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermModule.java
@@ -14,8 +14,8 @@ import java.util.List;
/**
* 权限模块实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_perm_module")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
index a5fac52c..3a0cdf19 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysPermWhitelist.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 白名单实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_perm_whitelist")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
index db6e9d41..65c4e439 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRole.java
@@ -18,8 +18,8 @@ import java.util.List;
/**
* 角色实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_role")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
index 22356795..b4e813d0 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysRoleMenu.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 角色菜单实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_role_menu")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
index 1c3b7745..d23ac169 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
@@ -22,8 +22,8 @@ import java.util.List;
/**
* SysUser实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_user")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
index cf5e9d5f..96cca92b 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUserRole.java
@@ -7,8 +7,8 @@ import javax.persistence.*;
/**
* 用户角色实体对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Table(name = "zz_sys_user_role")
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysMenuService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysMenuService.java
index 15969234..33857360 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysMenuService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysMenuService.java
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
/**
* 菜单数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysMenuService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermCodeService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermCodeService.java
index b3301921..a09d9871 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermCodeService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermCodeService.java
@@ -24,8 +24,8 @@ import java.util.stream.Collectors;
/**
* 权限字数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysPermCodeService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermModuleService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermModuleService.java
index d1135d24..a8e0089d 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermModuleService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermModuleService.java
@@ -18,8 +18,8 @@ import java.util.List;
/**
* 权限资源模块数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysPermModuleService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermService.java
index acb6c308..3ef2abd1 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermService.java
@@ -26,8 +26,8 @@ import java.util.Map;
/**
* 权限资源数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysPermService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermWhitelistService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermWhitelistService.java
index 2d3a477e..58817dec 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermWhitelistService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysPermWhitelistService.java
@@ -10,8 +10,8 @@ import org.springframework.stereotype.Service;
/**
* 白名单数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysPermWhitelistService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysRoleService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysRoleService.java
index 0ad3024a..0383e20e 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysRoleService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysRoleService.java
@@ -26,8 +26,8 @@ import java.util.stream.Collectors;
/**
* 角色数据服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysRoleService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
index 869696b9..909ee61e 100644
--- a/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
+++ b/orange-demo-multi-service/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
@@ -25,8 +25,8 @@ import java.util.stream.Collectors;
/**
* 用户管理数据操作服务类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Service
public class SysUserService extends BaseService {
diff --git a/orange-demo-multi-service/application/upms/upms-service/upms-service.iml b/orange-demo-multi-service/application/upms/upms-service/upms-service.iml
new file mode 100644
index 00000000..77076094
--- /dev/null
+++ b/orange-demo-multi-service/application/upms/upms-service/upms-service.iml
@@ -0,0 +1,277 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/application/upms/upms.iml b/orange-demo-multi-service/application/upms/upms.iml
new file mode 100644
index 00000000..ee4abb7e
--- /dev/null
+++ b/orange-demo-multi-service/application/upms/upms.iml
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/common/common-core/common-core.iml b/orange-demo-multi-service/common/common-core/common-core.iml
new file mode 100644
index 00000000..2702bf77
--- /dev/null
+++ b/orange-demo-multi-service/common/common-core/common-core.iml
@@ -0,0 +1,216 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/common/common-core/pom.xml b/orange-demo-multi-service/common/common-core/pom.xml
index 1c8a4353..09e0231f 100644
--- a/orange-demo-multi-service/common/common-core/pom.xml
+++ b/orange-demo-multi-service/common/common-core/pom.xml
@@ -106,15 +106,5 @@
pagehelper-spring-boot-starter
${pagehelper.version}
-
- redis.clients
- jedis
- ${jedis.version}
-
-
- org.redisson
- redisson
- ${redisson.version}
-
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java
index 36530b07..f8f40279 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java
@@ -11,8 +11,8 @@ import java.util.Date;
/**
* Controller的环绕拦截类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@ControllerAdvice
public class MyControllerAdvice {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java
index ee69acd3..24e1f9f7 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java
@@ -21,8 +21,8 @@ import java.util.concurrent.TimeoutException;
* 业务层的异常处理类，这里只是给出最通用的Exception的捕捉，今后可以根据业务需要，
* 用不同的函数，处理不同类型的异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@RestControllerAdvice("com.orange.demo")
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
index e275a652..d9e9f414 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 主要用于标记逻辑删除字段。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java
index a20d30d1..06d172db 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 主要用于标记更新字段。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java
index 4b4240ad..78201f29 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 主要用于标记Service所依赖的数据源类型。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java
index 1d393400..6b309fb9 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java
@@ -8,8 +8,8 @@ import java.lang.annotation.Target;
/**
* 标记Controller中的方法参数，参数解析器会根据该注解将请求中的JSON数据，映射到参数中的绑定字段。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java
index 2a3ad5f6..f876b79f 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 主要用于标记无需Token验证的接口
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java
index 3f98cbf2..e2cf79a6 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 标识Model和常量字典之间的关联关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java
index 90a49007..fc479aca 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java
@@ -7,8 +7,8 @@ import java.lang.annotation.*;
/**
* 标识Model之间的字典关联关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java
index 4b7015ac..0f76030b 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java
@@ -5,8 +5,8 @@ import java.lang.annotation.*;
/**
* 标注多对多的Model关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java
index 29fa8310..ff45a96e 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java
@@ -7,8 +7,8 @@ import java.lang.annotation.*;
/**
* 主要用于多对多的Model关系。标注通过从表关联字段或者关联表关联字段计算主表聚合计算字段的规则。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java
index eba92823..13cac580 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java
@@ -7,8 +7,8 @@ import java.lang.annotation.*;
/**
* 主要用于一对多的Model关系。标注通过从表关联字段计算主表聚合计算字段的规则。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java
index 10f4aecb..41c89815 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java
@@ -7,8 +7,8 @@ import java.lang.annotation.*;
/**
* 标识Model之间的一对一关联关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java
index 2bbe631d..a3b8d0c8 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java
@@ -26,8 +26,8 @@ import java.util.List;
/**
* 记录接口的链路traceId、请求参数、应答数据、错误信息和调用时长。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Aspect
@Component
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/client/BaseClient.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/client/BaseClient.java
index 270f9a8a..47543b2f 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/client/BaseClient.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/client/BaseClient.java
@@ -13,8 +13,8 @@ import java.util.Set;
*
* @param 主DomainDto域数据对象类型。
* @param 主键类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface BaseClient {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
index 046c7639..64023a17 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/controller/BaseController.java
@@ -32,8 +32,8 @@ import java.util.stream.Collectors;
* @param 主Model实体对象类型。
* @param 主DomainDto域对象类型。
* @param 主键类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public abstract class BaseController {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
index 059c4636..3a8dbac7 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
@@ -13,8 +13,8 @@ import java.util.Map;
* 数据访问对象的基类。
*
* @param 主Model实体对象。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@RegisterMapper
public interface BaseDaoMapper extends Mapper, InsertListMapper {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java
index 36f4362b..be5913ab 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java
@@ -11,8 +11,8 @@ import java.util.stream.Collectors;
*
* @param Domain域对象类型。
* @param Model实体对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface BaseModelMapper {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java
index 44bf63c3..9bbbee42 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java
@@ -7,8 +7,8 @@ import java.util.List;
* 由于没有实际的数据转换，因此同时保证了代码统一和执行效率。
*
* @param 数据类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class DummyModelMapper implements BaseModelMapper {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
index 0c4d9893..678a7a00 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
@@ -16,8 +16,8 @@ import java.util.List;
* @param Model实体对象的类型。
* @param Model对应的DomainDto域对象类型。
* @param Model对象主键的类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public abstract class BaseDictService extends BaseService {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
index e6c318e1..6c464965 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
@@ -39,8 +39,8 @@ import static java.util.stream.Collectors.*;
* @param Model对象的类型。
* @param Model对应的Dto对象类型。
* @param Model对象主键的类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public abstract class BaseService {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java
deleted file mode 100644
index b1c12e62..00000000
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.orange.demo.common.core.cache;
-
-import com.github.benmanes.caffeine.cache.Caffeine;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.caffeine.CaffeineCache;
-import org.springframework.cache.support.SimpleCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 使用Caffeine作为本地缓存库。
- *
- * @author Orange Team
- * @date 2020-08-08
- */
-@Configuration
-@EnableCaching
-public class CacheConfig {
-
- private static final int DEFAULT_MAXSIZE = 10000;
- private static final int DEFAULT_TTL = 3600;
-
- /**
- * 定义cache名称、超时时长秒、最大个数。
- * 每个cache缺省3600秒过期，最大个数1000。
- */
- public enum CacheEnum {
-
- /**
- * 缺省全局缓存(时间是24小时)。
- */
- GLOBAL_CACHE(86400, 20000);
-
- CacheEnum() {
- }
-
- CacheEnum(int ttl, int maxSize) {
- this.ttl = ttl;
- this.maxSize = maxSize;
- }
-
- /**
- * 缓存的最大数量。
- */
- private int maxSize = DEFAULT_MAXSIZE;
- /**
- * 缓存的时长(单位：秒)
- */
- private int ttl = DEFAULT_TTL;
-
- public int getMaxSize() {
- return maxSize;
- }
-
- public int getTtl() {
- return ttl;
- }
- }
-
- /**
- * 个性化配置缓存。
- */
- @Bean
- public CacheManager cacheManager() {
- SimpleCacheManager manager = new SimpleCacheManager();
- //把各个cache注册到cacheManager中，CaffeineCache实现了org.springframework.cache.Cache接口
- ArrayList caches = new ArrayList<>();
- for (CacheEnum c : CacheEnum.values()) {
- caches.add(new CaffeineCache(c.name(),
- Caffeine.newBuilder().recordStats()
- .expireAfterAccess(c.getTtl(), TimeUnit.SECONDS)
- .maximumSize(c.getMaxSize())
- .build())
- );
- }
- manager.setCaches(caches);
- return manager;
- }
-}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java
index 5c0922c8..04bc5158 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java
@@ -8,8 +8,8 @@ import java.util.Set;
*
* @param 字典表主键类型。
* @param 字典表对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface DictionaryCache {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java
index 6b4b11ed..95d3481b 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java
@@ -8,8 +8,8 @@ import java.util.function.Function;
*
* @param 字典表主键类型。
* @param 字典表对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MapDictionaryCache implements DictionaryCache {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java
index 3fb6a89a..b31637cd 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java
@@ -11,8 +11,8 @@ import java.util.function.Function;
*
* @param 字典表主键类型。
* @param 字典表对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MapTreeDictionaryCache extends MapDictionaryCache {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java
index 533d139b..2555c389 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java
@@ -20,8 +20,8 @@ import java.util.List;
/**
* 所有的项目拦截器、参数解析器、消息对象转换器都在这里集中配置。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class CommonWebMvcConfig implements WebMvcConfigurer {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java
index 9ac95986..536ac615 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java
@@ -7,8 +7,8 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 目前用于用户密码加密，UAA接入应用客户端的client_secret加密。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class EncryptConfig {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java
index eeba4757..898b8d95 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/FeignConfig.java
@@ -10,8 +10,8 @@ import org.springframework.context.annotation.Configuration;
/**
* FeignClient的配置对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class FeignConfig implements RequestInterceptor {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java
index 33eb575f..816fa754 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java
@@ -23,8 +23,8 @@ import java.util.List;
/**
* RestTemplate连接池配置对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class RestTemplateConfig {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java
index 4ae55ce5..16c67e58 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java
@@ -9,8 +9,8 @@ import org.springframework.context.annotation.Configuration;
/**
* tomcat配置对象。当前配置禁用了PUT和DELETE方法，防止渗透攻击。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
public class TomcatConfig {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationKind.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationKind.java
index 11bd6d27..d1bf8ea1 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationKind.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationKind.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.constant;
/**
* 在跨服务调用时，需要传递的聚合分类常量对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class AggregationKind {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java
index 043a0e02..ba971fb7 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java
@@ -6,8 +6,8 @@ import java.util.Map;
/**
* 聚合计算的常量类型对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class AggregationType {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java
index 35957ed4..7cd01fbb 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.constant;
/**
* 应用程序的常量声明对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class ApplicationConstant {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java
index c19c4313..c5386cdd 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.constant;
/**
* 返回应答中的错误代码和错误信息。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public enum ErrorCodeEnum {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java
index 8a1b3994..7980dfad 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.constant;
/**
* 数据记录逻辑删除标记常量。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class GlobalDeletedFlag {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java
index 27a8f171..be9cd66b 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.exception;
/**
* 数据验证失败的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class DataValidationException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java
index 255620ed..d26ab804 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java
@@ -6,8 +6,8 @@ import lombok.EqualsAndHashCode;
/**
* 无效的类对象字段的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java
index e082bb09..6cebffe6 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java
@@ -6,8 +6,8 @@ import lombok.EqualsAndHashCode;
/**
* 无效的实体对象字段的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java
index f85e62f8..8f6ac6e9 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java
@@ -6,8 +6,8 @@ import lombok.EqualsAndHashCode;
/**
* 无效的实体对象的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java
index c9a5e555..6344c365 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java
@@ -4,8 +4,8 @@ package com.orange.demo.common.core.exception;
* 自定义的运行时异常，在需要抛出运行时异常时，可使用该异常。
* NOTE：主要是为了避免SonarQube进行代码质量扫描时，给出警告。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MyRuntimeException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java
index 6f560f3c..30ef2672 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.exception;
/**
* 没有数据被修改的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class NoDataAffectException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java
index a6654085..7f5d13fd 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.exception;
/**
* 没有数据访问权限的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class NoDataPermException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java
index cd7a69e3..974d0759 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.exception;
/**
* Redis缓存访问失败。比如：获取分布式数据锁超时、等待线程中断等。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class RedisCacheAccessException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RemoteDataBuildException.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RemoteDataBuildException.java
index 2925266a..f05d11b3 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RemoteDataBuildException.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RemoteDataBuildException.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.exception;
/**
* 关联远程服务数据失败的自定义异常。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class RemoteDataBuildException extends RuntimeException {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
index 2dd71aa9..e782decb 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
@@ -28,8 +28,8 @@ import java.util.*;
* 1、单个字符串等包装类型都要写一个对象才可以用@RequestBody接收；
* 2、多个对象需要封装到一个对象里才可以用@RequestBody接收。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java
index 2652efd5..8a50eb07 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java
@@ -10,8 +10,8 @@ import java.util.Map;
/**
* 应用程序启动后的事件监听对象。主要负责加载Model之间的字典关联和一对一关联所对应的Service结构关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Component
public class LoadCachedDataListener implements ApplicationListener {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java
index 1787e387..ed75353b 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java
@@ -10,8 +10,8 @@ import java.util.Map;
/**
* 应用程序启动后的事件监听对象。主要负责加载Model之间的字典关联和一对一关联所对应的Service结构关系。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Component
public class LoadServiceRelationListener implements ApplicationListener {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java
index f622969b..38d353fe 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java
@@ -7,8 +7,8 @@ import lombok.Data;
* 接口数据验证结果对象。主要是Service类使用。
* 同时为了提升效率，减少查询次数，可以根据具体的需求，将部分验证关联对象存入data字段，以供Controller使用。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class CallResult {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java
index 576ee1f8..c88d5e36 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/DummyClass.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.object;
/**
* 哑元对象，主要用于注解中的缺省对象占位符。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public final class DummyClass {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyAggregationParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyAggregationParam.java
index 019aabd6..f26b130a 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyAggregationParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyAggregationParam.java
@@ -9,8 +9,8 @@ import java.util.Set;
/**
* 分组聚合查询参数。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class MyAggregationParam {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java
index d59686eb..dda2b6d3 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java
@@ -6,8 +6,8 @@ import lombok.Data;
/**
* Mybatis Mapper.xml中所需的分组条件对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@AllArgsConstructor
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java
index 5a4e32f0..d856f435 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java
@@ -19,8 +19,8 @@ import java.util.List;
/**
* 查询分组参数请求对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@EqualsAndHashCode(callSuper = true)
@Slf4j
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java
index 46477038..024c6f1a 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java
@@ -17,8 +17,8 @@ import java.util.*;
/**
* Controller参数中的排序请求对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@EqualsAndHashCode(callSuper = true)
@Slf4j
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java
index f06b4d4c..93b1c0c8 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java
@@ -5,8 +5,8 @@ import lombok.Getter;
/**
* Controller参数中的分页请求对象
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Getter
public class MyPageParam {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyQueryParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyQueryParam.java
index a222e3d7..f951757b 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyQueryParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyQueryParam.java
@@ -8,8 +8,8 @@ import java.util.*;
/**
* 查询参数。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class MyQueryParam {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java
index 9a111876..7849919c 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java
@@ -7,8 +7,8 @@ import lombok.Data;
* 实体对象数据组装参数构建器。
* BaseService中的实体对象数据组装函数，会根据该参数对象进行数据组装。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@Builder
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java
index f391b8aa..df024a7e 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java
@@ -15,8 +15,8 @@ import java.util.List;
/**
* Where中的条件语句。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
@Data
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java
index e9929158..edee99a9 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java
@@ -6,8 +6,8 @@ import lombok.Data;
/**
* 接口返回对象
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class ResponseResult {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
index bb7c56f6..50e32100 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
@@ -15,8 +15,8 @@ import java.nio.charset.StandardCharsets;
/**
* 基于Jwt，用于前后端传递的令牌对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@ToString
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java
index 25401ef0..eeb6a53c 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.object;
/**
* 二元组对象。主要用于可以一次返回多个结果的场景，同时还能避免强制转换。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class Tuple2 {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java
index 9f79b6d4..299dc535 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java
@@ -10,8 +10,8 @@ import java.lang.reflect.Field;
/**
* 获取JDK动态代理/CGLIB代理对象代理的目标对象的工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class AopTargetUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java
index 99ccbfb5..e6d3bb26 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java
@@ -9,8 +9,8 @@ import org.springframework.stereotype.Component;
/**
* Spring 系统启动应用感知对象，主要用于获取Spring Bean的上下文对象，后续的代码中可以直接查找系统中加载的Bean对象。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Component
public class ApplicationContextHolder implements ApplicationContextAware {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java
index e3f855da..dda2829f 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java
@@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletResponse;
/**
* 获取Servlet HttpRequest和HttpResponse的工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class ContextUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java
index 8be7a944..73a251c0 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java
@@ -22,8 +22,8 @@ import java.util.*;
/**
* 导出工具类，目前支持xlsx和csv两种类型。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class ExportUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java
index 6b0565db..4362c940 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java
@@ -21,8 +21,8 @@ import java.util.stream.Collectors;
/**
* 导入工具类，目前支持xlsx和csv两种类型。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class ImportUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java
index 233db6c5..64281c93 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java
@@ -16,8 +16,8 @@ import java.util.List;
/**
* Ip工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class IpUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java
index 055dce3e..f673c483 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java
@@ -11,8 +11,8 @@ import java.util.Map;
/**
* 基于JWT的Token生成工具类
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class JwtUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java
index a9fda17a..02e5084a 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java
@@ -5,8 +5,8 @@ package com.orange.demo.common.core.util;
* 主要目标是，尽量保证日志输出的统一性，同时也可以有效减少与日志信息相关的常量字符串，
* 提高代码的规范度和可维护性。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class LogMessageUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java
index 230808ab..4f300a19 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java
@@ -15,8 +15,8 @@ import java.util.UUID;
/**
* 脚手架中常用的基本工具方法集合，一般而言工程内部使用的方法。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MyCommonUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java
index 0b893810..3f2d45fd 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java
@@ -15,8 +15,8 @@ import static org.joda.time.PeriodType.days;
/**
* 日期工具类，主要封装了部分joda-time中的方法，让很多代码一行完成，同时统一了日期到字符串的pattern格式。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MyDateUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java
index 252cc9ec..44a4a112 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java
@@ -2,6 +2,7 @@ package com.orange.demo.common.core.util;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ReflectUtil;
+import com.orange.demo.common.core.annotation.RelationConstDict;
import com.orange.demo.common.core.annotation.RelationDict;
import com.orange.demo.common.core.annotation.RelationOneToOne;
import com.orange.demo.common.core.exception.MyRuntimeException;
@@ -24,8 +25,8 @@ import java.util.stream.Collectors;
/**
* 负责Model数据操作、类型转换和关系关联等行为的工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class MyModelUtil {
@@ -184,13 +185,49 @@ public class MyModelUtil {
}
/**
- * 在当前Service的主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象thatModel中的数据，
+ * 主Model类型中，遍历所有包含RelationConstDict注解的字段，并将关联的静态字典中的数据，
+ * 填充到thisModel对象的被注解字段中。
+ *
+ * @param thisClazz 主对象的Class对象。
+ * @param thisModel 主对象。
+ * @param 主表对象类型。
+ */
+ @SuppressWarnings("unchecked")
+ public static void makeConstDictRelation(Class thisClazz, T thisModel) {
+ if (thisModel == null) {
+ return;
+ }
+ Field[] fields = ReflectUtil.getFields(thisClazz);
+ for (Field field : fields) {
+ // 这里不做任何空值判断，从而让配置错误在调试期间即可抛出
+ Field thisTargetField = ReflectUtil.getField(thisClazz, field.getName());
+ RelationConstDict r = thisTargetField.getAnnotation(RelationConstDict.class);
+ if (r == null) {
+ continue;
+ }
+ Field dictMapField = ReflectUtil.getField(r.constantDictClass(), "DICT_MAP");
+ Map dictMap = (Map) ReflectUtil.getFieldValue(thisClazz, dictMapField);
+ Object id = ReflectUtil.getFieldValue(thisModel, r.masterIdField());
+ if (id != null) {
+ String name = dictMap.get(id);
+ if (name != null) {
+ Map m = new HashMap<>(2);
+ m.put("id", id);
+ m.put("name", name);
+ ReflectUtil.setFieldValue(thisModel, thisTargetField, m);
+ }
+ }
+ }
+ }
+
+ /**
+ * 在主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象thatModel中的数据，
* 关联到thisModel对象的thisRelationField字段中。
*
* @param thisClazz 主对象的Class对象。
* @param thisModel 主对象。
* @param thatModel 字典关联对象。
- * @param thisRelationField 关联对象中保存被关联对象的字段名称。
+ * @param thisRelationField 主表对象中保存被关联对象的字段名称。
* @param 主表对象类型。
* @param 从表对象类型。
*/
@@ -212,13 +249,13 @@ public class MyModelUtil {
}
/**
- * 在当前Service的主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象集合thatModelList中的数据，
+ * 在主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象集合thatModelList中的数据，
* 逐个关联到thisModelList每一个元素的thisRelationField字段中。
*
* @param thisClazz 主对象的Class对象。
* @param thisModelList 主对象列表。
* @param thatModelList 字典关联对象列表集合。
- * @param thisRelationField 关联对象中保存被关联对象的字段名称。
+ * @param thisRelationField 主表对象中保存被关联对象的字段名称。
* @param 主表对象类型。
* @param 从表对象类型。
*/
@@ -255,14 +292,14 @@ public class MyModelUtil {
}
/**
- * 在当前Service的主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象集合thatModelMap中的数据，
+ * 在主Model类型中，根据thisRelationField字段的RelationDict注解参数，将被关联对象集合thatModelMap中的数据，
* 逐个关联到thisModelList每一个元素的thisRelationField字段中。
* 该函数之所以使用Map，主要出于性能优化考虑，在连续使用thatModelMap进行关联时，有效的避免了从多次从List转换到Map的过程。
*
* @param thisClazz 主对象的Class对象。
* @param thisModelList 主对象列表。
* @param thatMadelMap 字典关联对象映射集合。
- * @param thisRelationField 关联对象中保存被关联对象的字段名称。
+ * @param thisRelationField 主表对象中保存被关联对象的字段名称。
* @param 主表对象类型。
* @param 从表对象类型。
*/
@@ -293,13 +330,13 @@ public class MyModelUtil {
}
/**
- * 在当前Service的主Model类型中，根据thisRelationField字段的RelationOneToOne注解参数，将被关联对象列表thatModelList中的数据，
+ * 在主Model类型中，根据thisRelationField字段的RelationOneToOne注解参数，将被关联对象列表thatModelList中的数据，
* 逐个关联到thisModelList每一个元素的thisRelationField字段中。
*
* @param thisClazz 主对象的Class对象。
* @param thisModelList 主对象列表。
* @param thatModelList 一对一关联对象列表。
- * @param thisRelationField 关联对象中保存被关联对象的字段名称。
+ * @param thisRelationField 主表对象中保存被关联对象的字段名称。
* @param 主表对象类型。
* @param 从表对象类型。
*/
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java
index ceb01dca..57a1a052 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java
@@ -12,8 +12,8 @@ import java.util.List;
/**
* 生成带有分页信息的数据列表
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class MyPageUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java
index 28662964..93979fdf 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RedisKeyUtil.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.util;
/**
* Redis 键生成工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class RedisKeyUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java
index 3169b3fe..e0ff6cc3 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java
@@ -14,8 +14,8 @@ import java.util.Map;
/**
* Java RSA 加密工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class RsaUtil {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java
index 380000b0..91da4a7c 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java
@@ -14,8 +14,8 @@ import java.util.function.Function;
* @param 对象类型。
* @param 节点之间关联键的类型。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
public class TreeNode {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/UpDownloadUtil.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/UpDownloadUtil.java
index a92515ef..ce2259ed 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/UpDownloadUtil.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/util/UpDownloadUtil.java
@@ -23,8 +23,8 @@ import java.util.Objects;
/**
* 上传或下载附件文件的工具类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class UpDownloadUtil {
@@ -87,9 +87,10 @@ public class UpDownloadUtil {
* @param uploadFile Http请求中上传的文件对象。
* @param asImage 是否为图片对象。图片是无需权限验证的，因此和附件存放在不同的子目录。
* @param response Http 应答对象。
+ * @return 存储在本地上传文件名。
* @throws IOException 文件操作错误。
*/
- public static void doUpload(
+ public static String doUpload(
String rootBaseDir,
String serviceContextPath,
String modelName,
@@ -102,7 +103,7 @@ public class UpDownloadUtil {
if (Objects.isNull(uploadFile) || uploadFile.isEmpty() || MyCommonUtil.isBlankOrNull(fieldName)) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
out.print(JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FILE_ARGUMENT)));
- return;
+ return null;
}
StringBuilder uploadPathBuilder = new StringBuilder(128);
uploadPathBuilder.append(rootBaseDir).append("/");
@@ -137,11 +138,12 @@ public class UpDownloadUtil {
log.error("Failed to write uploaded file [" + uploadFile.getOriginalFilename() + " ].", e);
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
out.print(JSON.toJSONString(ResponseResult.error(ErrorCodeEnum.INVALID_UPLOAD_FILE_IOERROR)));
- return;
+ return null;
}
out.print(JSON.toJSONString(ResponseResult.success(fileInfo)));
out.flush();
out.close();
+ return fileInfo.filename;
}
/**
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java
index 4df852aa..483779dc 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.validator;
/**
* 数据增加的验证分组。通常用于数据新增场景。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface AddGroup {
}
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java
index a71c6a15..947fe375 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java
@@ -10,8 +10,8 @@ import java.lang.annotation.Target;
/**
* 定义在Model对象中，标注字段值引用自指定的常量字典，和ConstDictRefValidator对象配合完成数据验证。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java
index b5c230ed..3e71c39e 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java
@@ -9,8 +9,8 @@ import java.lang.reflect.Method;
/**
* 数据字段自定义验证，用于验证Model中字符串字段的最大长度和最小长度。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class ConstDictValidator implements ConstraintValidator {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java
index 131126ea..adf4fb75 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java
@@ -10,8 +10,8 @@ import java.lang.annotation.Target;
/**
* 定义在Model或Dto对象中，UTF-8编码的字符串字段长度的上限和下限，和TextLengthValidator对象配合完成数据验证。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java
index 057021f7..8f58cadf 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java
@@ -8,8 +8,8 @@ import javax.validation.ConstraintValidatorContext;
/**
* 数据字段自定义验证，用于验证Model中UTF-8编码的字符串字段的最大长度和最小长度。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class TextLengthValidator implements ConstraintValidator {
diff --git a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java
index d720e240..fec23a93 100644
--- a/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java
+++ b/orange-demo-multi-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.core.validator;
/**
* 数据修改的验证分组。通常用于数据更新的场景。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface UpdateGroup {
diff --git a/orange-demo-multi-service/common/common-redis/common-redis.iml b/orange-demo-multi-service/common/common-redis/common-redis.iml
new file mode 100644
index 00000000..9b470645
--- /dev/null
+++ b/orange-demo-multi-service/common/common-redis/common-redis.iml
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java
index f38100ed..6be4de0d 100644
--- a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisDictionaryCache.java
@@ -20,8 +20,8 @@ import java.util.stream.Collectors;
*
* @param 字典表主键类型。
* @param 字典表对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class RedisDictionaryCache implements DictionaryCache {
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java
index 9d887f15..e953eaa3 100644
--- a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedisTreeDictionaryCache.java
@@ -20,8 +20,8 @@ import java.util.stream.Collectors;
*
* @param 字典表主键类型。
* @param 字典表对象类型。
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Slf4j
public class RedisTreeDictionaryCache extends RedisDictionaryCache {
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java
new file mode 100644
index 00000000..1a0c200f
--- /dev/null
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/RedissonCacheConfig.java
@@ -0,0 +1,63 @@
+package com.orange.demo.common.redis.cache;
+
+import com.google.common.collect.Maps;
+import org.redisson.api.RedissonClient;
+import org.redisson.spring.cache.CacheConfig;
+import org.redisson.spring.cache.RedissonSpringCacheManager;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+
+/**
+ * 使用Redisson作为Redis的分布式缓存库。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@Configuration
+@EnableCaching
+public class RedissonCacheConfig {
+
+ private static final int DEFAULT_TTL = 3600000;
+
+ /**
+ * 定义cache名称、超时时长(毫秒)。
+ */
+ public enum CacheEnum {
+ /**
+ * session下上传文件名的缓存(时间是24小时)。
+ */
+ UPLOAD_FILENAME_CACHE(86400000);
+
+ /**
+ * 缓存的时长(单位：毫秒)
+ */
+ private int ttl = DEFAULT_TTL;
+
+ CacheEnum() {
+ }
+
+ CacheEnum(int ttl) {
+ this.ttl = ttl;
+ }
+
+ public int getTtl() {
+ return ttl;
+ }
+ }
+
+ /**
+ * 初始化缓存配置。
+ */
+ @Bean
+ CacheManager cacheManager(RedissonClient redissonClient) {
+ Map config = Maps.newHashMap();
+ for (CacheEnum c : CacheEnum.values()) {
+ config.put(c.name(), new CacheConfig(c.getTtl(), 0));
+ }
+ return new RedissonSpringCacheManager(redissonClient, config);
+ }
+}
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java
new file mode 100644
index 00000000..063c87fb
--- /dev/null
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/cache/SessionCacheHelper.java
@@ -0,0 +1,72 @@
+package com.orange.demo.common.redis.cache;
+
+import com.orange.demo.common.core.object.TokenData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Session数据缓存辅助类。
+ *
+ * @author Jerry
+ * @date 2020-09-27
+ */
+@SuppressWarnings("unchecked")
+@Component
+public class SessionCacheHelper {
+
+ @Autowired
+ private CacheManager cacheManager;
+
+ /**
+ * 缓存当前session内，上传过的文件名。
+ *
+ * @param filename 通常是本地存储的文件名，而不是上传时的原始文件名。
+ */
+ public void putSessionUploadFile(String filename) {
+ if (filename != null) {
+ Set sessionUploadFileSet = null;
+ Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.UPLOAD_FILENAME_CACHE.name());
+ Cache.ValueWrapper valueWrapper = cache.get(TokenData.takeFromRequest().getSessionId());
+ if (valueWrapper != null) {
+ sessionUploadFileSet = (Set) valueWrapper.get();
+ }
+ if (sessionUploadFileSet == null) {
+ sessionUploadFileSet = new HashSet<>();
+ }
+ sessionUploadFileSet.add(filename);
+ cache.put(TokenData.takeFromRequest().getSessionId(), sessionUploadFileSet);
+ }
+ }
+
+ /**
+ * 判断参数中的文件名，是否有当前session上传。
+ *
+ * @param filename 通常是本地存储的文件名，而不是上传时的原始文件名。
+ * @return true表示该文件是由当前session上传并存储在本地的，否则false。
+ */
+ public boolean existSessionUploadFile(String filename) {
+ if (filename == null) {
+ return false;
+ }
+ Cache cache = cacheManager.getCache(RedissonCacheConfig.CacheEnum.UPLOAD_FILENAME_CACHE.name());
+ Cache.ValueWrapper valueWrapper = cache.get(TokenData.takeFromRequest().getSessionId());
+ if (valueWrapper == null) {
+ return false;
+ }
+ return ((Set) valueWrapper.get()).contains(filename);
+ }
+
+ /**
+ * 清除当前session的所有缓存数据。
+ */
+ public void removeAllSessionCache() {
+ for (RedissonCacheConfig.CacheEnum c : RedissonCacheConfig.CacheEnum.values()) {
+ cacheManager.getCache(c.name()).clear();
+ }
+ }
+}
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java
index 30b6f305..46ec7778 100644
--- a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/JedisConfig.java
@@ -10,8 +10,8 @@ import redis.clients.jedis.JedisPoolConfig;
/**
* Redis配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
@ConditionalOnProperty(name = "redis.jedis.enabled", havingValue = "true")
diff --git a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java
index 440db9dc..a34971a5 100644
--- a/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java
+++ b/orange-demo-multi-service/common/common-redis/src/main/java/com/orange/demo/common/redis/config/RedissonConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
* Redisson配置类。和Jedis一样都是Redis客户端，但是Redisson提供了更多的数据结构抽象。
* 这里我们只是使用了Redisson的分布式锁，以及map等数据结构作为字典缓存使用。更多用法请参考其文档。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Configuration
@ConditionalOnProperty(name = "redis.redisson.enabled", havingValue = "true")
diff --git a/orange-demo-multi-service/common/common-sequence/common-sequence.iml b/orange-demo-multi-service/common/common-sequence/common-sequence.iml
new file mode 100644
index 00000000..8ad198df
--- /dev/null
+++ b/orange-demo-multi-service/common/common-sequence/common-sequence.iml
@@ -0,0 +1,214 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfigure.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfigure.java
index 0ba4f0d7..55c573f5 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfigure.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorAutoConfigure.java
@@ -5,8 +5,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
/**
* common-sequence模块的自动配置引导类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@EnableConfigurationProperties({IdGeneratorProperties.class})
public class IdGeneratorAutoConfigure {
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java
index a163e4c1..8327d13f 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/config/IdGeneratorProperties.java
@@ -6,8 +6,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
/**
* common-sequence模块的配置类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Data
@ConfigurationProperties(prefix = "sequence")
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java
index 4fa401a8..75830184 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/BasicIdGenerator.java
@@ -8,8 +8,8 @@ import cn.hutool.core.util.IdUtil;
* 和SnowflakeIdGenerator相比，相同点是均为基于Snowflake算法的生成器。不同点在于当前类的
* WorkNodeId是通过配置文件静态指定的。而SnowflakeIdGenerator的WorkNodeId是由zk生成的。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public class BasicIdGenerator implements MyIdGenerator {
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java
index d584c2d9..8edc7b5c 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/MyIdGenerator.java
@@ -3,8 +3,8 @@ package com.orange.demo.common.sequence.generator;
/**
* 分布式Id生成器的统一接口。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
public interface MyIdGenerator {
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeIdGenerator.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeIdGenerator.java
index ba315cd8..53e544a4 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeIdGenerator.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeIdGenerator.java
@@ -12,7 +12,7 @@ import java.util.Random;
* Snowflake Id生成器。该实现完全copy美团的leaf。
*
* @author MeiTuan.Team
- * @date 2020-08-08
+ * @date 2020-09-27
*/
@Slf4j
public class SnowflakeIdGenerator implements MyIdGenerator {
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeZookeeperHolder.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeZookeeperHolder.java
index 5a926371..996fc173 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeZookeeperHolder.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/generator/SnowflakeZookeeperHolder.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* Snowflake Id生成器所依赖的zk工具类。该实现完全copy美团的leaf。
*
* @author MeiTuan.Team
- * @date 2020-08-08
+ * @date 2020-09-27
*/
@Slf4j
@Data
diff --git a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java
index fb4416e3..724d93f6 100644
--- a/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java
+++ b/orange-demo-multi-service/common/common-sequence/src/main/java/com/orange/demo/common/sequence/wrapper/IdGeneratorWrapper.java
@@ -12,8 +12,8 @@ import javax.annotation.PostConstruct;
/**
* 分布式Id生成器的封装类。该对象可根据配置选择不同的生成器实现类。
*
- * @author Orange Team
- * @date 2020-08-08
+ * @author Jerry
+ * @date 2020-09-27
*/
@Component
public class IdGeneratorWrapper {
diff --git a/orange-demo-multi-service/common/common.iml b/orange-demo-multi-service/common/common.iml
new file mode 100644
index 00000000..45fd11ef
--- /dev/null
+++ b/orange-demo-multi-service/common/common.iml
@@ -0,0 +1,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/orange-demo-multi-service/common/pom.xml b/orange-demo-multi-service/common/pom.xml
index 4f360cf8..61a75e25 100644
--- a/orange-demo-multi-service/common/pom.xml
+++ b/orange-demo-multi-service/common/pom.xml
@@ -3,7 +3,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
com.orange.demo
- OrangeDemo
+ OrangeMultiDemo
1.0.0
4.0.0
diff --git a/orange-demo-multi-service/pom.xml b/orange-demo-multi-service/pom.xml
index 634b8b00..632c80f0 100644
--- a/orange-demo-multi-service/pom.xml
+++ b/orange-demo-multi-service/pom.xml
@@ -4,9 +4,9 @@
4.0.0
com.orange.demo
- OrangeDemo
+ OrangeMultiDemo
1.0.0
- OrangeDemo
+ OrangeMultiDemo
pom
diff --git a/orange-demo-multi-service/zz-resource/config-data/gateway-dev.yaml b/orange-demo-multi-service/zz-resource/config-data/gateway-dev.yaml
index 8341610d..2f5e16d8 100644
--- a/orange-demo-multi-service/zz-resource/config-data/gateway-dev.yaml
+++ b/orange-demo-multi-service/zz-resource/config-data/gateway-dev.yaml
@@ -3,7 +3,7 @@ server:
application:
# Jwt令牌加密的签名值。
- tokenSigningKey: OrangeDemo
+ tokenSigningKey: OrangeMultiDemo
# Jwt令牌在Http Header中的键名称。
tokenHeaderKey: Authorization
# Jwt令牌刷新后在Http Header中的键名称。
diff --git a/orange-demo-multi-service/zz-resource/docker-files/.DS_Store b/orange-demo-multi-service/zz-resource/docker-files/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b6319752c09a5b80e7f2f02905c5efd6bc351425
GIT binary patch
literal 6148
zcmeHK!AiqG5Z!H~CWzRBV2^w8)zBc6Mf$eF;0ej4|#`!xm#T#+V6;Sh1k_L~tB+MJn2Z$Z?KfmX3o_
z5YFL`P$(P#zu7;Pny54MY^M
z@hyQUG&&kfg)jobRVtuL<@$-iRXX^Ej&n4Y3RODea%GrDugvueh0E2!FJw65jzVgQ
z0b*d8fvW1(u>K!^{r+E0q8>3o4E!kuxY6~xE^JBH)|Jg+trehsP!xdj0oA1ozs)ZU1XLMLUiOm^+fG?`3`2V?0>omc0@xj*;s{(gSH>vLWA%Pa4+yMvsJh714za!!tR
zo?;sQlmb}%E|9`Z#n>HT>t+i8ZCCbg1xt#(1l7~wIM6bt^-*l}LLEKb03hWs0AySM
z0FgM#-~m893;_5+0Dvk7fCI5rEDyA}01k0+uoF{!HcoV>iy_)GTxjyVbd
zl0Tg6Y_X9`g31_z7hY{7edVL6Ni#LKSy@`sNEUVrz8mb-NXers>^Bc<&DEu8qG
zDPUx5)uLg;cA!nY$f5z&7I%1^bn&PXo{G^xNNF3o_LB&p7o_*-KadN`$LFgB8M7-c
zlQnC}qOBk2HqVZwGUz1M{TvUU1F;PSkoeq%mLXtMc7>Neg+)w2OVEV!9i?ND`)q_6
z{%nN#n>Qs=ioI}P9OScTxwtyDs+DF1>{Ix#*R$W8Pj~V-}8Q;Mjqt##Y$bMYwD@Ril={*7Tx
z_&4LZ(bnaYdiNavJ=eYf`5AJ=#&3Lzc0et%$fwj7LE-i!^Kl$TIF}pB
zHFPh#l$3Ue8R)~&AE__$HaPXC4nON($b@F7Q1Be|S=oR@yorm^ow8B%FB7fuIqlv$
z`0hp=Q49K{488mD~FDA|LfSip<{Bk_(goXP;(aUw|h+zN<5v-Z(jeDc0Ymu8u(%2kt4z
za=Jz$-itUD8k&YyQ7I{dNOCx{vzY+ar>o=9@WYH%n0Zp$apWpyPb
zC1nXuPtlrGgH~aU4Vk&ja88iiMZnx_XO^=@$u6QNrF~^qz25>JR8~f=RxE)|rl%_)
zs|_72n{l8dJt!OY`ER5ag5H*UKlzA78gp`XNxnNVBE0L~V1>m1;~DtV^mSBe5g;YM
zzFi5HlN(^{$%R{1BPF)K3fKm#$b_c>3g5i0v&*1sY&qG>-OSLDmxC_OPev@^z)E@T
zbcc>%`z`s4vbF?B@TjWF5m-_z^Gj_}@Is+>1RJFV!{?83=A!L`t1cYd!E{11tF#(?
z>TS>U;#k%M#^bsjSP(GN_;6<%bFjX?+?$a%WqVTcA?ooH&pA)YVcwi#UCqmaHo?xO
zVgMrThfU(0IA15wJs_n|HZG2d6Hg2CoW_W%JUiNExUs>3y43;lI
zps$)4Z|l&BgC`{F8}i+xF0w+G?xwvwB&6L#tB0pE}-eBM9j-^8gb6soSLjbC&KVqp8(#{&MErm2()H&=co
zloPlLPRcWfuPqC*dHJn!*y!6?EYvH*<;9pzg0e8<6ohhXV_9KLno
z`s=q>E*C29v7_sUfG$H99_X%1BFJ5H7jqSNE_|iftzJBJOc2T9O~+59fX}9D3o+iM
zoW2X0QW}~bgp3|^=;DE$kMn}uIZVSjEXc&fk+-)TJ!>c&;;(Zj?;RqHL8C&+B$IG5i3X(+V}H4S!p&1ckl|qwM6=}o24qSwDFSaQ9yL*z&@P?~
NIGuF2YdId2^&gwrUL^nk
diff --git a/orange-demo-multi-service/zz-resource/upload-files/course-class/image/Course/pictureUrl/8c818ee4bcb040f9bd06c85c42d598ff.jpg b/orange-demo-multi-service/zz-resource/upload-files/course-class/image/Course/pictureUrl/8c818ee4bcb040f9bd06c85c42d598ff.jpg
deleted file mode 100644
index 9beea206ee202c9c4f447ca58e0e9322f1ef73dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 208715
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