diff --git a/dsAi/pom.xml b/dsAi/pom.xml index 46c6992c..a6ec8d02 100644 --- a/dsAi/pom.xml +++ b/dsAi/pom.xml @@ -58,7 +58,7 @@ commons-io commons-io - 2.15.0 + ${commons-io.version} @@ -182,12 +182,12 @@ io.jsonwebtoken jjwt-api - ${jsonwebtoken.version} + ${jjwt.version} io.jsonwebtoken jjwt-impl - ${jsonwebtoken.version} + ${jjwt.version} runtime diff --git a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java index f91e4a0b..4c7e189c 100644 --- a/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java +++ b/dsAi/src/main/java/com/dsideal/Res/Util/JwtUtil.java @@ -52,12 +52,13 @@ public class JwtUtil { } Claims claims; try { - claims = Jwts.parserBuilder() - .setSigningKey(key) + claims = Jwts.parser() + .verifyWith(key) .build() - .parseClaimsJws(token) - .getBody(); + .parseSignedClaims(token) + .getPayload(); } catch (Exception e) { + System.out.println(e.toString()); claims = null; } return claims; diff --git a/dsAi/target/classes/com/dsideal/Res/Util/AiPpt/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/AiPpt/Doc/文档.txt deleted file mode 100644 index cfd6e929..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/AiPpt/Doc/文档.txt +++ /dev/null @@ -1,16 +0,0 @@ -# 官网 -https://docmee.cn/ - -# 用户名与密码 -18686619970 -密码：手机验证码 - -# 体验 -https://www.veasion.cn/AiPPT/ - -# 充值 -https://open.docmee.cn/open/workspace/top-up -未充值 - -# 模板选择【展示】 -https://dsideal.obs.cn-north-1.myhuaweicloud.com/HuangHai/BlogImages/202505131336410.png \ No newline at end of file diff --git a/dsAi/target/classes/com/dsideal/Res/Util/DashScope/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/DashScope/Doc/文档.txt deleted file mode 100644 index 54df7a91..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/DashScope/Doc/文档.txt +++ /dev/null @@ -1 +0,0 @@ -https://help.aliyun.com/zh/model-studio/emo-api?spm=a2c4g.11186623.help-menu-2400256.d_2_3_4_1.7d8a5f84mfOU9j \ No newline at end of file diff --git a/dsAi/target/classes/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt deleted file mode 100644 index 49439e6c..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/HuoShanFangZhou/Doc/文档.txt +++ /dev/null @@ -1 +0,0 @@ -https://www.volcengine.com/docs/82379/1520757 \ No newline at end of file diff --git a/dsAi/target/classes/com/dsideal/Res/Util/KeLing/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/KeLing/Doc/文档.txt deleted file mode 100644 index c5637d46..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/KeLing/Doc/文档.txt +++ /dev/null @@ -1,9 +0,0 @@ -# 可灵AI使用指南－图片生成 -https://docs.qingque.cn/d/home/eZQApd0EZqQHWXBEi7lL16_lD?identityId=26L1FFNIZ7r#section=h.60mmflz96wnl - -# 可灵控制台 -https://console-cn.klingai.com/console/expense-center/resource-pack-manage - -# 登录 -18686619970 -获取验证码登录 diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Doc/文档.txt deleted file mode 100644 index 814e0c5f..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Doc/文档.txt +++ /dev/null @@ -1,39 +0,0 @@ -# 官网 -https://www.liblib.art/apis - -# 账号 -18686619970 -手机验证码登录 - -# 访问凭证 -AK: sOCtVLVTNOZkRMajlhzCmg -SK: PUe8QTRG9i0G9EbpedHmIpLQ0FyxoYY9 - - -# 接口文档 -https://liblibai.feishu.cn/wiki/UAMVw67NcifQHukf8fpccgS5n6d - - -计划 -API试用计划 -到期时间 -2025/05/22 23:59:59 -剩余积分 -500 -购买积分 -并发任务数 -1个 - - -# LiblibAI工作流 -社区商用工作流和个人本地工作流均可支持调用。工作流挑选和商用查询可至https://www.liblib.art/workflows - -# - 星流Star-3 Alpha：适合对AI生图参数不太了解或不想复杂控制的用户。搭载自带LoRA推荐算法，对自然语言的精准响应，提供极致的图像质量，能够生成具有照片级真实感的视觉效果，不能自由添加LoRA，仅支持部分ControlNet。生图效果可至星流官网https://xingliu.art/体验。 - -# - LiblibAI自定义模型：若需要特定LoRA和ControlNet只能选此模式，适合高度自由、精准控制和特定风格的场景，基于F.1/XL/v3/v1.5等基础算法，支持自定义调用LiblibAI内全量30万+可商用模型和任意私有模型。最新开源模型和插件第一时间更新。模型挑选和商用查询可至本文档3.1或https://www.liblib.art/。 - - -# 参考文档 -https://liblibai.feishu.cn/wiki/UAMVw67NcifQHukf8fpccgS5n6d - -https://www.liblib.art/workflows \ No newline at end of file diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png deleted file mode 100644 index d554c372..00000000 Binary files a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/019dba57244f2682e672a8a1ce9d50536e85f130a1142d19755c8266d4a8577c.png and /dev/null differ diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png deleted file mode 100644 index 6dbce122..00000000 Binary files a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/1e458ad4a7f30e853acff80f4723f42638c21205f0ff2d64898589dd994f1f94.png and /dev/null differ diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png deleted file mode 100644 index 23a74482..00000000 Binary files a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/53ea797eeb6f5adafdfdeb3fc9918e200fb8b716e1773cebe54535b36adb5134.png and /dev/null differ diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png deleted file mode 100644 index cb1d4ce3..00000000 Binary files a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/7d6679969e1c6e014d37710935c2603b40b7217e14bc5003ea2ca8331e9ef40d.png and /dev/null differ diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png b/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png deleted file mode 100644 index a8b744c9..00000000 Binary files a/dsAi/target/classes/com/dsideal/Res/Util/Liblib/Example/TextToImageUltra.png and /dev/null differ diff --git a/dsAi/target/classes/com/dsideal/Res/Util/Midjourney/Doc/文档.txt b/dsAi/target/classes/com/dsideal/Res/Util/Midjourney/Doc/文档.txt deleted file mode 100644 index d7149319..00000000 --- a/dsAi/target/classes/com/dsideal/Res/Util/Midjourney/Doc/文档.txt +++ /dev/null @@ -1,3 +0,0 @@ -https://goapi.gptnb.ai/account/profile -littlehb -mdcija780522 \ No newline at end of file diff --git a/dsAi/target/classes/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg b/dsAi/target/classes/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg deleted file mode 100644 index 2238c6bf..00000000 Binary files a/dsAi/target/classes/com/dsideal/aiSupport/Util/JiMeng/Example/Text2Img.jpg and /dev/null differ diff --git a/dsBase/pom.xml b/dsBase/pom.xml index 1a1d3dad..3d40fd93 100644 --- a/dsBase/pom.xml +++ b/dsBase/pom.xml @@ -12,100 +12,18 @@ dsBase - - - com.jfinal - jfinal - ${jfinal.version} - - - com.jfinal - jfinal-undertow - ${jfinal-undertow.version} - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-simple - - - - - com.jfinal - cos - ${jfinal-cos.version} - - - - - com.alibaba - druid - ${druid.version} - - - com.mysql - mysql-connector-j - ${mysql.version} - - - - - cn.hutool - hutool-all - ${hutool.version} - - - com.alibaba - fastjson - ${fastjson.version} - - - org.jsoup - jsoup - ${jsoup.version} - - - commons-io - commons-io - ${commons-io.version} - - - org.apache.commons - commons-email - ${commons-email.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - org.dom4j - dom4j - ${dom4j.version} - - - org.yaml - snakeyaml - ${snakeyaml.version} - + net.coobird thumbnailator ${thumbnailator.version} - - - + org.slf4j slf4j-api ${slf4j.version} - ch.qos.logback @@ -123,28 +41,22 @@ ${logback.version} - - - io.github.yedaxia - japidocs - ${japidocs.version} - io.jsonwebtoken jjwt-api - ${jsonwebtoken.version} + ${jjwt.version} io.jsonwebtoken jjwt-impl - ${jsonwebtoken.version} + ${jjwt.version} runtime io.jsonwebtoken jjwt-jackson - ${jsonwebtoken.version} + ${jjwt.version} runtime diff --git a/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java b/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java index 2afeee06..9b0c10cb 100644 --- a/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java +++ b/dsBase/src/main/java/com/dsideal/Base/Util/JwtUtil.java @@ -51,12 +51,13 @@ public class JwtUtil { } Claims claims; try { - claims = Jwts.parserBuilder() - .setSigningKey(key) + claims = Jwts.parser() + .verifyWith(key) .build() - .parseClaimsJws(token) - .getBody(); + .parseSignedClaims(token) + .getPayload(); } catch (Exception e) { + System.out.println(e); claims = null; } return claims; diff --git a/dsGw/pom.xml b/dsGw/pom.xml index 124f61b0..1fb89a7a 100644 --- a/dsGw/pom.xml +++ b/dsGw/pom.xml @@ -116,18 +116,18 @@ io.jsonwebtoken jjwt-api - ${jsonwebtoken.version} + ${jjwt.version} io.jsonwebtoken jjwt-impl - ${jsonwebtoken.version} + ${jjwt.version} runtime io.jsonwebtoken jjwt-jackson - 0.11.5 + ${jjwt.version} runtime diff --git a/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java b/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java index 0c8d224e..d5df583c 100644 --- a/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java +++ b/dsGw/src/main/java/com/dsideal/gw/Util/JwtUtil.java @@ -51,11 +51,11 @@ public class JwtUtil { } Claims claims; try { - claims = Jwts.parserBuilder() - .setSigningKey(key) + claims = Jwts.parser() + .verifyWith(key) .build() - .parseClaimsJws(token) - .getBody(); + .parseSignedClaims(token) + .getPayload(); } catch (Exception e) { System.out.println(e.toString()); claims = null; diff --git a/dsRes/pom.xml b/dsRes/pom.xml index 2929281e..332a7bf4 100644 --- a/dsRes/pom.xml +++ b/dsRes/pom.xml @@ -171,12 +171,12 @@ io.jsonwebtoken jjwt-api - ${jsonwebtoken.version} + ${jjwt.version} io.jsonwebtoken jjwt-impl - ${jsonwebtoken.version} + ${jjwt.version} runtime diff --git a/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java b/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java index 87dc6037..91794942 100644 --- a/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java +++ b/dsRes/src/main/java/com/dsideal/Res/Util/JwtUtil.java @@ -52,12 +52,13 @@ public class JwtUtil { } Claims claims; try { - claims = Jwts.parserBuilder() - .setSigningKey(key) + claims = Jwts.parser() + .verifyWith(key) .build() - .parseClaimsJws(token) - .getBody(); + .parseSignedClaims(token) + .getPayload(); } catch (Exception e) { + System.out.println(e); claims = null; } return claims; diff --git a/dsSso/pom.xml b/dsSso/pom.xml index 0b48365f..dfbe7e49 100644 --- a/dsSso/pom.xml +++ b/dsSso/pom.xml @@ -117,7 +117,7 @@ com.google.code.gson gson - 2.8.8 + ${gson.version} diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml index 6675b027..98af5922 100644 --- a/dsUtils/pom.xml +++ b/dsUtils/pom.xml @@ -36,11 +36,7 @@ snakeyaml ${snakeyaml.version} - - cn.smallbun.screw - screw-core - 1.0.5 - + com.mysql mysql-connector-j @@ -58,78 +54,75 @@ fastjson ${fastjson.version} - org.jsoup jsoup - 1.17.2 + ${jsoup.version} com.google.code.gson gson - 2.10.1 + ${gson.version} commons-io commons-io - 2.14.0 + ${commons-io.version} + + + cn.smallbun.screw + screw-core + ${screw-core.version} org.apache.commons commons-email - 1.5 + ${commons-email.version} org.apache.commons commons-lang3 - 3.12.0 + ${commons-lang3.version} org.dom4j dom4j - 2.1.4 + ${dom4j.version} - - + - org.slf4j - slf4j-api - ${slf4j.version} + io.github.yedaxia + japidocs + ${japidocs.version} - - - ch.qos.logback - logback-classic - ${logback.version} - com.fasterxml.jackson.core jackson-core - 2.17.2 + ${jackson-core.version} com.fasterxml.jackson.core jackson-databind - 2.17.2 + ${jackson-databind.version} com.github.mwiede jsch - 0.2.19 + ${jsch.version} org.freemarker freemarker - 2.3.33 + ${freemarker.version} com.alibaba diff --git a/pom.xml b/pom.xml index 076841dd..3edef286 100644 --- a/pom.xml +++ b/pom.xml @@ -85,32 +85,34 @@ 2.1.4 2.3.3 1.1.1 - + 2.19.0 + 2.19.0 5.2.5 1.1.0 - + 2.3.34 + 1.0.5 4.5.14 0.2.19 - + 2.27.2 - 0.11.5 - 0.11.5 + 0.12.6 5.8.37 - 2.14.0 - 1.5 - 3.12.0 + 2.19.0 + 1.6.0 + 3.17.0 0.4.19 1.17.2 2.3 2.2.5 + 2.13.1 1.18.38 1.4.4 - ${jsonwebtoken.version} + ${jjwt.version} \ No newline at end of file