From d49581f1fc42f9fc865b08f2658c436c8a13e4eb Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Tue, 19 Nov 2024 14:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 20 +++- .idea/encodings.xml | 13 ++- .idea/misc.xml | 5 + .idea/uiDesigner.xml | 124 +++++++++++++++++++++ applet-answer-api/pom.xml | 61 ++++++++++ .../api/controller/AppletIndexController.java | 24 ++++ hanhai-a-notice-api.iml | 62 ----------- massage-api.iml | 64 ----------- .../jeecg-system-cloud-api/pom.xml | 2 +- .../org/jeecg/common/system/api/ISysBaseAPI.java | 0 .../api/factory/SysBaseAPIFallbackFactory.java | 0 .../system/api/fallback/SysBaseAPIFallback.java | 0 .../main/java/org/jeecg/config/FeignConfig.java | 0 .../jeecg-system-local-api/pom.xml | 2 +- .../org/jeecg/common/system/api/ISysBaseAPI.java | 0 .../{jeecg-boot-base-api => base-api}/pom.xml | 4 +- .../{jeecg-boot-base-core => base-core}/pom.xml | 4 +- .../main/java/org/jeecg/common/api/CommonAPI.java | 0 .../java/org/jeecg/common/api/dto/FileDownDTO.java | 0 .../org/jeecg/common/api/dto/FileUploadDTO.java | 0 .../main/java/org/jeecg/common/api/dto/LogDTO.java | 0 .../org/jeecg/common/api/dto/OnlineAuthDTO.java | 0 .../common/api/dto/message/BusMessageDTO.java | 0 .../api/dto/message/BusTemplateMessageDTO.java | 0 .../jeecg/common/api/dto/message/MessageDTO.java | 0 .../jeecg/common/api/dto/message/TemplateDTO.java | 0 .../common/api/dto/message/TemplateMessageDTO.java | 0 .../main/java/org/jeecg/common/api/vo/Result.java | 0 .../org/jeecg/common/aspect/AutoLogAspect.java | 0 .../java/org/jeecg/common/aspect/DictAspect.java | 0 .../jeecg/common/aspect/PermissionDataAspect.java | 0 .../java/org/jeecg/common/aspect/UrlMatchEnum.java | 0 .../jeecg/common/aspect/annotation/AutoDict.java | 0 .../jeecg/common/aspect/annotation/AutoLog.java | 0 .../jeecg/common/aspect/annotation/AutoLowApp.java | 0 .../org/jeecg/common/aspect/annotation/Dict.java | 0 .../jeecg/common/aspect/annotation/OnlineAuth.java | 0 .../common/aspect/annotation/PermissionData.java | 0 .../org/jeecg/common/constant/CommonConstant.java | 0 .../jeecg/common/constant/CommonSendStatus.java | 0 .../jeecg/common/constant/DataBaseConstant.java | 0 .../jeecg/common/constant/FillRuleConstant.java | 0 .../jeecg/common/constant/ProvinceCityArea.java | 0 .../common/constant/ServiceNameConstants.java | 0 .../org/jeecg/common/constant/SymbolConstant.java | 0 .../org/jeecg/common/constant/VxeSocketConst.java | 0 .../org/jeecg/common/constant/WebsocketConst.java | 0 .../jeecg/common/constant/enums/CgformEnum.java | 0 .../jeecg/common/constant/enums/LowAppAopEnum.java | 0 .../jeecg/common/constant/enums/ModuleType.java | 0 .../common/constant/enums/OperateTypeEnum.java | 0 .../common/constant/enums/RoleIndexConfigEnum.java | 0 .../common/es/JeecgElasticsearchTemplate.java | 0 .../org/jeecg/common/es/QueryStringBuilder.java | 0 .../common/exception/JeecgBoot401Exception.java | 0 .../jeecg/common/exception/JeecgBootException.java | 0 .../exception/JeecgBootExceptionHandler.java | 0 .../org/jeecg/common/handler/IFillRuleHandler.java | 0 .../system/base/controller/JeecgController.java | 0 .../common/system/base/entity/JeecgEntity.java | 0 .../common/system/base/service/JeecgService.java | 0 .../system/base/service/impl/JeecgServiceImpl.java | 0 .../jeecg/common/system/query/MatchTypeEnum.java | 0 .../jeecg/common/system/query/QueryCondition.java | 0 .../jeecg/common/system/query/QueryGenerator.java | 0 .../jeecg/common/system/query/QueryRuleEnum.java | 0 .../common/system/util/JeecgDataAutorUtils.java | 0 .../java/org/jeecg/common/system/util/JwtUtil.java | 0 .../org/jeecg/common/system/vo/ComboModel.java | 0 .../java/org/jeecg/common/system/vo/DictModel.java | 0 .../org/jeecg/common/system/vo/DictModelMany.java | 0 .../java/org/jeecg/common/system/vo/DictQuery.java | 0 .../common/system/vo/DynamicDataSourceModel.java | 0 .../java/org/jeecg/common/system/vo/LoginUser.java | 0 .../jeecg/common/system/vo/SysCategoryModel.java | 0 .../org/jeecg/common/system/vo/SysDepartModel.java | 0 .../system/vo/SysPermissionDataRuleModel.java | 0 .../jeecg/common/system/vo/SysUserCacheInfo.java | 0 .../java/org/jeecg/common/util/BrowserType.java | 0 .../java/org/jeecg/common/util/BrowserUtils.java | 0 .../java/org/jeecg/common/util/CommonUtils.java | 0 .../main/java/org/jeecg/common/util/DateUtils.java | 0 .../main/java/org/jeecg/common/util/DySmsEnum.java | 0 .../java/org/jeecg/common/util/DySmsHelper.java | 0 .../java/org/jeecg/common/util/FillRuleUtil.java | 0 .../main/java/org/jeecg/common/util/HTMLUtils.java | 0 .../org/jeecg/common/util/ImportExcelUtil.java | 0 .../main/java/org/jeecg/common/util/IpUtils.java | 0 .../main/java/org/jeecg/common/util/Md5Util.java | 0 .../main/java/org/jeecg/common/util/MinioUtil.java | 0 .../java/org/jeecg/common/util/MyClassLoader.java | 0 .../java/org/jeecg/common/util/PasswordUtil.java | 0 .../org/jeecg/common/util/PathMatcherUtil.java | 0 .../main/java/org/jeecg/common/util/PmsUtil.java | 0 .../java/org/jeecg/common/util/ReflectHelper.java | 0 .../org/jeecg/common/util/RestDesformUtil.java | 0 .../main/java/org/jeecg/common/util/RestUtil.java | 0 .../org/jeecg/common/util/SpringContextUtils.java | 0 .../org/jeecg/common/util/SqlInjectionUtil.java | 0 .../org/jeecg/common/util/SysAnnmentTypeEnum.java | 0 .../java/org/jeecg/common/util/TokenUtils.java | 0 .../java/org/jeecg/common/util/UUIDGenerator.java | 0 .../org/jeecg/common/util/YouBianCodeUtil.java | 0 .../util/dynamic/db/DataSourceCachePool.java | 0 .../jeecg/common/util/dynamic/db/DbTypeUtils.java | 0 .../common/util/dynamic/db/DynamicDBUtil.java | 0 .../util/dynamic/db/FreemarkerParseFactory.java | 0 .../common/util/encryption/AesEncryptUtil.java | 0 .../common/util/encryption/EncryptedString.java | 0 .../jeecg/common/util/filter/FileTypeFilter.java | 0 .../jeecg/common/util/filter/StrAttackFilter.java | 0 .../java/org/jeecg/common/util/oConvertUtils.java | 0 .../org/jeecg/common/util/oss/OssBootUtil.java | 0 .../security/AbstractQueryBlackListHandler.java | 0 .../jeecg/common/util/security/SecurityTools.java | 0 .../common/util/security/entity/MyKeyPair.java | 0 .../common/util/security/entity/SecurityReq.java | 0 .../common/util/security/entity/SecurityResp.java | 0 .../util/security/entity/SecuritySignReq.java | 0 .../util/security/entity/SecuritySignResp.java | 0 .../common/util/superSearch/ObjectParseUtil.java | 0 .../common/util/superSearch/QueryRuleEnum.java | 0 .../jeecg/common/util/superSearch/QueryRuleVo.java | 0 .../main/java/org/jeecg/config/AutoPoiConfig.java | 0 .../java/org/jeecg/config/AutoPoiDictConfig.java | 0 .../java/org/jeecg/config/CorsFilterCondition.java | 0 .../main/java/org/jeecg/config/DruidConfig.java | 0 .../java/org/jeecg/config/JeeccgBaseConfig.java | 0 .../java/org/jeecg/config/JeecgCloudCondition.java | 0 .../java/org/jeecg/config/RestTemplateConfig.java | 0 .../main/java/org/jeecg/config/StaticConfig.java | 0 .../main/java/org/jeecg/config/Swagger2Config.java | 2 +- .../java/org/jeecg/config/WebMvcConfiguration.java | 0 .../java/org/jeecg/config/WebSocketConfig.java | 0 .../jeecg/config/mybatis/JeecgTenantParser.java | 0 .../jeecg/config/mybatis/MybatisInterceptor.java | 0 .../config/mybatis/MybatisPlusSaasConfig.java | 0 .../org/jeecg/config/mybatis/TenantContext.java | 0 .../java/org/jeecg/config/oss/MinioConfig.java | 0 .../org/jeecg/config/oss/OssConfiguration.java | 0 .../main/java/org/jeecg/config/shiro/JwtToken.java | 0 .../java/org/jeecg/config/shiro/ShiroConfig.java | 5 +- .../java/org/jeecg/config/shiro/ShiroRealm.java | 0 .../filters/CustomShiroFilterFactoryBean.java | 0 .../org/jeecg/config/shiro/filters/JwtFilter.java | 0 .../config/shiro/filters/ResourceCheckFilter.java | 0 .../sign/interceptor/SignAuthConfiguration.java | 0 .../sign/interceptor/SignAuthInterceptor.java | 0 .../util/BodyReaderHttpServletRequestWrapper.java | 0 .../java/org/jeecg/config/sign/util/HttpUtils.java | 0 .../java/org/jeecg/config/sign/util/SignUtil.java | 0 .../org/jeecg/config/thirdapp/ThirdAppConfig.java | 0 .../jeecg/config/thirdapp/ThirdAppTypeConfig.java | 0 .../jeecg/config/thirdapp/ThirdAppTypeItemVo.java | 0 .../src/main/java/org/jeecg/config/vo/Shiro.java | 0 .../modules/base/mapper/BaseCommonMapper.java | 0 .../modules/base/mapper/xml/BaseCommonMapper.xml | 0 .../modules/base/service/BaseCommonService.java | 0 .../base/service/impl/BaseCommonServiceImpl.java | 0 .../java/org/jeecg/modules/bean/ConvertUtils.java | 0 .../main/java/org/jeecg/modules/bean/HttpConf.java | 0 .../main/java/org/jeecg/modules/bean/LoginReq.java | 0 .../controller/HanHaiMemberController.java | 2 +- .../modules/hanHaiMember/entity/HanHaiMember.java | 88 +++++++-------- .../hanHaiMember/mapper/HanHaiMemberMapper.java | 0 .../hanHaiMember/mapper/xml/HanHaiMemberMapper.xml | 0 .../hanHaiMember/service/IHanHaiMemberService.java | 0 .../service/impl/HanHaiMemberServiceImpl.java | 0 .../modules/hanHaiMember/vue/HanHaiMemberList.vue | 0 .../hanHaiMember/vue/modules/HanHaiMemberForm.vue | 0 .../vue/modules/HanHaiMemberModal.Style#Drawer.vue | 0 .../hanHaiMember/vue/modules/HanHaiMemberModal.vue | 0 .../modules/hanHaiMember/vue3/HanHaiMember.api.ts | 0 .../modules/hanHaiMember/vue3/HanHaiMember.data.ts | 0 .../modules/hanHaiMember/vue3/HanHaiMemberList.vue | 0 .../vue3/components/HanHaiMemberModal.vue | 0 .../src/main/resources/static/pca.json | 0 .../{jeecg-boot-base-tools => base-tools}/pom.xml | 2 +- .../jeecg/common/annotation/RabbitComponent.java | 0 .../main/java/org/jeecg/common/base/BaseMap.java | 0 .../java/org/jeecg/common/config/CommonConfig.java | 0 .../config/mqtoken/TransmitUserTokenFilter.java | 0 .../common/config/mqtoken/UserTokenContext.java | 0 .../org/jeecg/common/constant/CacheConstant.java | 0 .../org/jeecg/common/constant/GlobalConstants.java | 0 .../jeecg/common/enums/SentinelErrorInfoEnum.java | 0 .../modules/redis/client/JeecgRedisClient.java | 0 .../common/modules/redis/config/RedisConfig.java | 0 .../modules/redis/listener/JeecgRedisListener.java | 0 .../modules/redis/receiver/RedisReceiver.java | 0 .../redis/writer/JeecgRedisCacheWriter.java | 0 .../main/java/org/jeecg/common/util/RedisUtil.java | 0 .../org/jeecg/common/util/SpringContextHolder.java | 0 module-base/pom.xml | 6 +- module-common/pom.xml | 43 +++++++ .../api/controller/AppletLoginController.java | 57 ++++++++++ .../org/jeecg/api}/service/AppletLoginService.java | 2 +- .../jeecg/api/service/OfficialLoginService.java | 4 +- .../api}/service/impl/AppletLoginServiceImpl.java | 4 +- .../api/service/impl/OfficialLoginServiceImpl.java | 6 +- module-system/pom.xml | 17 +++ .../java/org/jeecg/modules/bean/WeiXinUnitl.java | 2 + .../jeecg/modules/message/entity/SysMessage.java | 18 +-- .../modules/message/entity/SysMessageTemplate.java | 10 +- .../modules/message/websocket/SocketHandler.java | 1 + .../message/websocket/TestSocketController.java | 1 + .../jeecg/modules/ngalain/aop/LogRecordAspect.java | 2 +- .../ngalain/controller/NgAlainController.java | 2 +- .../org/jeecg/modules/postBean/OnlineBean.java | 6 +- .../org/jeecg/modules/quartz/entity/QuartzJob.java | 18 +-- .../system/service/impl/SysBaseApiImpl.java | 2 + .../system/service/impl/SysLogServiceImpl.java | 1 + .../system/service/impl/SysUserServiceImpl.java | 6 +- .../java/org/jeecg/modules/utils/WeChatJSSDK.java | 4 +- .../src/main/resources/application-dev.yml | 4 +- .../online/desform/test/DesformApiTest.java | 2 +- .../online/desform/test/OnlineApiTest.java | 2 +- .../{modules => api}/system/test/SysUserTest.java | 2 +- pom.xml | 6 +- 219 files changed, 468 insertions(+), 244 deletions(-) create mode 100644 .idea/uiDesigner.xml create mode 100644 applet-answer-api/pom.xml create mode 100644 applet-answer-api/src/main/java/org/jeecg/api/controller/AppletIndexController.java delete mode 100644 hanhai-a-notice-api.iml delete mode 100644 massage-api.iml rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-cloud-api/pom.xml (91%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java (100%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java (100%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java (100%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java (100%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-local-api/pom.xml (88%) rename module-base/{jeecg-boot-base-api => base-api}/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java (100%) rename module-base/{jeecg-boot-base-api => base-api}/pom.xml (86%) rename module-base/{jeecg-boot-base-core => base-core}/pom.xml (98%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/CommonAPI.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/LogDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/api/vo/Result.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/DictAspect.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/Dict.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/CommonConstant.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/CommonSendStatus.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/DataBaseConstant.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/FillRuleConstant.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/SymbolConstant.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/VxeSocketConst.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/WebsocketConst.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/enums/ModuleType.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/es/QueryStringBuilder.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/exception/JeecgBootException.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/base/service/JeecgService.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/query/QueryCondition.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/query/QueryGenerator.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/util/JwtUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/ComboModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/DictModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/DictModelMany.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/DictQuery.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/LoginUser.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/BrowserType.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/BrowserUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/CommonUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/DateUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/DySmsEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/DySmsHelper.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/FillRuleUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/HTMLUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/ImportExcelUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/IpUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/Md5Util.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/MinioUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/MyClassLoader.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/PasswordUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/PathMatcherUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/PmsUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/ReflectHelper.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/RestDesformUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/RestUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/SpringContextUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/TokenUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/UUIDGenerator.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/oConvertUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/SecurityTools.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/AutoPoiConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/AutoPoiDictConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/CorsFilterCondition.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/DruidConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/JeeccgBaseConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/JeecgCloudCondition.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/RestTemplateConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/StaticConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/Swagger2Config.java (99%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/WebMvcConfiguration.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/WebSocketConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/mybatis/TenantContext.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/oss/MinioConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/oss/OssConfiguration.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/JwtToken.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/ShiroConfig.java (98%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/ShiroRealm.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/sign/util/HttpUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/sign/util/SignUtil.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/config/vo/Shiro.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/bean/ConvertUtils.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/bean/HttpConf.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/bean/LoginReq.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java (99%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java (77%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/mapper/HanHaiMemberMapper.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/mapper/xml/HanHaiMemberMapper.xml (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/service/IHanHaiMemberService.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/service/impl/HanHaiMemberServiceImpl.java (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue/HanHaiMemberList.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberForm.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.Style#Drawer.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue/modules/HanHaiMemberModal.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.api.ts (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMember.data.ts (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue3/HanHaiMemberList.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/java/org/jeecg/modules/hanHaiMember/vue3/components/HanHaiMemberModal.vue (100%) rename module-base/{jeecg-boot-base-core => base-core}/src/main/resources/static/pca.json (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/pom.xml (96%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/annotation/RabbitComponent.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/base/BaseMap.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/config/CommonConfig.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/constant/CacheConstant.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/constant/GlobalConstants.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/util/RedisUtil.java (100%) rename module-base/{jeecg-boot-base-tools => base-tools}/src/main/java/org/jeecg/common/util/SpringContextHolder.java (100%) create mode 100644 module-common/pom.xml create mode 100644 module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java rename {module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules => module-common/src/main/java/org/jeecg/api}/service/AppletLoginService.java (93%) rename module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java => module-common/src/main/java/org/jeecg/api/service/OfficialLoginService.java (75%) rename {module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules => module-common/src/main/java/org/jeecg/api}/service/impl/AppletLoginServiceImpl.java (99%) rename module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java => module-common/src/main/java/org/jeecg/api/service/impl/OfficialLoginServiceImpl.java (97%) rename module-system/src/test/java/org/jeecg/{modules => api}/online/desform/test/DesformApiTest.java (99%) rename module-system/src/test/java/org/jeecg/{modules => api}/online/desform/test/OnlineApiTest.java (99%) rename module-system/src/test/java/org/jeecg/{modules => api}/system/test/SysUserTest.java (99%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 0dc3d83..8a644be 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -6,24 +6,32 @@ - - + - + + + + + + + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index df3e350..0065abc 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,12 +1,15 @@ - - - - - + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index d5cd614..bc28ef3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,11 @@ + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/applet-answer-api/pom.xml b/applet-answer-api/pom.xml new file mode 100644 index 0000000..116f708 --- /dev/null +++ b/applet-answer-api/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.jeecgframework.boot + answer-api + 3.2.0 + + + applet-answer-api + + + 8 + 8 + UTF-8 + + + + + + aliyun + aliyun Repository + https://maven.aliyun.com/repository/public + + + jeecg + jeecg Repository + https://maven.jeecg.org/nexus/content/repositories/jeecg + + false + + + + + + + + + io.swagger + swagger-annotations + 1.5.22 + compile + + + org.springframework + spring-web + + + org.jeecgframework.boot + base-core + + + + + org.jeecgframework.boot + base-core + + + \ No newline at end of file diff --git a/applet-answer-api/src/main/java/org/jeecg/api/controller/AppletIndexController.java b/applet-answer-api/src/main/java/org/jeecg/api/controller/AppletIndexController.java new file mode 100644 index 0000000..ebc2112 --- /dev/null +++ b/applet-answer-api/src/main/java/org/jeecg/api/controller/AppletIndexController.java @@ -0,0 +1,24 @@ +package org.jeecg.api.controller; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.jeecg.common.api.vo.Result; + + +@Api(tags="百富门-首页") +@RestController +@RequestMapping("/applet_index") +@Slf4j +public class AppletIndexController { + + @ApiOperation(value="首页列表接口", notes="首页列表接口") + @GetMapping(value = "/list") + public Result appletLogin(){ + return Result.OK(); + } + +} diff --git a/hanhai-a-notice-api.iml b/hanhai-a-notice-api.iml deleted file mode 100644 index 9dbf17b..0000000 --- a/hanhai-a-notice-api.iml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/massage-api.iml b/massage-api.iml deleted file mode 100644 index b48dc08..0000000 --- a/massage-api.iml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/pom.xml b/module-base/base-api/jeecg-system-cloud-api/pom.xml similarity index 91% rename from module-base/jeecg-boot-base-api/jeecg-system-cloud-api/pom.xml rename to module-base/base-api/jeecg-system-cloud-api/pom.xml index 643de64..24df11b 100644 --- a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/pom.xml +++ b/module-base/base-api/jeecg-system-cloud-api/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"> - jeecg-boot-base-api + base-api org.jeecgframework.boot 3.2.0 diff --git a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java similarity index 100% rename from module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java rename to module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java diff --git a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java b/module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java similarity index 100% rename from module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java rename to module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/factory/SysBaseAPIFallbackFactory.java diff --git a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java b/module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java similarity index 100% rename from module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java rename to module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java diff --git a/module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java b/module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java similarity index 100% rename from module-base/jeecg-boot-base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java rename to module-base/base-api/jeecg-system-cloud-api/src/main/java/org/jeecg/config/FeignConfig.java diff --git a/module-base/jeecg-boot-base-api/jeecg-system-local-api/pom.xml b/module-base/base-api/jeecg-system-local-api/pom.xml similarity index 88% rename from module-base/jeecg-boot-base-api/jeecg-system-local-api/pom.xml rename to module-base/base-api/jeecg-system-local-api/pom.xml index d8428e5..a811de6 100644 --- a/module-base/jeecg-boot-base-api/jeecg-system-local-api/pom.xml +++ b/module-base/base-api/jeecg-system-local-api/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"> - jeecg-boot-base-api + base-api org.jeecgframework.boot 3.2.0 diff --git a/module-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/module-base/base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java similarity index 100% rename from module-base/jeecg-boot-base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java rename to module-base/base-api/jeecg-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java diff --git a/module-base/jeecg-boot-base-api/pom.xml b/module-base/base-api/pom.xml similarity index 86% rename from module-base/jeecg-boot-base-api/pom.xml rename to module-base/base-api/pom.xml index b479878..b0fdefb 100644 --- a/module-base/jeecg-boot-base-api/pom.xml +++ b/module-base/base-api/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - jeecg-boot-base-api + base-api pom @@ -20,7 +20,7 @@ org.jeecgframework.boot - jeecg-boot-base-core + base-core \ No newline at end of file diff --git a/module-base/jeecg-boot-base-core/pom.xml b/module-base/base-core/pom.xml similarity index 98% rename from module-base/jeecg-boot-base-core/pom.xml rename to module-base/base-core/pom.xml index b63f13d..2c15d78 100644 --- a/module-base/jeecg-boot-base-core/pom.xml +++ b/module-base/base-core/pom.xml @@ -8,7 +8,7 @@ 4.0.0 - jeecg-boot-base-core + base-core @@ -34,7 +34,7 @@ org.jeecgframework.boot - jeecg-boot-base-tools + base-tools diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java b/module-base/base-core/src/main/java/org/jeecg/common/api/CommonAPI.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/CommonAPI.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/FileUploadDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/LogDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/OnlineAuthDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/BusMessageDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/BusTemplateMessageDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/MessageDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java b/module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/dto/message/TemplateMessageDTO.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java b/module-base/base-core/src/main/java/org/jeecg/common/api/vo/Result.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java rename to module-base/base-core/src/main/java/org/jeecg/common/api/vo/Result.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/DictAspect.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/UrlMatchEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoDict.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLog.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/AutoLowApp.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/Dict.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/OnlineAuth.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java b/module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java rename to module-base/base-core/src/main/java/org/jeecg/common/aspect/annotation/PermissionData.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/CommonConstant.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/CommonSendStatus.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/DataBaseConstant.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/FillRuleConstant.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/ServiceNameConstants.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/SymbolConstant.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/VxeSocketConst.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/WebsocketConst.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/enums/LowAppAopEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/enums/ModuleType.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/enums/OperateTypeEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/constant/enums/RoleIndexConfigEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java b/module-base/base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java rename to module-base/base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java b/module-base/base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java rename to module-base/base-core/src/main/java/org/jeecg/common/es/QueryStringBuilder.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java b/module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java rename to module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBoot401Exception.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java b/module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java rename to module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBootException.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java b/module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java rename to module-base/base-core/src/main/java/org/jeecg/common/exception/JeecgBootExceptionHandler.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java b/module-base/base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java rename to module-base/base-core/src/main/java/org/jeecg/common/handler/IFillRuleHandler.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/module-base/base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java b/module-base/base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java b/module-base/base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/base/service/JeecgService.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java b/module-base/base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/base/service/impl/JeecgServiceImpl.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/query/MatchTypeEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java b/module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryCondition.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java b/module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryGenerator.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/query/QueryRuleEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/ComboModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictModelMany.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/DictQuery.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/DynamicDataSourceModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysCategoryModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysDepartModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysPermissionDataRuleModel.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java b/module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java rename to module-base/base-core/src/main/java/org/jeecg/common/system/vo/SysUserCacheInfo.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java b/module-base/base-core/src/main/java/org/jeecg/common/util/BrowserType.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserType.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/BrowserType.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/CommonUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/CommonUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/DateUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/DateUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/DySmsEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java b/module-base/base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/DySmsHelper.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/FillRuleUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/HTMLUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/IpUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/IpUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java b/module-base/base-core/src/main/java/org/jeecg/common/util/Md5Util.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/Md5Util.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/Md5Util.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/MinioUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MinioUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/MinioUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java b/module-base/base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/MyClassLoader.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/PathMatcherUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/PmsUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PmsUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/PmsUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java b/module-base/base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/ReflectHelper.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/RestDesformUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/RestUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/RestUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/RestUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/SqlInjectionUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/SysAnnmentTypeEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/TokenUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/TokenUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java b/module-base/base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/UUIDGenerator.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java b/module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DataSourceCachePool.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DbTypeUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java b/module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java b/module-base/base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java b/module-base/base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java b/module-base/base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/module-base/base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/oss/OssBootUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/AbstractQueryBlackListHandler.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/SecurityTools.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/MyKeyPair.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityReq.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecurityResp.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignReq.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java b/module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/security/entity/SecuritySignResp.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java b/module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/ObjectParseUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java b/module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleEnum.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java b/module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java rename to module-base/base-core/src/main/java/org/jeecg/common/util/superSearch/QueryRuleVo.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/AutoPoiConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java b/module-base/base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java rename to module-base/base-core/src/main/java/org/jeecg/config/CorsFilterCondition.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/DruidConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/DruidConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/JeeccgBaseConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java b/module-base/base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java rename to module-base/base-core/src/main/java/org/jeecg/config/JeecgCloudCondition.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/RestTemplateConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/StaticConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/StaticConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/StaticConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java b/module-base/base-core/src/main/java/org/jeecg/config/Swagger2Config.java similarity index 99% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java rename to module-base/base-core/src/main/java/org/jeecg/config/Swagger2Config.java index 83cecf2..398fa53 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java +++ b/module-base/base-core/src/main/java/org/jeecg/config/Swagger2Config.java @@ -68,7 +68,7 @@ public class Swagger2Config implements WebMvcConfigurer { .apiInfo(apiInfo()) .select() //此包路径下的类，才生成接口文档 - .apis(RequestHandlerSelectors.basePackage("org.jeecg.modules.api")) + .apis(RequestHandlerSelectors.basePackage("org.jeecg.api")) //加了ApiOperation注解的类，才生成接口文档 .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)) .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java b/module-base/base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java rename to module-base/base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/WebSocketConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebSocketConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/WebSocketConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java b/module-base/base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java rename to module-base/base-core/src/main/java/org/jeecg/config/mybatis/JeecgTenantParser.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java b/module-base/base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java rename to module-base/base-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusSaasConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java b/module-base/base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java rename to module-base/base-core/src/main/java/org/jeecg/config/mybatis/TenantContext.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/oss/MinioConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java b/module-base/base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java rename to module-base/base-core/src/main/java/org/jeecg/config/oss/OssConfiguration.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/JwtToken.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java similarity index 98% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java index cc7d138..b51dadd 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java +++ b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java @@ -71,10 +71,7 @@ public class ShiroConfig { filterChainDefinitionMap.put(url,"anon"); } } - filterChainDefinitionMap.put("/web/**", "anon"); //官网接口开放验证 - filterChainDefinitionMap.put("/city/**", "anon"); - filterChainDefinitionMap.put("/login/**", "anon"); - filterChainDefinitionMap.put("/token/**", "anon"); + diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java b/module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java rename to module-base/base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java b/module-base/base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java rename to module-base/base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java b/module-base/base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java rename to module-base/base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java b/module-base/base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java rename to module-base/base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java b/module-base/base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java rename to module-base/base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java b/module-base/base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java rename to module-base/base-core/src/main/java/org/jeecg/config/sign/util/SignUtil.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java b/module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java rename to module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeConfig.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java b/module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java rename to module-base/base-core/src/main/java/org/jeecg/config/thirdapp/ThirdAppTypeItemVo.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java b/module-base/base-core/src/main/java/org/jeecg/config/vo/Shiro.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/vo/Shiro.java rename to module-base/base-core/src/main/java/org/jeecg/config/vo/Shiro.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java b/module-base/base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java rename to module-base/base-core/src/main/java/org/jeecg/modules/base/mapper/BaseCommonMapper.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml b/module-base/base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml rename to module-base/base-core/src/main/java/org/jeecg/modules/base/mapper/xml/BaseCommonMapper.xml diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java b/module-base/base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java rename to module-base/base-core/src/main/java/org/jeecg/modules/base/service/BaseCommonService.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java b/module-base/base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java rename to module-base/base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/ConvertUtils.java b/module-base/base-core/src/main/java/org/jeecg/modules/bean/ConvertUtils.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/ConvertUtils.java rename to module-base/base-core/src/main/java/org/jeecg/modules/bean/ConvertUtils.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java b/module-base/base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java rename to module-base/base-core/src/main/java/org/jeecg/modules/bean/HttpConf.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java b/module-base/base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java similarity index 100% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java rename to module-base/base-core/src/main/java/org/jeecg/modules/bean/LoginReq.java diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java similarity index 99% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java rename to module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java index 1692442..9d0f1a1 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java +++ b/module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/controller/HanHaiMemberController.java @@ -72,7 +72,7 @@ public class HanHaiMemberController extends JeecgController 4.0.0 公共模块 - jeecg-boot-base-tools + base-tools diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/annotation/RabbitComponent.java b/module-base/base-tools/src/main/java/org/jeecg/common/annotation/RabbitComponent.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/annotation/RabbitComponent.java rename to module-base/base-tools/src/main/java/org/jeecg/common/annotation/RabbitComponent.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/base/BaseMap.java b/module-base/base-tools/src/main/java/org/jeecg/common/base/BaseMap.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/base/BaseMap.java rename to module-base/base-tools/src/main/java/org/jeecg/common/base/BaseMap.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/CommonConfig.java b/module-base/base-tools/src/main/java/org/jeecg/common/config/CommonConfig.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/CommonConfig.java rename to module-base/base-tools/src/main/java/org/jeecg/common/config/CommonConfig.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java b/module-base/base-tools/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java rename to module-base/base-tools/src/main/java/org/jeecg/common/config/mqtoken/TransmitUserTokenFilter.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java b/module-base/base-tools/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java rename to module-base/base-tools/src/main/java/org/jeecg/common/config/mqtoken/UserTokenContext.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java b/module-base/base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java rename to module-base/base-tools/src/main/java/org/jeecg/common/constant/CacheConstant.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/GlobalConstants.java b/module-base/base-tools/src/main/java/org/jeecg/common/constant/GlobalConstants.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/constant/GlobalConstants.java rename to module-base/base-tools/src/main/java/org/jeecg/common/constant/GlobalConstants.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java b/module-base/base-tools/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java rename to module-base/base-tools/src/main/java/org/jeecg/common/enums/SentinelErrorInfoEnum.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java b/module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java rename to module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/client/JeecgRedisClient.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java b/module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java rename to module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/config/RedisConfig.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java b/module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java rename to module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/listener/JeecgRedisListener.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java b/module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java rename to module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/receiver/RedisReceiver.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java b/module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java rename to module-base/base-tools/src/main/java/org/jeecg/common/modules/redis/writer/JeecgRedisCacheWriter.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java b/module-base/base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java rename to module-base/base-tools/src/main/java/org/jeecg/common/util/RedisUtil.java diff --git a/module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/SpringContextHolder.java b/module-base/base-tools/src/main/java/org/jeecg/common/util/SpringContextHolder.java similarity index 100% rename from module-base/jeecg-boot-base-tools/src/main/java/org/jeecg/common/util/SpringContextHolder.java rename to module-base/base-tools/src/main/java/org/jeecg/common/util/SpringContextHolder.java diff --git a/module-base/pom.xml b/module-base/pom.xml index a5eb25e..57e709d 100644 --- a/module-base/pom.xml +++ b/module-base/pom.xml @@ -13,9 +13,9 @@ pom - jeecg-boot-base-api - jeecg-boot-base-core - jeecg-boot-base-tools + base-api + base-core + base-tools diff --git a/module-common/pom.xml b/module-common/pom.xml new file mode 100644 index 0000000..5a9f065 --- /dev/null +++ b/module-common/pom.xml @@ -0,0 +1,43 @@ + + + 4.0.0 + + org.jeecgframework.boot + answer-api + 3.2.0 + + + module-common + + + 8 + 8 + UTF-8 + + + + + io.swagger + swagger-annotations + 1.5.22 + compile + + + org.springframework + spring-web + + + org.jeecgframework.boot + base-core + + + + + org.jeecgframework.boot + base-core + + + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java new file mode 100644 index 0000000..58bf089 --- /dev/null +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java @@ -0,0 +1,57 @@ +package org.jeecg.api.controller; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.jeecg.common.api.vo.Result; + +/** + * 集中所有登录接口 + */ + +@Api(tags="项目通用-登录") +@RestController +@RequestMapping("/login_common") +@Slf4j +public class AppletLoginController { + + //微信小程序授权登录 + @ApiOperation(value="微信小程序授权登录", notes="微信小程序授权登录") + @GetMapping(value = "/appletLogin") + public Result appletLogin(){ + return Result.OK(); + } + + //微信公众号授权登录 + @ApiOperation(value="微信公众号授权登录", notes="微信公众号授权登录") + @GetMapping(value = "/officialLogin") + public Result officialLogin(){ + return Result.OK(); + } + + //账号密码登录 + @ApiOperation(value="账号密码登录", notes="账号密码登录") + @GetMapping(value = "/accountLogin") + public Result accountLogin(){ + return Result.OK(); + } + + + //手机号验证码登录 + @ApiOperation(value="手机号验证码登录", notes="手机号验证码登录") + @GetMapping(value = "/phoneLogin") + public Result phoneLogin(){ + return Result.OK(); + } + + + + + + +} + diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java similarity index 93% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java rename to module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java index 33975fd..994e5b1 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/AppletLoginService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.service; +package org.jeecg.api.service; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.bean.LoginReq; diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java b/module-common/src/main/java/org/jeecg/api/service/OfficialLoginService.java similarity index 75% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java rename to module-common/src/main/java/org/jeecg/api/service/OfficialLoginService.java index fe6ca2e..59c2d3f 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/ApiLoginService.java +++ b/module-common/src/main/java/org/jeecg/api/service/OfficialLoginService.java @@ -1,10 +1,10 @@ -package org.jeecg.modules.service; +package org.jeecg.api.service; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.bean.LoginReq; -public interface ApiLoginService { +public interface OfficialLoginService { /** diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java similarity index 99% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java rename to module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 6d4bc74..421ff92 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -1,8 +1,9 @@ -package org.jeecg.modules.service.impl; +package org.jeecg.api.service.impl; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jeecg.api.service.AppletLoginService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; @@ -12,7 +13,6 @@ import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.jeecg.modules.service.AppletLoginService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/OfficialLoginServiceImpl.java similarity index 97% rename from module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java rename to module-common/src/main/java/org/jeecg/api/service/impl/OfficialLoginServiceImpl.java index a7aeba0..dfdf639 100644 --- a/module-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/service/impl/ApiLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/OfficialLoginServiceImpl.java @@ -1,8 +1,9 @@ -package org.jeecg.modules.service.impl; +package org.jeecg.api.service.impl; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.jeecg.api.service.OfficialLoginService; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.exception.JeecgBootException; @@ -14,7 +15,6 @@ import org.jeecg.modules.bean.HttpConf; import org.jeecg.modules.bean.LoginReq; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; -import org.jeecg.modules.service.ApiLoginService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -26,7 +26,7 @@ import java.util.Map; @Slf4j @Service -public class ApiLoginServiceImpl implements ApiLoginService { +public class OfficialLoginServiceImpl implements OfficialLoginService { //公共用户表 @Resource diff --git a/module-system/pom.xml b/module-system/pom.xml index ff31e2b..ef6db56 100644 --- a/module-system/pom.xml +++ b/module-system/pom.xml @@ -74,6 +74,23 @@ compile + + + + org.jeecgframework.boot + applet-answer-api + ${jeecgboot.version} + + + + + org.jeecgframework.boot + module-common + ${jeecgboot.version} + + + + diff --git a/module-system/src/main/java/org/jeecg/modules/bean/WeiXinUnitl.java b/module-system/src/main/java/org/jeecg/modules/bean/WeiXinUnitl.java index b9ba6cc..ffac6b2 100644 --- a/module-system/src/main/java/org/jeecg/modules/bean/WeiXinUnitl.java +++ b/module-system/src/main/java/org/jeecg/modules/bean/WeiXinUnitl.java @@ -2,6 +2,8 @@ package org.jeecg.modules.bean; import net.sf.json.JSONObject; +import org.jeecg.modules.bean.Sign; +import org.jeecg.modules.bean.WinXinEntity; import java.io.InputStream; import java.net.HttpURLConnection; diff --git a/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java b/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java index 9faa53e..39ec9e3 100644 --- a/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java +++ b/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessage.java @@ -25,23 +25,23 @@ import lombok.experimental.Accessors; public class SysMessage extends JeecgEntity { /**推送内容*/ @Excel(name = "推送内容", width = 15) - private java.lang.String esContent; + private String esContent; /**推送所需参数Json格式*/ @Excel(name = "推送所需参数Json格式", width = 15) - private java.lang.String esParam; + private String esParam; /**接收人*/ @Excel(name = "接收人", width = 15) - private java.lang.String esReceiver; + private String esReceiver; /**推送失败原因*/ @Excel(name = "推送失败原因", width = 15) - private java.lang.String esResult; + private String esResult; /**发送次数*/ @Excel(name = "发送次数", width = 15) - private java.lang.Integer esSendNum; + private Integer esSendNum; /**推送状态 0未推送 1推送成功 2推送失败*/ @Excel(name = "推送状态 0未推送 1推送成功 2推送失败", width = 15) @Dict(dicCode = "msgSendStatus") - private java.lang.String esSendStatus; + private String esSendStatus; /**推送时间*/ @Excel(name = "推送时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @@ -49,12 +49,12 @@ public class SysMessage extends JeecgEntity { private java.util.Date esSendTime; /**消息标题*/ @Excel(name = "消息标题", width = 15) - private java.lang.String esTitle; + private String esTitle; /**推送方式：1短信 2邮件 3微信*/ @Excel(name = "推送方式：1短信 2邮件 3微信", width = 15) @Dict(dicCode = "msgType") - private java.lang.String esType; + private String esType; /**备注*/ @Excel(name = "备注", width = 15) - private java.lang.String remark; + private String remark; } diff --git a/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java b/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java index 929937a..8b04d09 100644 --- a/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java +++ b/module-system/src/main/java/org/jeecg/modules/message/entity/SysMessageTemplate.java @@ -22,17 +22,17 @@ import lombok.experimental.Accessors; public class SysMessageTemplate extends JeecgEntity{ /**模板CODE*/ @Excel(name = "模板CODE", width = 15) - private java.lang.String templateCode; + private String templateCode; /**模板标题*/ @Excel(name = "模板标题", width = 30) - private java.lang.String templateName; + private String templateName; /**模板内容*/ @Excel(name = "模板内容", width = 50) - private java.lang.String templateContent; + private String templateContent; /**模板测试json*/ @Excel(name = "模板测试json", width = 15) - private java.lang.String templateTestJson; + private String templateTestJson; /**模板类型*/ @Excel(name = "模板类型", width = 15) - private java.lang.String templateType; + private String templateType; } diff --git a/module-system/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java b/module-system/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java index 53eb9dc..851bfc3 100644 --- a/module-system/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java +++ b/module-system/src/main/java/org/jeecg/modules/message/websocket/SocketHandler.java @@ -2,6 +2,7 @@ package org.jeecg.modules.message.websocket; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.common.base.BaseMap; import org.jeecg.common.constant.CommonSendStatus; import org.jeecg.common.modules.redis.listener.JeecgRedisListener; diff --git a/module-system/src/main/java/org/jeecg/modules/message/websocket/TestSocketController.java b/module-system/src/main/java/org/jeecg/modules/message/websocket/TestSocketController.java index fe70566..65b845b 100644 --- a/module-system/src/main/java/org/jeecg/modules/message/websocket/TestSocketController.java +++ b/module-system/src/main/java/org/jeecg/modules/message/websocket/TestSocketController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.message.websocket; +import org.jeecg.modules.message.websocket.WebSocket; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.WebsocketConst; import org.springframework.beans.factory.annotation.Autowired; diff --git a/module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java b/module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java index c625318..7f62785 100644 --- a/module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java +++ b/module-system/src/main/java/org/jeecg/modules/ngalain/aop/LogRecordAspect.java @@ -1,4 +1,4 @@ -//package org.jeecg.modules.ngalain.aop; +package org.jeecg.modules.ngalain.aop;//package org.jeecg.modules.ngalain.aop; // //import javax.servlet.http.HttpServletRequest; // diff --git a/module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java b/module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java index 1930b97..58a9c4c 100644 --- a/module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java +++ b/module-system/src/main/java/org/jeecg/modules/ngalain/controller/NgAlainController.java @@ -1,4 +1,4 @@ -//package org.jeecg.modules.ngalain.controller; +package org.jeecg.modules.ngalain.controller;//package org.jeecg.modules.ngalain.controller; // //import java.util.ArrayList; //import java.util.List; diff --git a/module-system/src/main/java/org/jeecg/modules/postBean/OnlineBean.java b/module-system/src/main/java/org/jeecg/modules/postBean/OnlineBean.java index 6523f4f..e581237 100644 --- a/module-system/src/main/java/org/jeecg/modules/postBean/OnlineBean.java +++ b/module-system/src/main/java/org/jeecg/modules/postBean/OnlineBean.java @@ -9,13 +9,13 @@ public class OnlineBean { @ApiModelProperty(value = "经度") - private java.lang.String longitude; + private String longitude; /**纬度*/ @ApiModelProperty(value = "纬度") - private java.lang.String latitude; + private String latitude; /**是否可预约*/ @ApiModelProperty(value = "是否可预约") - private java.lang.String bookable; + private String bookable; } diff --git a/module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java b/module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java index 9fd7e02..a27bc58 100644 --- a/module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java +++ b/module-system/src/main/java/org/jeecg/modules/quartz/entity/QuartzJob.java @@ -27,36 +27,36 @@ public class QuartzJob implements Serializable { /**id*/ @TableId(type = IdType.ASSIGN_ID) - private java.lang.String id; + private String id; /**创建人*/ - private java.lang.String createBy; + private String createBy; /**创建时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date createTime; /**删除状态*/ - private java.lang.Integer delFlag; + private Integer delFlag; /**修改人*/ - private java.lang.String updateBy; + private String updateBy; /**修改时间*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private java.util.Date updateTime; /**任务类名*/ @Excel(name="任务类名",width=40) - private java.lang.String jobClassName; + private String jobClassName; /**cron表达式*/ @Excel(name="cron表达式",width=30) - private java.lang.String cronExpression; + private String cronExpression; /**参数*/ @Excel(name="参数",width=15) - private java.lang.String parameter; + private String parameter; /**描述*/ @Excel(name="描述",width=40) - private java.lang.String description; + private String description; /**状态 0正常 -1停止*/ @Excel(name="状态",width=15,dicCode="quartz_status") @Dict(dicCode = "quartz_status") - private java.lang.Integer status; + private Integer status; } diff --git a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java index f3101d5..5bf4f47 100644 --- a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java +++ b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java @@ -12,6 +12,8 @@ import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.shiro.SecurityUtils; +import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; import org.jeecg.common.api.dto.OnlineAuthDTO; import org.jeecg.common.api.dto.message.*; import org.jeecg.common.aspect.UrlMatchEnum; diff --git a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java index e9b561d..d5a3312 100644 --- a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java +++ b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysLogServiceImpl.java @@ -8,6 +8,7 @@ import java.util.Map; import javax.annotation.Resource; import com.baomidou.mybatisplus.annotation.DbType; +import org.jeecg.modules.system.service.impl.SysBaseApiImpl; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.util.CommonUtils; import org.jeecg.modules.system.entity.SysLog; diff --git a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 3316a9f..5455809 100644 --- a/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.system.service.impl.ThirdAppDingtalkServiceImpl; +import org.jeecg.modules.system.service.impl.ThirdAppWechatEnterpriseServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CacheConstant; import org.jeecg.common.constant.CommonConstant; @@ -62,9 +64,9 @@ public class SysUserServiceImpl extends ServiceImpl impl @Autowired private SysThirdAccountMapper sysThirdAccountMapper; @Autowired - ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService; + ThirdAppWechatEnterpriseServiceImpl wechatEnterpriseService; @Autowired - ThirdAppDingtalkServiceImpl dingtalkService; + ThirdAppDingtalkServiceImpl dingtalkService; @Override @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) diff --git a/module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java b/module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java index 0feab87..1f9094c 100644 --- a/module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java +++ b/module-system/src/main/java/org/jeecg/modules/utils/WeChatJSSDK.java @@ -33,7 +33,7 @@ public class WeChatJSSDK { try { response = sendGet(url, "UTF-8"); // 调用你的sendGet方法获取响应 if (response != null && !response.isEmpty()) { - org.json.JSONObject jsonObject = new JSONObject(response); // 解析JSON字符串 + JSONObject jsonObject = new JSONObject(response); // 解析JSON字符串 accessToken = jsonObject.getString("access_token"); // 提取access_token // 这里可以添加逻辑来缓存accessToken } @@ -75,7 +75,7 @@ public class WeChatJSSDK { // 生成签名 public static Map getSignPackage(String url) throws Exception { String jsapiTicket = getJsApiTicket(); - org.json.JSONObject jsonObject = new JSONObject(jsapiTicket); // 解析JSON字符串 + JSONObject jsonObject = new JSONObject(jsapiTicket); // 解析JSON字符串 jsapiTicket = jsonObject.getString("ticket"); // 提取access_token diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index 5ec750f..f71949a 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -279,8 +279,8 @@ knife4j: production: false basic: enable: false - username: jeecg - password: jeecg1314 + username: admin + password: admin.hh.1688 #第三方登录 justauth: enabled: true diff --git a/module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java b/module-system/src/test/java/org/jeecg/api/online/desform/test/DesformApiTest.java similarity index 99% rename from module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java rename to module-system/src/test/java/org/jeecg/api/online/desform/test/DesformApiTest.java index 103a614..8a8d8e0 100644 --- a/module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java +++ b/module-system/src/test/java/org/jeecg/api/online/desform/test/DesformApiTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.online.desform.test; +package org.jeecg.api.online.desform.test; import com.alibaba.fastjson.JSONObject; import org.jeecg.JeecgSystemApplication; diff --git a/module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java b/module-system/src/test/java/org/jeecg/api/online/desform/test/OnlineApiTest.java similarity index 99% rename from module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java rename to module-system/src/test/java/org/jeecg/api/online/desform/test/OnlineApiTest.java index 272c903..ec9d790 100644 --- a/module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java +++ b/module-system/src/test/java/org/jeecg/api/online/desform/test/OnlineApiTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.online.desform.test; +package org.jeecg.api.online.desform.test; import com.alibaba.fastjson.JSONObject; import org.jeecg.JeecgSystemApplication; diff --git a/module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java b/module-system/src/test/java/org/jeecg/api/system/test/SysUserTest.java similarity index 99% rename from module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java rename to module-system/src/test/java/org/jeecg/api/system/test/SysUserTest.java index 25ebb1c..ad68660 100644 --- a/module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java +++ b/module-system/src/test/java/org/jeecg/api/system/test/SysUserTest.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.system.test; +package org.jeecg.m.system.test; import org.jeecg.JeecgSystemApplication; import org.jeecg.common.constant.CommonConstant; diff --git a/pom.xml b/pom.xml index a0e3a93..0f7d05e 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,8 @@ module-pay module-base module-system + applet-answer-api + module-common @@ -149,13 +151,13 @@ org.jeecgframework.boot - jeecg-boot-base-tools + base-tools ${jeecgboot.version} org.jeecgframework.boot - jeecg-boot-base-core + base-core ${jeecgboot.version}