diff --git a/dsAi/pom.xml b/dsAi/pom.xml
index f04bb655..0fa41a2a 100644
--- a/dsAi/pom.xml
+++ b/dsAi/pom.xml
@@ -41,19 +41,19 @@
com.auth0
java-jwt
- 4.4.0
+ ${java-jwt.version}
org.apache.rocketmq
rocketmq-client
- 5.3.0
+ ${rocketmq-client.version}
org.apache.httpcomponents
httpmime
- 4.5.14
+ ${httpmime.version}
@@ -105,7 +105,7 @@
ch.qos.logback.access
logback-access-common
- 2.0.6
+ ${logback-access.version}
@@ -182,7 +182,7 @@
io.jsonwebtoken
jjwt-jackson
- 0.11.5
+ ${jjwt-jackson.version}
runtime
diff --git a/dsAi/target/classes/application_dev.yaml b/dsAi/target/classes/application_dev.yaml
deleted file mode 100644
index 6d6cc26c..00000000
--- a/dsAi/target/classes/application_dev.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-# 上传文件的临时路径
-uploadTempPath: c:/Windows/Temp
-# 生成Token的密码
-CookieMd5SingPwd: DsideaL4r5t6y7u
-
-# 数据库信息
-mysql:
- driverClassName: com.mysql.cj.jdbc.Driver
- user: ylt
- password: Ycharge666
- jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true
-
-# redis
-redis:
- ip: 10.10.14.14
- port: 18890
-
-# JWT
-jwt:
- SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
-
-minio:
- endpoint: http://10.10.14.210:9000
- accessKey: AOxWewe7pywwEc1NQeP6
- secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
- bucketName: dsideal
- url: http://10.10.14.210:9000/dsideal
-
-# 网关配置
-gateway:
- # 超时配置（毫秒）
- timeout:
- connect: 10000
- read: 30000
- write: 30000
-
- # 连接池配置
- connection:
- max: 5
- keep-alive: 300
-
- # 安全配置
- security:
- cors:
- allowed-origins: "*" # 或者具体的域名列表，如 "http://localhost:8080,https://your-domain.com"
- allowed-methods: "GET,POST,OPTIONS"
- allowed-headers: "Content-Type,Authorization,Cookie"
- allow-credentials: true
- max-age: 3600
-# ==============================================================
-
-excel:
- # 导出excel 的模板配置路径
- excelExportTemplatePathSuffix: /ExcelExportTemplate/
- # 导入excel 的模板配置路径
- ExcelImportTemplatePathSuffix: /ExcelImportTemplate/
-
-
-# RocketMq的配置信息
-RocketMq:
- nameServer: 10.10.14.14:9876
- topic: topic-test2
\ No newline at end of file
diff --git a/dsAi/target/classes/application_pro.yaml b/dsAi/target/classes/application_pro.yaml
deleted file mode 100644
index 6fa20430..00000000
--- a/dsAi/target/classes/application_pro.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# 上传文件的临时路径
-uploadTempPath: /tmp
-# 生成Token的密码
-CookieMd5SingPwd: DsideaL4r5t6y7u
-
-# 数据库信息
-mysql:
- driverClassName: com.mysql.cj.jdbc.Driver
- user: ylt
- password: Ycharge666
- jdbcUrl: jdbc:mysql://10.10.14.210:22066/base_db?reWriteBatchedInserts=true
-
-# redis
-redis:
- ip: 10.10.14.14
- port: 18890
-
-# JWT
-jwt:
- SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM
-
-minio:
- endpoint: http://10.10.14.210:9000
- accessKey: AOxWewe7pywwEc1NQeP6
- secretKey: EiLaKLpLW6OHmjPxvMLBD11Zu3xtV1tdZU9PFVYO
- bucketName: dsideal
- url: http://10.10.14.210:9000/dsideal
-
-# 网关配置
-gateway:
- # 超时配置（毫秒）
- timeout:
- connect: 10000
- read: 30000
- write: 30000
-
- # 连接池配置
- connection:
- max: 5
- keep-alive: 300
-
- # 安全配置
- security:
- cors:
- allowed-origins: "*" # 或者具体的域名列表，如 "http://localhost:8080,https://your-domain.com"
- allowed-methods: "GET,POST,OPTIONS"
- allowed-headers: "Content-Type,Authorization,Cookie"
- allow-credentials: true
- max-age: 3600
-# ==============================================================
-
-excel:
- # 导出excel 的模板配置路径
- excelExportTemplatePathSuffix: /ExcelExportTemplate/
- # 导入excel 的模板配置路径
- ExcelImportTemplatePathSuffix: /ExcelImportTemplate/
-
-# RocketMq的配置信息
-RocketMq:
- nameServer: 10.10.14.14:9876
- topic: topic-test2
\ No newline at end of file
diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index 54bc69b9..c149c78f 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -38,7 +38,7 @@
ch.qos.logback.access
logback-access-common
- 2.0.6
+ ${logback-access.version}
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index f1b0ca25..870bec97 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -41,14 +41,14 @@
ch.qos.logback.access
logback-access-common
- 2.0.6
+ ${logback-access.version}
com.squareup.okhttp3
okhttp
- 4.12.0
+ ${okhttp.version}
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index 1ce8a3e9..32862f30 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -42,13 +42,13 @@
org.neo4j.driver
neo4j-java-driver
- 5.28.5
+ ${neo4j-java-driver.version}
io.milvus
milvus-sdk-java
- 2.5.9
+ ${milvus-sdk-java.version}
@@ -100,7 +100,7 @@
ch.qos.logback.access
logback-access-common
- 2.0.6
+ ${logback-access.version}
com.alibaba
@@ -176,7 +176,7 @@
io.jsonwebtoken
jjwt-jackson
- 0.11.5
+ ${jjwt-jackson.version}
runtime
diff --git a/dsSso/pom.xml b/dsSso/pom.xml
index dfbe7e49..72e466c6 100644
--- a/dsSso/pom.xml
+++ b/dsSso/pom.xml
@@ -42,18 +42,18 @@
com.github.icecooly
FastHttpClient
- 1.8
+ ${FastHttpClient.version}
com.huaweicloud
esdk-obs-java
- 3.21.8
+ ${esdk-obs-java.version}
net.sf.json-lib
json-lib
- 2.4
+ ${json-lib.version}
jdk15
@@ -61,21 +61,21 @@
it.sauronsoftware.cron4j
cron4j
- 2.2.5
+ ${cron4j.version}
com.jcraft
jsch
- 0.1.55
+ ${jsch.version}
ch.ethz.ganymed
ganymed-ssh2
- 262
+ ${ganymed-ssh2.version}
@@ -88,7 +88,7 @@
ch.qos.logback
logback-classic
- 1.2.6
+ ${logback.version}
@@ -102,7 +102,7 @@
org.jsoup
jsoup
- 1.14.3
+ ${jsoup.version}
@@ -123,7 +123,7 @@
org.apache.commons
commons-email
- 1.5
+ ${commons-email.version}
cn.hutool
@@ -138,12 +138,12 @@
org.apache.commons
commons-lang3
- 3.8.1
+ ${commons-lang3.version}
- dom4j
+ org.dom4j
dom4j
- 1.6.1
+ ${dom4j.version}
@@ -154,7 +154,7 @@
commons-codec
commons-codec
- 1.17.2
+ ${commons-codec.version}
compile
diff --git a/dsSso/target/classes/Sql/Login.sql b/dsSso/target/classes/Sql/Login.sql
deleted file mode 100644
index f8459e54..00000000
--- a/dsSso/target/classes/Sql/Login.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- 字典命名空间
-#namespace("login")
-
- #sql("getPersonInfoByPersonId")
- select person_id,person_name,identity_id,login_name,b_use,city_id,area_id,main_school_id,bureau_id
- from t_sys_loginperson where person_id=?
- #end
-
- -- 获取整个单位类型与职务+分管信息树数据
- #sql("getLoginInfoByUserName")
- select person_id,person_name,pwd,ifnull(wx_openid,0) as wx_openid,ifnull(qq_openid,0) as qq_openid,identity_id,bureau_id,city_id,area_id
- from t_sys_loginperson where b_use = 1 and login_name =?
- #end
-
- -- 修改密码
- #sql("updatePwd")
- update t_sys_loginperson set pwd = ? where person_id = ?
- #end
-
-
- -- 根据全局变量的KEY获取VALUE
- #sql("getGlobalValueByKey")
- select ifnull(global_value,'') as global_value from t_base_global where global_code = ?
- #end
-
-#end
\ No newline at end of file
diff --git a/dsSso/target/classes/debug.sh b/dsSso/target/classes/debug.sh
deleted file mode 100644
index 3a58d7ee..00000000
--- a/dsSso/target/classes/debug.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# 启动入口类，该脚本文件用于别的项目时要改这里
-MAIN_CLASS=com.dsideal.SsoApplication
-
-# Java 命令行参数，根据需要开启下面的配置，改成自己需要的，注意等号前后不能有空格
-export JAVA_HOME=/usr/java/jdk
-export JRE_HOME=${JAVA_HOME}/jre
-export CLASSPATH=.:${JAVA_HOME}/lib:${JRE_HOME}/lib
-export PATH=${JAVA_HOME}/bin:$PATH
-
-JAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,suspend=n,server=y,address=5555 -Xms1024m -Xmx2048m"
-
-# 生成 class path 值
-CP=.:/usr/local/dsSso/lib/*
-
-# 运行为后台进程，并且将信息输出到 logback.xml配置的日志文件位置
-java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS}
\ No newline at end of file
diff --git a/dsSso/target/classes/logback.xml b/dsSso/target/classes/logback.xml
deleted file mode 100644
index 94ea68cf..00000000
--- a/dsSso/target/classes/logback.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} %boldYellow([%thread]) %highlight(%-5level) %boldGreen(%logger{40}) - %msg%n
-
-
-
-
- ${LOG_HOME}/dsSso.log
-
-
- ${LOG_HOME}/dsSso.log.%d{yyyy-MM-dd}.log
-
- 30
-
-
-
- %date{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{40} - %msg%n
-
-
-
- 100MB
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dsSso/target/classes/logo.txt b/dsSso/target/classes/logo.txt
deleted file mode 100644
index 130d3b7a..00000000
--- a/dsSso/target/classes/logo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-
- __ ______
- / | / \
- ____$$ | _______ /$$$$$$ | _______ ______
- / $$ | / |$$ \__$$/ / | / \
-/$$$$$$$ |/$$$$$$$/ $$ \ /$$$$$$$/ /$$$$$$ |
-$$ | $$ |$$ \ $$$$$$ |$$ \ $$ | $$ |
-$$ \__$$ | $$$$$$ |/ \__$$ | $$$$$$ |$$ \__$$ |
-$$ $$ |/ $$/ $$ $$/ / $$/ $$ $$/
- $$$$$$$/ $$$$$$$/ $$$$$$/ $$$$$$$/ $$$$$$/
-
-
-
-
-power by http://patorjk.com/software/taag/
\ No newline at end of file
diff --git a/dsSso/target/classes/start.sh b/dsSso/target/classes/start.sh
deleted file mode 100644
index 9d0aca8d..00000000
--- a/dsSso/target/classes/start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# 启动入口类，该脚本文件用于别的项目时要改这里
-MAIN_CLASS=com.dsideal.SsoApplication
-
-# Java 命令行参数，根据需要开启下面的配置，改成自己需要的，注意等号前后不能有空格
-export JAVA_HOME=/usr/java/jdk
-export JRE_HOME=${JAVA_HOME}/jre
-export CLASSPATH=.:${JAVA_HOME}/lib:${JRE_HOME}/lib
-export PATH=${JAVA_HOME}/bin:$PATH
-JAVA_OPTS="-Xms1024m -Xmx2048m"
-
-# 生成 class path 值
-CP=.:/usr/local/dsSso/lib/*
-
-# 运行为后台进程，并且将信息输出到 output.log 文件
-nohup java -Xverify:none ${JAVA_OPTS} -cp ${CP} ${MAIN_CLASS} >> /dev/null 2>&1 &
-
diff --git a/dsSso/target/classes/stop.sh b/dsSso/target/classes/stop.sh
deleted file mode 100644
index 78e8b18e..00000000
--- a/dsSso/target/classes/stop.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# 启动入口类，该脚本文件用于别的项目时要改这里
-MAIN_CLASS=com.dsideal.SsoApplication
-
-# kill 命令不使用 -9 参数时，会回调 onStop() 方法，确定不需要此回调建议使用 -9 参数
-kill -9 `pgrep -f ${MAIN_CLASS}` 2>/dev/null
-
-# 以下代码与上述代码等价
-# kill $(pgrep -f ${MAIN_CLASS}) 2>/dev/null
diff --git a/dsSso/target/classes/undertow.properties b/dsSso/target/classes/undertow.properties
deleted file mode 100644
index 9746854d..00000000
--- a/dsSso/target/classes/undertow.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# true 值支持热加载
-undertow.devMode=true
-undertow.port=9001
-undertow.host=0.0.0.0
-#undertow.resourcePath=/usr/local/dsSso/WebRoot, classpath:static
-undertow.resourcePath=D:/dsWork/dsProject/dsSso/WebRoot, classpath:static
-
-# 目录名称
-undertow.contextPath=/dsSso
-
-# 设定I/O线程数.
-server.undertow.io-threads=8
-
-# 设定工作线程数
-server.undertow.worker-threads=60
-
-# 查询当前某程序的线程或进程数
-# yum install psmisc -y
-# ps -e | grep java | awk '{print $1}
-# pstree -p 15453 | wc -l
-
-# gzip 压缩开关
-undertow.gzip.enable=true
-# 配置压缩级别，默认值 -1。 可配置 1 到 9。 1 拥有最快压缩速度，9 拥有最高压缩率
-undertow.gzip.level=-1
-# 触发压缩的最小内容长度
-undertow.gzip.minLength=1024
-# ssl 开启时，是否开启 http2。检测该配置是否生效在 chrome 地址栏中输入: chrome://net-internals/#http2
-#undertow.http2.enable=true
-#http://www.jfinal.com/doc/1-4
diff --git a/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
deleted file mode 100644
index 39b034ce..00000000
--- a/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-com\dsideal\Sso\Plugin\LogBackLogFactory.class
-com\dsideal\Sso\Interceptor\EmptyInterceptor.class
-com\dsideal\Sso\Util\CaptchaUtil.class
-com\dsideal\Sso\Plugin\LogBackLog.class
-com\dsideal\Sso\Util\SsoLoginHelper.class
-com\dsideal\Sso\Util\LdapPassWordEncoder.class
-com\dsideal\Sso\Util\CookieUtil.class
-com\dsideal\Sso\Util\RedisKit.class
-com\dsideal\Sso\Model\LoginModel.class
-com\dsideal\Sso\Controller\WebLoginController.class
-com\dsideal\Sso\Util\SsoLoginStore.class
-com\dsideal\Sso\Interceptor\EmptyInterface.class
-com\dsideal\Sso\Util\IpUtil.class
-com\dsideal\Sso\Util\YamlProp.class
-com\dsideal\Sso\Controller\AppLoginController.class
-com\dsideal\Sso\Controller\CommomController.class
-com\dsideal\Sso\Util\LoginLogUtil.class
-com\dsideal\Sso\SsoApplication.class
-com\dsideal\Sso\Util\CommonUtil.class
-com\dsideal\Sso\Util\AesUtil.class
diff --git a/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
deleted file mode 100644
index 213757bb..00000000
--- a/dsSso/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\CaptchaUtil.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\RedisKit.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\SsoLoginHelper.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\SsoLoginStore.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\CookieUtil.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\CommonUtil.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\LoginLogUtil.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\SsoApplication.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Controller\CommomController.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\YamlProp.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Interceptor\EmptyInterface.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Plugin\LogBackLogFactory.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Plugin\LogBackLog.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Controller\WebLoginController.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Controller\AppLoginController.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Interceptor\EmptyInterceptor.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\AesUtil.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Model\LoginModel.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\LdapPassWordEncoder.java
-D:\dsWork\dsProject\dsSso\src\main\java\com\dsideal\Sso\Util\IpUtil.java
diff --git a/pom.xml b/pom.xml
index d5ea610d..726e01d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,18 +36,22 @@
1.2.24
9.3.0
1.0.5
+
5.1.5
+
8.5.17
2.0.17
1.5.18
+ 2.0.6
2.0.57
2.4
+ 2.13.1
2.1.4
@@ -55,6 +59,7 @@
1.1.1
2.19.0
2.19.0
+
5.2.5
1.2.0
@@ -63,12 +68,35 @@
2.3.0
1.1.1
3.30.2-GA
+
4.5.14
0.2.19
- 2.27.2
+ 4.12.0
+
0.12.6
+ ${jjwt.version}
+
+
+ 5.28.5
+ 2.5.9
+
+
+ 5.3.0
+
+
+ 3.21.8
+
+
+ 262
+
+
+ 1.8
+ 4.4.0
+
+
+ 1.17.2
5.8.37
@@ -79,12 +107,10 @@
1.17.2
2.3
2.2.5
- 2.13.1
1.18.38
1.4.4
- ${jjwt.version}