From 450fecba728d83dadafa704fd47527c5ae3d2dfa Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Fri, 23 May 2025 13:43:14 +0800 Subject: [PATCH] 'commit' --- .../{aiSupport => Res}/AiApplication.java | 16 ++++++++-------- .../Config/GatewayConfig.java | 4 ++-- .../Index/IndexController.java | 2 +- .../Interceptor/CheckIdsInterceptor.java | 6 +++--- .../Res}/Interceptor/CheckIdsInterface.java | 2 +- .../Interceptor/EmptyInterceptor.java | 4 ++-- .../Interceptor/EmptyInterface.java | 2 +- .../Res}/Interceptor/IsGuidInterceptor.java | 4 ++-- .../Res}/Interceptor/IsGuidInterface.java | 2 +- .../Interceptor/IsNumbericInterceptor.java | 6 +++--- .../Interceptor/IsNumericInterface.java | 2 +- .../Interceptor/IsSysAdminInterceptor.java | 4 ++-- .../Interceptor/IsSysAdminInterface.java | 2 +- .../Res}/Interceptor/LengthInterceptor.java | 4 ++-- .../Interceptor/LengthInterface.java | 2 +- .../{aiSupport => Res}/JApiDocsGenerator.java | 4 ++-- .../Plugin/PostmanDocPlugin.java | 2 +- .../Plugin/RocketMQPlugin.java | 4 ++-- .../com/dsideal/Res}/Plugin/YamlProp.java | 2 +- .../Util/AiPpt/AiPptDemo1.java | 6 +++--- .../Util/AiPpt/AiPptDemo2.java | 6 +++--- .../Util/AiPpt/AiPptDemo3.java | 6 +++--- .../Util/AiPpt/AiPptDemo4.java | 6 +++--- .../Util/AiPpt/Doc/文档.txt | 0 .../Util/AiPpt/Kit/ApiKit.java | 2 +- .../Util/AiPpt/Kit/HttpUtils.java | 2 +- .../{aiSupport => Res}/Util/CommonUtil.java | 2 +- .../com/dsideal/Res}/Util/CookieUtil.java | 2 +- .../Util/DashScope/Doc/文档.txt | 0 .../Util/DashScope/ImgSong.java | 4 ++-- .../Util/DashScope/ImgSpeak.java | 4 ++-- .../Util/DashScope/Kit/DashScopeCommon.java | 2 +- .../Util/DashScope/Kit/VideoStyleEnum.java | 2 +- .../Util/DashScope/VideoStyleTransform.java | 6 +++--- .../Util/ExcelExportUtil.java | 2 +- .../{aiSupport => Res}/Util/FileSizeUtil.java | 2 +- .../java/com/dsideal/Res}/Util/FileUtil.java | 2 +- .../{aiSupport => Res}/Util/HttpClient.java | 4 ++-- .../Util/HuoShanFangZhou/Doc/文档.txt | 0 .../HuoShanFangZhou/Kit/HuoShanCommon.java | 2 +- .../Util/HuoShanFangZhou/Txt2Img.java | 4 ++-- .../com/dsideal/Res}/Util/IDCardUtil.java | 2 +- .../Util/IdCardGenerator.java | 2 +- .../java/com/dsideal/Res}/Util/IpUtil.java | 2 +- .../Util/JiMeng/JmImg2Video.java | 6 +++--- .../Util/JiMeng/JmTxt2Img.java | 6 +++--- .../Util/JiMeng/JmTxt2Video.java | 6 +++--- .../Util/JiMeng/Kit/JmCommon.java | 2 +- .../Util/JiMeng/Kit/JmErrorCode.java | 2 +- .../{aiSupport => Res}/Util/JwtUtil.java | 4 ++-- .../Util/KeLing/Doc/文档.txt | 0 .../Util/KeLing/Kit/KlCommon.java | 2 +- .../Util/KeLing/Kit/KlErrorCode.java | 2 +- .../Util/KeLing/KlAccount.java | 6 +++--- .../Util/KeLing/KlImg2Video.java | 6 +++--- .../Util/KeLing/KlTxt2Img.java | 6 +++--- .../Util/KeLing/KlTxt2Video.java | 6 +++--- .../Util/Liblib/Doc/文档.txt | 0 .../Util/Liblib/Enum/SamplingMethod.java | 2 +- .../Util/Liblib/Enum/UltraTemplate.java | 2 +- ...9d50536e85f130a1142d19755c8266d4a8577c.png | Bin ...23f42638c21205f0ff2d64898589dd994f1f94.png | Bin ...918e200fb8b716e1773cebe54535b36adb5134.png | Bin ...c2603b40b7217e14bc5003ea2ca8331e9ef40d.png | Bin .../Util/Liblib/Example/TextToImageUltra.png | Bin .../Util/Liblib/Kit/LibLibCommon.java | 2 +- .../Util/Liblib/LibImg2Img.java | 4 ++-- .../Util/Liblib/LibTxt2Img.java | 5 ++--- .../Util/Liblib/QueryModelVersion.java | 4 ++-- .../Util/Liblib/UltraImg2Img.java | 6 +++--- .../Util/Liblib/UltraTxt2Img.java | 6 +++--- .../{aiSupport => Res}/Util/LogBackLog.java | 2 +- .../Util/LogBackLogFactory.java | 2 +- .../Util/Midjourney/Doc/文档.txt | 0 .../Util/Midjourney/Kit/MjCommon.java | 2 +- .../Util/Midjourney/Txt2Img.java | 4 ++-- .../{aiSupport => Res}/Util/MinioUtils.java | 6 +++--- .../com/dsideal/Res}/Util/PassWordUtil.java | 2 +- .../{aiSupport => Res}/Util/PkUtil.java | 2 +- .../Res}/Util/RandomGeneratorUtil.java | 2 +- .../java/com/dsideal/Res}/Util/RedisKit.java | 2 +- .../{aiSupport => Res}/Util/RetKit.java | 2 +- .../{aiSupport => Res}/Util/RocketMqKit.java | 4 ++-- .../{aiSupport => Res}/Util/RsaUtils.java | 2 +- .../Util/Suno/SunoMusicGenerator.java | 4 ++-- .../Util/TelNumGenerator.java | 2 +- dsRes/Dockerfile | 2 +- .../Base/Controller/BaseController.java | 10 +++++----- .../Base/Model/BaseModel.java | 2 +- .../Config/GatewayConfig.java | 4 ++-- .../Index/IndexController.java | 2 +- .../Interceptor/CheckIdsInterceptor.java | 6 +++--- .../Res}/Interceptor/CheckIdsInterface.java | 2 +- .../Interceptor/EmptyInterceptor.java | 4 ++-- .../Interceptor/EmptyInterface.java | 2 +- .../Res}/Interceptor/IsGuidInterceptor.java | 4 ++-- .../Res}/Interceptor/IsGuidInterface.java | 2 +- .../Interceptor/IsNumbericInterceptor.java | 6 +++--- .../Interceptor/IsNumericInterface.java | 2 +- .../Interceptor/IsSysAdminInterceptor.java | 4 ++-- .../Interceptor/IsSysAdminInterface.java | 2 +- .../Res}/Interceptor/LengthInterceptor.java | 4 ++-- .../Interceptor/LengthInterface.java | 2 +- .../{aiSupport => Res}/JApiDocsGenerator.java | 4 ++-- .../Plugin/PostmanDocPlugin.java | 2 +- .../com/dsideal/Res}/Plugin/YamlProp.java | 2 +- .../Res/Controller/ResourceController.java | 18 +++++++++--------- .../Res/Model/ResourceModel.java | 4 ++-- .../{aiSupport => Res}/ResApplication.java | 18 +++++++++--------- .../Test/TestUploadToMinio.java | 2 +- .../{aiSupport => Res}/Util/CommonUtil.java | 2 +- .../com/dsideal/Res}/Util/CookieUtil.java | 2 +- .../Util/ExcelExportUtil.java | 2 +- .../{aiSupport => Res}/Util/FileSizeUtil.java | 2 +- .../java/com/dsideal/Res}/Util/FileUtil.java | 2 +- .../{aiSupport => Res}/Util/HttpClient.java | 4 ++-- .../com/dsideal/Res}/Util/IDCardUtil.java | 2 +- .../Util/IdCardGenerator.java | 2 +- .../java/com/dsideal/Res}/Util/IpUtil.java | 2 +- .../{aiSupport => Res}/Util/JwtUtil.java | 4 ++-- .../{aiSupport => Res}/Util/LogBackLog.java | 2 +- .../Util/LogBackLogFactory.java | 2 +- .../{aiSupport => Res}/Util/MinioUtils.java | 6 +++--- .../com/dsideal/Res}/Util/PassWordUtil.java | 2 +- .../{aiSupport => Res}/Util/PkUtil.java | 2 +- .../Res}/Util/RandomGeneratorUtil.java | 2 +- .../java/com/dsideal/Res}/Util/RedisKit.java | 2 +- .../{aiSupport => Res}/Util/RetKit.java | 2 +- .../{aiSupport => Res}/Util/RsaUtils.java | 2 +- .../Util/TelNumGenerator.java | 2 +- 130 files changed, 213 insertions(+), 214 deletions(-) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/AiApplication.java (89%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Config/GatewayConfig.java (90%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Index/IndexController.java (79%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/CheckIdsInterceptor.java (92%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Interceptor/CheckIdsInterface.java (78%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/EmptyInterceptor.java (91%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/EmptyInterface.java (86%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Interceptor/IsGuidInterceptor.java (91%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Interceptor/IsGuidInterface.java (78%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsNumbericInterceptor.java (90%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsNumericInterface.java (78%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Interceptor/IsSysAdminInterceptor.java (91%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsSysAdminInterface.java (78%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Interceptor/LengthInterceptor.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/LengthInterface.java (77%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/JApiDocsGenerator.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Plugin/PostmanDocPlugin.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Plugin/RocketMQPlugin.java (86%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Plugin/YamlProp.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/AiPptDemo1.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/AiPptDemo2.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/AiPptDemo3.java (91%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/AiPptDemo4.java (92%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/Kit/ApiKit.java (99%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/AiPpt/Kit/HttpUtils.java (99%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/CommonUtil.java (93%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/CookieUtil.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/ImgSong.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/ImgSpeak.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/Kit/DashScopeCommon.java (67%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/Kit/VideoStyleEnum.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/DashScope/VideoStyleTransform.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/ExcelExportUtil.java (97%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/FileSizeUtil.java (96%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/FileUtil.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/HttpClient.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/HuoShanFangZhou/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/HuoShanFangZhou/Kit/HuoShanCommon.java (84%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/HuoShanFangZhou/Txt2Img.java (95%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/IDCardUtil.java (97%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/IdCardGenerator.java (98%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/IpUtil.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JiMeng/JmImg2Video.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JiMeng/JmTxt2Img.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JiMeng/JmTxt2Video.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JiMeng/Kit/JmCommon.java (97%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JiMeng/Kit/JmErrorCode.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/JwtUtil.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/Kit/KlCommon.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/Kit/KlErrorCode.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/KlAccount.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/KlImg2Video.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/KlTxt2Img.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/KeLing/KlTxt2Video.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Enum/SamplingMethod.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Enum/UltraTemplate.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Example/TextToImageUltra.png (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/Kit/LibLibCommon.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/LibImg2Img.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/LibTxt2Img.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/QueryModelVersion.java (94%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/UltraImg2Img.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Liblib/UltraTxt2Img.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/LogBackLog.java (93%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/LogBackLogFactory.java (85%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Midjourney/Doc/文档.txt (100%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Midjourney/Kit/MjCommon.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Midjourney/Txt2Img.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/MinioUtils.java (94%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/PassWordUtil.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/PkUtil.java (95%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/RandomGeneratorUtil.java (98%) rename {dsRes/src/main/java/com/dsideal/aiSupport => dsAi/src/main/java/com/dsideal/Res}/Util/RedisKit.java (95%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/RetKit.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/RocketMqKit.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/RsaUtils.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/Suno/SunoMusicGenerator.java (96%) rename dsAi/src/main/java/com/dsideal/{aiSupport => Res}/Util/TelNumGenerator.java (92%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Base/Controller/BaseController.java (94%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Base/Model/BaseModel.java (96%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Config/GatewayConfig.java (90%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Index/IndexController.java (79%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/CheckIdsInterceptor.java (92%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Interceptor/CheckIdsInterface.java (78%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/EmptyInterceptor.java (91%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/EmptyInterface.java (86%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Interceptor/IsGuidInterceptor.java (91%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Interceptor/IsGuidInterface.java (78%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsNumbericInterceptor.java (90%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsNumericInterface.java (78%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Interceptor/IsSysAdminInterceptor.java (91%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/IsSysAdminInterface.java (78%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Interceptor/LengthInterceptor.java (93%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Interceptor/LengthInterface.java (77%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/JApiDocsGenerator.java (96%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Plugin/PostmanDocPlugin.java (95%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Plugin/YamlProp.java (94%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Res/Controller/ResourceController.java (91%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Res/Model/ResourceModel.java (96%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/ResApplication.java (88%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Test/TestUploadToMinio.java (75%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/CommonUtil.java (96%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/CookieUtil.java (95%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/ExcelExportUtil.java (97%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/FileSizeUtil.java (96%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/FileUtil.java (94%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/HttpClient.java (96%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/IDCardUtil.java (97%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/IdCardGenerator.java (98%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/IpUtil.java (95%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/JwtUtil.java (94%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/LogBackLog.java (93%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/LogBackLogFactory.java (85%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/MinioUtils.java (94%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/PassWordUtil.java (95%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/PkUtil.java (95%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/RandomGeneratorUtil.java (98%) rename {dsAi/src/main/java/com/dsideal/aiSupport => dsRes/src/main/java/com/dsideal/Res}/Util/RedisKit.java (95%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/RetKit.java (96%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/RsaUtils.java (96%) rename dsRes/src/main/java/com/dsideal/{aiSupport => Res}/Util/TelNumGenerator.java (92%) diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java b/dsAi/src/main/java/com/dsideal/Res/AiApplication.java similarity index 89% rename from dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java rename to dsAi/src/main/java/com/dsideal/Res/AiApplication.java index afabf666..6c63f9fb 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/AiApplication.java +++ b/dsAi/src/main/java/com/dsideal/Res/AiApplication.java @@ -1,11 +1,11 @@ -package com.dsideal.aiSupport; - -import com.dsideal.aiSupport.Index.IndexController; -import com.dsideal.aiSupport.Interceptor.*; -import com.dsideal.aiSupport.Plugin.RocketMQPlugin; -import com.dsideal.aiSupport.Plugin.YamlProp; -import com.dsideal.aiSupport.Util.FileUtil; -import com.dsideal.aiSupport.Util.LogBackLogFactory; +package com.dsideal.Res; + +import com.dsideal.Res.Index.IndexController; +import com.dsideal.Res.Interceptor.*; +import com.dsideal.Res.Plugin.RocketMQPlugin; +import com.dsideal.Res.Plugin.YamlProp; +import com.dsideal.Res.Util.FileUtil; +import com.dsideal.Res.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java b/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java similarity index 90% rename from dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java rename to dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java index 23b15d4d..36b6f2b8 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java +++ b/dsAi/src/main/java/com/dsideal/Res/Config/GatewayConfig.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Config; +package com.dsideal.Res.Config; -import com.dsideal.aiSupport.AiApplication; +import com.dsideal.Res.AiApplication; import com.jfinal.kit.Prop; public class GatewayConfig { diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Index/IndexController.java b/dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java similarity index 79% rename from dsAi/src/main/java/com/dsideal/aiSupport/Index/IndexController.java rename to dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java index d74a7cc6..aed7441c 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Index/IndexController.java +++ b/dsAi/src/main/java/com/dsideal/Res/Index/IndexController.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Index; +package com.dsideal.Res.Index; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java index 2f09cbd4..74b42da1 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.CommonUtil; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.CommonUtil; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java similarity index 78% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java index ed2e7d5e..473d24a4 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java similarity index 91% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java index f13b8f9d..1cd988c8 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java similarity index 86% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java index a5fdd01a..c8608348 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java similarity index 91% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java index fc6341a8..5d350d4d 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java similarity index 78% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java index 0965e5e1..b81327fe 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java similarity index 90% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java index b70a2488..decdb2ec 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.CommonUtil; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.CommonUtil; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java similarity index 78% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java index ba6758b6..a88260e1 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java similarity index 91% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java index 45e3937e..48d89a75 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java similarity index 78% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java index f7247dcc..040957c4 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java similarity index 93% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java index cac44efc..f5684aaa 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java b/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java similarity index 77% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java rename to dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java index e26949b1..bfbd5f99 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java +++ b/dsAi/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java b/dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java rename to dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java index 125a2ee5..efee6c21 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Res/JApiDocsGenerator.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport; +package com.dsideal.Res; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Plugin.PostmanDocPlugin; +import com.dsideal.Res.Plugin.PostmanDocPlugin; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.jfinal.aop.Before; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java b/dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java rename to dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java index b2381798..f188860a 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java +++ b/dsAi/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Plugin; +package com.dsideal.Res.Plugin; import freemarker.template.Template; import freemarker.template.TemplateException; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java b/dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java similarity index 86% rename from dsAi/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java rename to dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java index d2e2d840..3cf7042d 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/RocketMQPlugin.java +++ b/dsAi/src/main/java/com/dsideal/Res/Plugin/RocketMQPlugin.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Plugin; +package com.dsideal.Res.Plugin; -import com.dsideal.aiSupport.Util.RocketMqKit; +import com.dsideal.Res.Util.RocketMqKit; import com.jfinal.plugin.IPlugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java b/dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java rename to dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java index 28f6ef29..6828b1fe 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java +++ b/dsAi/src/main/java/com/dsideal/Res/Plugin/YamlProp.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Plugin; +package com.dsideal.Res.Plugin; import com.jfinal.kit.Prop; import org.yaml.snakeyaml.Yaml; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java index 6d460d56..5265704c 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo1.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo1.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.AiPpt; +package com.dsideal.Res.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.AiPpt.Kit.ApiKit; -import com.dsideal.aiSupport.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java index 8a4ea1ed..359a2780 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo2.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo2.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.AiPpt; +package com.dsideal.Res.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.AiPpt.Kit.ApiKit; -import com.dsideal.aiSupport.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java similarity index 91% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java index d5b194a3..97350ca8 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo3.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo3.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.AiPpt; +package com.dsideal.Res.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.AiPpt.Kit.ApiKit; -import com.dsideal.aiSupport.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java index c0521859..e1ffeb49 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/AiPptDemo4.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/AiPptDemo4.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.AiPpt; +package com.dsideal.Res.Util.AiPpt; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.AiPpt.Kit.ApiKit; -import com.dsideal.aiSupport.Util.AiPpt.Kit.HttpUtils; +import com.dsideal.Res.Util.AiPpt.Kit.ApiKit; +import com.dsideal.Res.Util.AiPpt.Kit.HttpUtils; import javax.swing.filechooser.FileSystemView; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java similarity index 99% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java index 234a5581..91b3a73c 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/ApiKit.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.AiPpt.Kit; +package com.dsideal.Res.Util.AiPpt.Kit; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java similarity index 99% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java rename to dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java index d387eb78..82668a9f 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/HttpUtils.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/AiPpt/Kit/HttpUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.AiPpt.Kit; +package com.dsideal.Res.Util.AiPpt.Kit; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java index e6e9cd49..fd294641 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java index ade40e8a..b2e157a2 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/CookieUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java index 961f8f01..452623ef 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSong.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.DashScope; +package com.dsideal.Res.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java index 56dc322a..49d70e4f 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/ImgSpeak.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.DashScope; +package com.dsideal.Res.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java similarity index 67% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java index dc68a997..6a646bfb 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/DashScopeCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.DashScope.Kit; +package com.dsideal.Res.Util.DashScope.Kit; public class DashScopeCommon { protected static final String API_KEY= "sk-01d13a39e09844038322108ecdbd1bbc"; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java index b954294d..6921ebf6 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/VideoStyleEnum.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/Kit/VideoStyleEnum.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.DashScope.Kit; +package com.dsideal.Res.Util.DashScope.Kit; /** * 阿里云达摩院视频风格转换类型枚举 diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java rename to dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java index b670298e..f580ccba 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/DashScope/VideoStyleTransform.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.DashScope; +package com.dsideal.Res.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; -import com.dsideal.aiSupport.Util.DashScope.Kit.VideoStyleEnum; +import com.dsideal.Res.Util.DashScope.Kit.DashScopeCommon; +import com.dsideal.Res.Util.DashScope.Kit.VideoStyleEnum; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java index 916b9375..e0cc0f21 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java index 37aa7551..ea0deb6e 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.io.File; import java.io.FileInputStream; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java index c67fdbaa..0377e481 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/FileUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONObject; import java.io.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java b/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java rename to dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java index 6bbec5ce..cff0fb53 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/HttpClient.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; -import com.dsideal.aiSupport.Config.GatewayConfig; +import com.dsideal.Res.Config.GatewayConfig; import okhttp3.*; import java.io.IOException; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java similarity index 84% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java index da793ade..b7eb8a87 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Kit/HuoShanCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Kit/HuoShanCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.HuoShanFangZhou.Kit; +package com.dsideal.Res.Util.HuoShanFangZhou.Kit; public class HuoShanCommon { //火山方舟大模型 diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java index 7aeed2e1..42c0fbb4 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/HuoShanFangZhou/Txt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/HuoShanFangZhou/Txt2Img.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.HuoShanFangZhou; +package com.dsideal.Res.Util.HuoShanFangZhou; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.HuoShanFangZhou.Kit.HuoShanCommon; +import com.dsideal.Res.Util.HuoShanFangZhou.Kit.HuoShanCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java index 3f144ae2..30ca9429 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/IDCardUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java b/dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java similarity index 98% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java rename to dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java index f5acb7b2..a136de60 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.util.Calendar; import java.util.Collection; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java index 54e1ec37..aff571d5 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/IpUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java index 871e8b51..d865b763 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmImg2Video.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmImg2Video.java @@ -1,10 +1,10 @@ -package com.dsideal.aiSupport.Util.JiMeng; +package com.dsideal.Res.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmCommon; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java index 0c856ec7..c8005cfd 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.JiMeng; +package com.dsideal.Res.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmCommon; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java index 7294c745..b5df0778 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/JmTxt2Video.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/JmTxt2Video.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.JiMeng; +package com.dsideal.Res.Util.JiMeng; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmCommon; -import com.dsideal.aiSupport.Util.JiMeng.Kit.JmErrorCode; +import com.dsideal.Res.Util.JiMeng.Kit.JmCommon; +import com.dsideal.Res.Util.JiMeng.Kit.JmErrorCode; import com.jfinal.kit.StrKit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java index b541cb16..8f0eeea3 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.JiMeng.Kit; +package com.dsideal.Res.Util.JiMeng.Kit; import cn.hutool.http.Method; import com.alibaba.fastjson.JSON; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java index 74317b0d..b438d0c6 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmErrorCode.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JiMeng/Kit/JmErrorCode.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.JiMeng.Kit; +package com.dsideal.Res.Util.JiMeng.Kit; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java index 8c263386..81b6fe6a 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; -import com.dsideal.aiSupport.AiApplication; +import com.dsideal.Res.AiApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java index 96937656..70633303 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.KeLing.Kit; +package com.dsideal.Res.Util.KeLing.Kit; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java index 132d6232..1eefd33a 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlErrorCode.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/Kit/KlErrorCode.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.KeLing.Kit; +package com.dsideal.Res.Util.KeLing.Kit; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java index 47970564..be82275d 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlAccount.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlAccount.java @@ -1,12 +1,12 @@ -package com.dsideal.aiSupport.Util.KeLing; +package com.dsideal.Res.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlCommon; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Res.Util.KeLing.Kit.KlCommon; +import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; import lombok.Getter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java index c8af43db..d41748e0 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlImg2Video.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlImg2Video.java @@ -1,12 +1,12 @@ -package com.dsideal.aiSupport.Util.KeLing; +package com.dsideal.Res.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlCommon; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Res.Util.KeLing.Kit.KlCommon; +import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java index 1f81b8eb..1d674b78 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Img.java @@ -1,12 +1,12 @@ -package com.dsideal.aiSupport.Util.KeLing; +package com.dsideal.Res.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlCommon; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Res.Util.KeLing.Kit.KlCommon; +import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java rename to dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java index 25987665..7d691338 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/KeLing/KlTxt2Video.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/KeLing/KlTxt2Video.java @@ -1,12 +1,12 @@ -package com.dsideal.aiSupport.Util.KeLing; +package com.dsideal.Res.Util.KeLing; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlCommon; -import com.dsideal.aiSupport.Util.KeLing.Kit.KlErrorCode; +import com.dsideal.Res.Util.KeLing.Kit.KlCommon; +import com.dsideal.Res.Util.KeLing.Kit.KlErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java index 7c77a22d..3227cf94 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/SamplingMethod.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/SamplingMethod.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.Liblib.Enum; +package com.dsideal.Res.Util.Liblib.Enum; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java index e1047a72..5bde4a19 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Enum/UltraTemplate.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.Liblib.Enum; +package com.dsideal.Res.Util.Liblib.Enum; import lombok.Getter; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Example/TextToImageUltra.png rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java index a3d697f4..23d36ed0 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/Kit/LibLibCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.Liblib.Kit; +package com.dsideal.Res.Util.Liblib.Kit; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java index 7f516ddf..086bdfa0 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibImg2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibImg2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.Liblib; +package com.dsideal.Res.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java index 21a61e5f..756b6474 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/LibTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/LibTxt2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.Liblib; +package com.dsideal.Res.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.TimeUnit; /** * LibLib 文生图API工具类 diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java index f7d7f577..aa64a6cb 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/QueryModelVersion.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/QueryModelVersion.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.Liblib; +package com.dsideal.Res.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java index 32b302e9..e0c8b805 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraImg2Img.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Util.Liblib; +package com.dsideal.Res.Util.Liblib; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.Liblib.Enum.UltraTemplate; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Res.Util.Liblib.Enum.UltraTemplate; +import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java index 4c111c7f..b86237f3 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraTxt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Liblib/UltraTxt2Img.java @@ -1,8 +1,8 @@ -package com.dsideal.aiSupport.Util.Liblib; +package com.dsideal.Res.Util.Liblib; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Util.Liblib.Enum.UltraTemplate; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; +import com.dsideal.Res.Util.Liblib.Enum.UltraTemplate; +import com.dsideal.Res.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java b/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java rename to dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java index 8f2e6c8a..6fdf4e7e 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLog.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java b/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java similarity index 85% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java rename to dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java index 5fbc8356..3d712f9e 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt b/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Doc/文档.txt similarity index 100% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Doc/文档.txt rename to dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Doc/文档.txt diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java b/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java index c73f560e..6938ace2 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Kit/MjCommon.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.Midjourney.Kit; +package com.dsideal.Res.Util.Midjourney.Kit; import cn.hutool.core.io.FileUtil; import cn.hutool.http.HttpUtil; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java b/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java index 73c88158..717c9d75 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Txt2Img.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Midjourney/Txt2Img.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util.Midjourney; +package com.dsideal.Res.Util.Midjourney; -import com.dsideal.aiSupport.Util.Midjourney.Kit.MjCommon; +import com.dsideal.Res.Util.Midjourney.Kit.MjCommon; import lombok.SneakyThrows; import okhttp3.*; import com.alibaba.fastjson.JSON; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java b/dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java rename to dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java index 16754754..462a5e76 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/MinioUtils.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import cn.hutool.core.io.FileUtil; -import com.dsideal.aiSupport.Plugin.YamlProp; +import com.dsideal.Res.Plugin.YamlProp; import com.jfinal.kit.PathKit; import com.jfinal.kit.Prop; import io.minio.GetPresignedObjectUrlArgs; @@ -16,7 +16,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import static com.dsideal.aiSupport.AiApplication.getEnvPrefix; +import static com.dsideal.Res.AiApplication.getEnvPrefix; public class MinioUtils { public static Prop PropKit; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java index 3d86dee0..64111cac 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/PassWordUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java index 23ae2663..3c79898d 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/PkUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java rename to dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java index 9100b40b..9a18f4ed 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.util.HashMap; import java.util.Map; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java b/dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java rename to dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java index 0f7facef..8d95731a 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RedisKit.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.plugin.redis.Redis; import redis.clients.jedis.Pipeline; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RetKit.java b/dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/RetKit.java rename to dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java index 505fb6e5..754def6e 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RetKit.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RetKit.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Page; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java b/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java rename to dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java index bb43d936..f74352ab 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RocketMqKit.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RocketMqKit.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; -import com.dsideal.aiSupport.AiApplication; +import com.dsideal.Res.AiApplication; import org.apache.rocketmq.client.consumer.DefaultLitePullConsumer; import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.client.producer.SendCallback; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java b/dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java rename to dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java index e21dd754..bf379e86 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/RsaUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import cn.hutool.core.codec.Base64; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java b/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java similarity index 96% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java rename to dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java index d49287da..13985a33 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/Suno/SunoMusicGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/Suno/SunoMusicGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util.Suno; +package com.dsideal.Res.Util.Suno; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static com.dsideal.aiSupport.AiApplication.PropKit; +import static com.dsideal.Res.AiApplication.PropKit; public class SunoMusicGenerator { diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java b/dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java similarity index 92% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java rename to dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java index 299871ab..bd3c9b1d 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; public class TelNumGenerator { diff --git a/dsRes/Dockerfile b/dsRes/Dockerfile index 4ed9a5db..74195cb5 100644 --- a/dsRes/Dockerfile +++ b/dsRes/Dockerfile @@ -20,4 +20,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx1024m" # 标识为生产环境 ENV WORKING_ENV="pro" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.aiSupport.ResApplication" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/target/classes:/root/lib/* com.dsideal.Res.ResApplication" ] diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Base/Controller/BaseController.java b/dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/aiSupport/Base/Controller/BaseController.java rename to dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java index 214f5d2b..d9bbfa68 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Base/Controller/BaseController.java +++ b/dsRes/src/main/java/com/dsideal/Res/Base/Controller/BaseController.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport.Base.Controller; +package com.dsideal.Res.Base.Controller; -import com.dsideal.aiSupport.Base.Model.BaseModel; -import com.dsideal.aiSupport.Interceptor.EmptyInterface; -import com.dsideal.aiSupport.Interceptor.IsNumericInterface; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Base.Model.BaseModel; +import com.dsideal.Res.Interceptor.EmptyInterface; +import com.dsideal.Res.Interceptor.IsNumericInterface; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Base/Model/BaseModel.java b/dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Base/Model/BaseModel.java rename to dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java index 8aeb078d..a7093fea 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Base/Model/BaseModel.java +++ b/dsRes/src/main/java/com/dsideal/Res/Base/Model/BaseModel.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Base.Model; +package com.dsideal.Res.Base.Model; import com.jfinal.kit.Kv; import com.jfinal.plugin.activerecord.Db; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java b/dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java similarity index 90% rename from dsRes/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java rename to dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java index aff6a189..0283cd8b 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Config/GatewayConfig.java +++ b/dsRes/src/main/java/com/dsideal/Res/Config/GatewayConfig.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Config; +package com.dsideal.Res.Config; -import com.dsideal.aiSupport.ResApplication; +import com.dsideal.Res.ResApplication; import com.jfinal.kit.Prop; public class GatewayConfig { diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Index/IndexController.java b/dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java similarity index 79% rename from dsRes/src/main/java/com/dsideal/aiSupport/Index/IndexController.java rename to dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java index d74a7cc6..aed7441c 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Index/IndexController.java +++ b/dsRes/src/main/java/com/dsideal/Res/Index/IndexController.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Index; +package com.dsideal.Res.Index; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java index 2f09cbd4..74b42da1 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.CommonUtil; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.CommonUtil; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java similarity index 78% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java index ed2e7d5e..473d24a4 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/CheckIdsInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/CheckIdsInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java similarity index 91% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java index f13b8f9d..1cd988c8 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java similarity index 86% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java index a5fdd01a..c8608348 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/EmptyInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/EmptyInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java similarity index 91% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java index fc6341a8..5d350d4d 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java similarity index 78% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java index 0965e5e1..b81327fe 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsGuidInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsGuidInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java similarity index 90% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java index b70a2488..decdb2ec 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumbericInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumbericInterceptor.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.CommonUtil; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.CommonUtil; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java similarity index 78% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java index ba6758b6..a88260e1 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsNumericInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsNumericInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java similarity index 91% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java index 45e3937e..48d89a75 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java similarity index 78% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java index f7247dcc..040957c4 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/IsSysAdminInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/IsSysAdminInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java similarity index 93% rename from dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java index cac44efc..f5684aaa 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterceptor.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java b/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java similarity index 77% rename from dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java rename to dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java index e26949b1..bfbd5f99 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Interceptor/LengthInterface.java +++ b/dsRes/src/main/java/com/dsideal/Res/Interceptor/LengthInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Interceptor; +package com.dsideal.Res.Interceptor; import java.lang.annotation.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java b/dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java rename to dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java index 125a2ee5..efee6c21 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/JApiDocsGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Res/JApiDocsGenerator.java @@ -1,9 +1,9 @@ -package com.dsideal.aiSupport; +package com.dsideal.Res; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Plugin.PostmanDocPlugin; +import com.dsideal.Res.Plugin.PostmanDocPlugin; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.jfinal.aop.Before; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java b/dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java rename to dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java index b2381798..f188860a 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Plugin/PostmanDocPlugin.java +++ b/dsRes/src/main/java/com/dsideal/Res/Plugin/PostmanDocPlugin.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Plugin; +package com.dsideal.Res.Plugin; import freemarker.template.Template; import freemarker.template.TemplateException; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java b/dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java rename to dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java index 28f6ef29..6828b1fe 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Plugin/YamlProp.java +++ b/dsRes/src/main/java/com/dsideal/Res/Plugin/YamlProp.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Plugin; +package com.dsideal.Res.Plugin; import com.jfinal.kit.Prop; import org.yaml.snakeyaml.Yaml; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Res/Controller/ResourceController.java b/dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java similarity index 91% rename from dsRes/src/main/java/com/dsideal/aiSupport/Res/Controller/ResourceController.java rename to dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java index 9135a41d..1e3b4f06 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Res/Controller/ResourceController.java +++ b/dsRes/src/main/java/com/dsideal/Res/Res/Controller/ResourceController.java @@ -1,13 +1,13 @@ -package com.dsideal.aiSupport.Res.Controller; +package com.dsideal.Res.Res.Controller; -import com.dsideal.aiSupport.Base.Model.BaseModel; -import com.dsideal.aiSupport.Interceptor.EmptyInterface; -import com.dsideal.aiSupport.Interceptor.IsNumericInterface; -import com.dsideal.aiSupport.Res.Model.ResourceModel; -import com.dsideal.aiSupport.Util.CommonUtil; -import com.dsideal.aiSupport.Util.JwtUtil; -import com.dsideal.aiSupport.Util.MinioUtils; -import com.dsideal.aiSupport.Util.RetKit; +import com.dsideal.Res.Base.Model.BaseModel; +import com.dsideal.Res.Interceptor.EmptyInterface; +import com.dsideal.Res.Interceptor.IsNumericInterface; +import com.dsideal.Res.Res.Model.ResourceModel; +import com.dsideal.Res.Util.CommonUtil; +import com.dsideal.Res.Util.JwtUtil; +import com.dsideal.Res.Util.MinioUtils; +import com.dsideal.Res.Util.RetKit; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Res/Model/ResourceModel.java b/dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Res/Model/ResourceModel.java rename to dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java index 07a5456f..45541c0b 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Res/Model/ResourceModel.java +++ b/dsRes/src/main/java/com/dsideal/Res/Res/Model/ResourceModel.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Res.Model; +package com.dsideal.Res.Res.Model; import cn.hutool.core.date.DateTime; -import com.dsideal.aiSupport.ResApplication; +import com.dsideal.Res.ResApplication; import com.jfinal.kit.Kv; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Db; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/ResApplication.java b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java similarity index 88% rename from dsRes/src/main/java/com/dsideal/aiSupport/ResApplication.java rename to dsRes/src/main/java/com/dsideal/Res/ResApplication.java index a71e2b66..16c01f30 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/Res/ResApplication.java @@ -1,12 +1,12 @@ -package com.dsideal.aiSupport; - -import com.dsideal.aiSupport.Base.Controller.BaseController; -import com.dsideal.aiSupport.Index.IndexController; -import com.dsideal.aiSupport.Interceptor.*; -import com.dsideal.aiSupport.Plugin.YamlProp; -import com.dsideal.aiSupport.Res.Controller.ResourceController; -import com.dsideal.aiSupport.Util.FileUtil; -import com.dsideal.aiSupport.Util.LogBackLogFactory; +package com.dsideal.Res; + +import com.dsideal.Res.Base.Controller.BaseController; +import com.dsideal.Res.Index.IndexController; +import com.dsideal.Res.Interceptor.*; +import com.dsideal.Res.Plugin.YamlProp; +import com.dsideal.Res.Res.Controller.ResourceController; +import com.dsideal.Res.Util.FileUtil; +import com.dsideal.Res.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.Prop; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Test/TestUploadToMinio.java b/dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java similarity index 75% rename from dsRes/src/main/java/com/dsideal/aiSupport/Test/TestUploadToMinio.java rename to dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java index 65745a75..36223c22 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Test/TestUploadToMinio.java +++ b/dsRes/src/main/java/com/dsideal/Res/Test/TestUploadToMinio.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Test; +package com.dsideal.Res.Test; import com.jfinal.kit.Prop; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java index 2516e542..1aebc8d0 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/CommonUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java index ade40e8a..b2e157a2 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/CookieUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/CookieUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java similarity index 97% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java index 916b9375..e0cc0f21 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/ExcelExportUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/ExcelExportUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java index 37aa7551..ea0deb6e 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/FileSizeUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/FileSizeUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.io.File; import java.io.FileInputStream; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java similarity index 94% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java index c67fdbaa..0377e481 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/FileUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/FileUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONObject; import java.io.*; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java b/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java rename to dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java index 1540e268..23edb4ad 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/HttpClient.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/HttpClient.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; -import com.dsideal.aiSupport.Config.GatewayConfig; +import com.dsideal.Res.Config.GatewayConfig; import okhttp3.*; import java.io.File; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java similarity index 97% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java index 3f144ae2..30ca9429 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IDCardUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/IDCardUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.alibaba.fastjson.JSONObject; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java b/dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java similarity index 98% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java rename to dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java index f5acb7b2..a136de60 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/IdCardGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/IdCardGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.util.Calendar; import java.util.Collection; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java index 54e1ec37..aff571d5 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/IpUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/IpUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java index 596c3526..d65cb46d 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/JwtUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java @@ -1,6 +1,6 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; -import com.dsideal.aiSupport.ResApplication; +import com.dsideal.Res.ResApplication; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java b/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java similarity index 93% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java rename to dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java index 8f2e6c8a..6fdf4e7e 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLog.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLog.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java b/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java similarity index 85% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java rename to dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java index 5fbc8356..3d712f9e 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/LogBackLogFactory.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java b/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java similarity index 94% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java rename to dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java index e5a5f4ab..04401cf2 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/MinioUtils.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/MinioUtils.java @@ -1,7 +1,7 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import cn.hutool.core.io.FileUtil; -import com.dsideal.aiSupport.Plugin.YamlProp; +import com.dsideal.Res.Plugin.YamlProp; import com.jfinal.kit.PathKit; import com.jfinal.kit.Prop; import io.minio.GetPresignedObjectUrlArgs; @@ -16,7 +16,7 @@ import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import static com.dsideal.aiSupport.ResApplication.getEnvPrefix; +import static com.dsideal.Res.ResApplication.getEnvPrefix; public class MinioUtils { public static Prop PropKit; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java index 3d86dee0..64111cac 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/PassWordUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/PassWordUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java similarity index 95% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java index 23ae2663..3c79898d 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/PkUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/PkUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java similarity index 98% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java rename to dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java index 9100b40b..9a18f4ed 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RandomGeneratorUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/RandomGeneratorUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import java.util.HashMap; import java.util.Map; diff --git a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java b/dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java similarity index 95% rename from dsAi/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java rename to dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java index 0f7facef..8d95731a 100644 --- a/dsAi/src/main/java/com/dsideal/aiSupport/Util/RedisKit.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/RedisKit.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.plugin.redis.Redis; import redis.clients.jedis.Pipeline; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RetKit.java b/dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/RetKit.java rename to dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java index 505fb6e5..754def6e 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RetKit.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/RetKit.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Page; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java b/dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java similarity index 96% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java rename to dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java index e21dd754..bf379e86 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/RsaUtils.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/RsaUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; import cn.hutool.core.codec.Base64; diff --git a/dsRes/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java b/dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java similarity index 92% rename from dsRes/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java rename to dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java index 299871ab..bd3c9b1d 100644 --- a/dsRes/src/main/java/com/dsideal/aiSupport/Util/TelNumGenerator.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/TelNumGenerator.java @@ -1,4 +1,4 @@ -package com.dsideal.aiSupport.Util; +package com.dsideal.Res.Util; public class TelNumGenerator {