From bced59574148bef74e12a7f29ece104285c73c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Sat, 7 Sep 2024 20:16:34 +0800 Subject: [PATCH] 'commit' --- .idea/compiler.xml | 9 +- ds-base/Dockerfile | 2 +- ds-base/pom.xml | 76 +++++++++++++++-- .../Admin/Controller/LoginController.java | 6 +- .../Controller/IndexController.java | 2 +- .../{gw => base}/Handler/XssHandler.java | 2 +- .../Handler/XssHttpServletRequestWrapper.java | 2 +- .../Interceptor/CheckIdsInterceptor.java | 4 +- .../Interceptor/CheckIdsInterface.java | 2 +- .../Interceptor/IsGuidInterceptor.java | 4 +- .../Interceptor/IsGuidInterface.java | 2 +- .../Interceptor/IsNumbericInterceptor.java | 4 +- .../Interceptor/IsNumericInterface.java | 2 +- .../Interceptor/JwtCheckInterceptor.java | 6 +- .../Interceptor/JwtCheckInterface.java | 2 +- .../Interceptor/LengthInterceptor.java | 4 +- .../Interceptor/LengthInterface.java | 2 +- .../com/dsideal/{gw => base}/Test/134.json | 0 .../com/dsideal/{gw => base}/Test/161.json | 0 .../com/dsideal/{gw => base}/Test/85.json | 0 .../{gw => base}/Test/CheckChePai.java | 2 +- .../dsideal/{gw => base}/Test/JieXiJson.java | 2 +- .../dsideal/{gw => base}/Test/TestKeTuo.java | 4 +- .../{gw => base}/Test/TestMongoDb.java | 2 +- .../dsideal/{gw => base}/Test/TestTime.java | 2 +- .../{gw => base}/Tools/GenerateToken.java | 2 +- .../dsideal/{gw => base}/Util/CommonUtil.java | 2 +- .../dsideal/{gw => base}/Util/JwtUtil.java | 2 +- .../dsideal/{gw => base}/Util/LogBackLog.java | 2 +- .../{gw => base}/Util/LogBackLogFactory.java | 2 +- .../dsideal/{gw => base}/Util/MinioUtils.java | 2 +- .../dsideal/{gw => base}/Util/ResultVO.java | 2 +- .../dsideal/{gw => base}/baseApplication.java | 12 +-- .../dsideal/gw/Tools/GenerateMysqlDoc.java | 83 ------------------- ds-base/src/main/resource/logo.txt | 39 +++------ ds-base/src/main/resource/undertow.properties | 4 +- pom.xml | 10 ++- 37 files changed, 136 insertions(+), 169 deletions(-) rename ds-base/src/main/java/com/dsideal/{gw => base}/Admin/Controller/LoginController.java (85%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Controller/IndexController.java (83%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Handler/XssHandler.java (94%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Handler/XssHttpServletRequestWrapper.java (95%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/CheckIdsInterceptor.java (94%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/CheckIdsInterface.java (79%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/IsGuidInterceptor.java (91%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/IsGuidInterface.java (79%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/IsNumbericInterceptor.java (92%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/IsNumericInterface.java (79%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/JwtCheckInterceptor.java (91%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/JwtCheckInterface.java (79%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/LengthInterceptor.java (93%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Interceptor/LengthInterface.java (79%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/134.json (100%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/161.json (100%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/85.json (100%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/CheckChePai.java (93%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/JieXiJson.java (94%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/TestKeTuo.java (93%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/TestMongoDb.java (94%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Test/TestTime.java (89%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Tools/GenerateToken.java (91%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/CommonUtil.java (96%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/JwtUtil.java (96%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/LogBackLog.java (93%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/LogBackLogFactory.java (87%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/MinioUtils.java (96%) rename ds-base/src/main/java/com/dsideal/{gw => base}/Util/ResultVO.java (94%) rename ds-base/src/main/java/com/dsideal/{gw => base}/baseApplication.java (93%) delete mode 100644 ds-base/src/main/java/com/dsideal/gw/Tools/GenerateMysqlDoc.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 63a6de94..48a6b4d7 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -29,14 +29,13 @@ - - - - + \ No newline at end of file diff --git a/ds-base/Dockerfile b/ds-base/Dockerfile index ea267f50..e0e16407 100644 --- a/ds-base/Dockerfile +++ b/ds-base/Dockerfile @@ -15,4 +15,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx1024m" # 标识为生产环境 ENV WORKING_ENV="pro" -ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/ZhuQue/target/classes:/root/ZhuQue/lib/* com.dsideal.gw.Start" ] +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -cp /root/ZhuQue/target/classes:/root/ZhuQue/lib/* com.dsideal.base.Start" ] diff --git a/ds-base/pom.xml b/ds-base/pom.xml index 750916d9..13af57aa 100644 --- a/ds-base/pom.xml +++ b/ds-base/pom.xml @@ -11,9 +11,9 @@ 4.0.0 - ds-build + ds-base 1.0.0 - ds-build + ds-base @@ -32,11 +32,20 @@ cos ${jfinal.cos.version} + cn.hutool - hutool-json + hutool-all ${hutool.version} + + + + org.jsoup + jsoup + ${jsoup.version} + + io.jsonwebtoken jjwt @@ -60,15 +69,70 @@ log4j ${log4j.version} + + - com.squareup.okhttp3 - okhttp - ${okhttp.version} + com.cybermkd + MongodbPlugin + ${MongodbPlugin.version} + + + + org.mongodb + mongo-java-driver + ${mongo-java-driver.version} org.yaml snakeyaml ${snakeyaml.version} + + + org.apache.directory.studio + org.apache.commons.codec + 1.8 + + + + io.minio + minio + ${minio.version} + + + + + com.zaxxer + HikariCP + 4.0.3 + + + + ch.qos.logback + logback-classic + 1.5.6 + + + + mysql + mysql-connector-java + 8.0.28 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.6.1 + + 8 + 8 + UTF-8 + + -parameters + + + + diff --git a/ds-base/src/main/java/com/dsideal/gw/Admin/Controller/LoginController.java b/ds-base/src/main/java/com/dsideal/base/Admin/Controller/LoginController.java similarity index 85% rename from ds-base/src/main/java/com/dsideal/gw/Admin/Controller/LoginController.java rename to ds-base/src/main/java/com/dsideal/base/Admin/Controller/LoginController.java index a1037dc5..0705d30f 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Admin/Controller/LoginController.java +++ b/ds-base/src/main/java/com/dsideal/base/Admin/Controller/LoginController.java @@ -1,7 +1,7 @@ -package com.dsideal.gw.Admin.Controller; +package com.dsideal.base.Admin.Controller; -import com.dsideal.gw.Util.JwtUtil; -import com.dsideal.gw.Util.ResultVO; +import com.dsideal.base.Util.JwtUtil; +import com.dsideal.base.Util.ResultVO; import com.jfinal.aop.Before; import com.jfinal.core.Controller; import com.jfinal.ext.interceptor.GET; diff --git a/ds-base/src/main/java/com/dsideal/gw/Controller/IndexController.java b/ds-base/src/main/java/com/dsideal/base/Controller/IndexController.java similarity index 83% rename from ds-base/src/main/java/com/dsideal/gw/Controller/IndexController.java rename to ds-base/src/main/java/com/dsideal/base/Controller/IndexController.java index d6aa8ebc..a9f5a800 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Controller/IndexController.java +++ b/ds-base/src/main/java/com/dsideal/base/Controller/IndexController.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Controller; +package com.dsideal.base.Controller; import com.jfinal.aop.Before; import com.jfinal.core.Controller; diff --git a/ds-base/src/main/java/com/dsideal/gw/Handler/XssHandler.java b/ds-base/src/main/java/com/dsideal/base/Handler/XssHandler.java similarity index 94% rename from ds-base/src/main/java/com/dsideal/gw/Handler/XssHandler.java rename to ds-base/src/main/java/com/dsideal/base/Handler/XssHandler.java index 73f4e5fa..7bd5c448 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Handler/XssHandler.java +++ b/ds-base/src/main/java/com/dsideal/base/Handler/XssHandler.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Handler; +package com.dsideal.base.Handler; import com.jfinal.handler.Handler; import org.jsoup.internal.StringUtil; diff --git a/ds-base/src/main/java/com/dsideal/gw/Handler/XssHttpServletRequestWrapper.java b/ds-base/src/main/java/com/dsideal/base/Handler/XssHttpServletRequestWrapper.java similarity index 95% rename from ds-base/src/main/java/com/dsideal/gw/Handler/XssHttpServletRequestWrapper.java rename to ds-base/src/main/java/com/dsideal/base/Handler/XssHttpServletRequestWrapper.java index 006ace14..26d95b3f 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Handler/XssHttpServletRequestWrapper.java +++ b/ds-base/src/main/java/com/dsideal/base/Handler/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Handler; +package com.dsideal.base.Handler; import org.jsoup.Jsoup; import org.jsoup.safety.Safelist; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterceptor.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterceptor.java similarity index 94% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterceptor.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterceptor.java index c42d6a8f..68f11a51 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterceptor.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterface.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterface.java similarity index 79% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterface.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterface.java index 418de7c9..a1866bdc 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/CheckIdsInterface.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/CheckIdsInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; import java.lang.annotation.*; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterceptor.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterceptor.java similarity index 91% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterceptor.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterceptor.java index 4beccdd9..a60372ac 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterceptor.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterface.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterface.java similarity index 79% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterface.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterface.java index 40d22e63..d4b74841 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsGuidInterface.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsGuidInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; import java.lang.annotation.*; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumbericInterceptor.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumbericInterceptor.java similarity index 92% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumbericInterceptor.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumbericInterceptor.java index 2bf96408..4ed05527 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumbericInterceptor.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumbericInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumericInterface.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumericInterface.java similarity index 79% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumericInterface.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumericInterface.java index 6c05ee5a..e026a56a 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/IsNumericInterface.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/IsNumericInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; import java.lang.annotation.*; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterceptor.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterceptor.java similarity index 91% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterceptor.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterceptor.java index f6ec332e..26bae5fc 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterceptor.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; @@ -9,7 +9,7 @@ import io.jsonwebtoken.Claims; import javax.servlet.http.HttpServletRequest; -import com.dsideal.gw.Util.JwtUtil; +import com.dsideal.base.Util.JwtUtil; /** * 是不是登录正确？ diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterface.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterface.java similarity index 79% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterface.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterface.java index 393e2db4..8bbb4e45 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/JwtCheckInterface.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/JwtCheckInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; import java.lang.annotation.*; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterceptor.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterceptor.java similarity index 93% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterceptor.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterceptor.java index 00ad6dfd..2dae54e0 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterceptor.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterceptor.java @@ -1,6 +1,6 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import com.jfinal.aop.Interceptor; import com.jfinal.aop.Invocation; import com.jfinal.core.Controller; diff --git a/ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterface.java b/ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterface.java similarity index 79% rename from ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterface.java rename to ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterface.java index 3393384b..cf67f5b8 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Interceptor/LengthInterface.java +++ b/ds-base/src/main/java/com/dsideal/base/Interceptor/LengthInterface.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Interceptor; +package com.dsideal.base.Interceptor; import java.lang.annotation.*; diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/134.json b/ds-base/src/main/java/com/dsideal/base/Test/134.json similarity index 100% rename from ds-base/src/main/java/com/dsideal/gw/Test/134.json rename to ds-base/src/main/java/com/dsideal/base/Test/134.json diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/161.json b/ds-base/src/main/java/com/dsideal/base/Test/161.json similarity index 100% rename from ds-base/src/main/java/com/dsideal/gw/Test/161.json rename to ds-base/src/main/java/com/dsideal/base/Test/161.json diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/85.json b/ds-base/src/main/java/com/dsideal/base/Test/85.json similarity index 100% rename from ds-base/src/main/java/com/dsideal/gw/Test/85.json rename to ds-base/src/main/java/com/dsideal/base/Test/85.json diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/CheckChePai.java b/ds-base/src/main/java/com/dsideal/base/Test/CheckChePai.java similarity index 93% rename from ds-base/src/main/java/com/dsideal/gw/Test/CheckChePai.java rename to ds-base/src/main/java/com/dsideal/base/Test/CheckChePai.java index 5c5a119d..37da5b1a 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Test/CheckChePai.java +++ b/ds-base/src/main/java/com/dsideal/base/Test/CheckChePai.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Test; +package com.dsideal.base.Test; import cn.hutool.core.lang.RegexPool; diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/JieXiJson.java b/ds-base/src/main/java/com/dsideal/base/Test/JieXiJson.java similarity index 94% rename from ds-base/src/main/java/com/dsideal/gw/Test/JieXiJson.java rename to ds-base/src/main/java/com/dsideal/base/Test/JieXiJson.java index 57e5c29f..33c08388 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Test/JieXiJson.java +++ b/ds-base/src/main/java/com/dsideal/base/Test/JieXiJson.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Test; +package com.dsideal.base.Test; import cn.hutool.core.io.FileUtil; import com.alibaba.fastjson.JSONObject; diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/TestKeTuo.java b/ds-base/src/main/java/com/dsideal/base/Test/TestKeTuo.java similarity index 93% rename from ds-base/src/main/java/com/dsideal/gw/Test/TestKeTuo.java rename to ds-base/src/main/java/com/dsideal/base/Test/TestKeTuo.java index e60c920b..de97728e 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Test/TestKeTuo.java +++ b/ds-base/src/main/java/com/dsideal/base/Test/TestKeTuo.java @@ -1,8 +1,8 @@ -package com.dsideal.gw.Test; +package com.dsideal.base.Test; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; -import com.dsideal.gw.Util.CommonUtil; +import com.dsideal.base.Util.CommonUtil; import java.util.UUID; diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/TestMongoDb.java b/ds-base/src/main/java/com/dsideal/base/Test/TestMongoDb.java similarity index 94% rename from ds-base/src/main/java/com/dsideal/gw/Test/TestMongoDb.java rename to ds-base/src/main/java/com/dsideal/base/Test/TestMongoDb.java index d6962b93..894d37e3 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Test/TestMongoDb.java +++ b/ds-base/src/main/java/com/dsideal/base/Test/TestMongoDb.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Test; +package com.dsideal.base.Test; import com.alibaba.fastjson.JSONObject; import com.cybermkd.mongo.kit.MongoQuery; diff --git a/ds-base/src/main/java/com/dsideal/gw/Test/TestTime.java b/ds-base/src/main/java/com/dsideal/base/Test/TestTime.java similarity index 89% rename from ds-base/src/main/java/com/dsideal/gw/Test/TestTime.java rename to ds-base/src/main/java/com/dsideal/base/Test/TestTime.java index 906327af..5a3792a9 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Test/TestTime.java +++ b/ds-base/src/main/java/com/dsideal/base/Test/TestTime.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Test; +package com.dsideal.base.Test; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/ds-base/src/main/java/com/dsideal/gw/Tools/GenerateToken.java b/ds-base/src/main/java/com/dsideal/base/Tools/GenerateToken.java similarity index 91% rename from ds-base/src/main/java/com/dsideal/gw/Tools/GenerateToken.java rename to ds-base/src/main/java/com/dsideal/base/Tools/GenerateToken.java index 49206d30..2b6852d2 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Tools/GenerateToken.java +++ b/ds-base/src/main/java/com/dsideal/base/Tools/GenerateToken.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Tools; +package com.dsideal.base.Tools; import cn.hutool.core.util.RandomUtil; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/CommonUtil.java b/ds-base/src/main/java/com/dsideal/base/Util/CommonUtil.java similarity index 96% rename from ds-base/src/main/java/com/dsideal/gw/Util/CommonUtil.java rename to ds-base/src/main/java/com/dsideal/base/Util/CommonUtil.java index 67855b52..a4ea7a52 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/CommonUtil.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/CommonUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Util; +package com.dsideal.base.Util; import cn.hutool.core.date.DateTime; import cn.hutool.core.io.FileUtil; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/JwtUtil.java b/ds-base/src/main/java/com/dsideal/base/Util/JwtUtil.java similarity index 96% rename from ds-base/src/main/java/com/dsideal/gw/Util/JwtUtil.java rename to ds-base/src/main/java/com/dsideal/base/Util/JwtUtil.java index 79305d4e..0a89576f 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/JwtUtil.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/JwtUtil.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Util; +package com.dsideal.base.Util; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/LogBackLog.java b/ds-base/src/main/java/com/dsideal/base/Util/LogBackLog.java similarity index 93% rename from ds-base/src/main/java/com/dsideal/gw/Util/LogBackLog.java rename to ds-base/src/main/java/com/dsideal/base/Util/LogBackLog.java index ebffb22a..74737a00 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/LogBackLog.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/LogBackLog.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Util; +package com.dsideal.base.Util; import com.jfinal.log.Log; import org.slf4j.Logger; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java b/ds-base/src/main/java/com/dsideal/base/Util/LogBackLogFactory.java similarity index 87% rename from ds-base/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java rename to ds-base/src/main/java/com/dsideal/base/Util/LogBackLogFactory.java index 8cd848ff..4c264f93 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/LogBackLogFactory.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/LogBackLogFactory.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Util; +package com.dsideal.base.Util; import com.jfinal.log.ILogFactory; import com.jfinal.log.Log; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/MinioUtils.java b/ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java similarity index 96% rename from ds-base/src/main/java/com/dsideal/gw/Util/MinioUtils.java rename to ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java index 523a6cdc..a1f85534 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/MinioUtils.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/MinioUtils.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Tools; +package com.dsideal.base.Tools; import cn.hutool.core.io.FileUtil; import com.jfinal.kit.PathKit; diff --git a/ds-base/src/main/java/com/dsideal/gw/Util/ResultVO.java b/ds-base/src/main/java/com/dsideal/base/Util/ResultVO.java similarity index 94% rename from ds-base/src/main/java/com/dsideal/gw/Util/ResultVO.java rename to ds-base/src/main/java/com/dsideal/base/Util/ResultVO.java index 0dd5c7bb..60d9d602 100644 --- a/ds-base/src/main/java/com/dsideal/gw/Util/ResultVO.java +++ b/ds-base/src/main/java/com/dsideal/base/Util/ResultVO.java @@ -1,4 +1,4 @@ -package com.dsideal.gw.Util; +package com.dsideal.base.Util; public class ResultVO { private Integer code; //返回码 diff --git a/ds-base/src/main/java/com/dsideal/gw/baseApplication.java b/ds-base/src/main/java/com/dsideal/base/baseApplication.java similarity index 93% rename from ds-base/src/main/java/com/dsideal/gw/baseApplication.java rename to ds-base/src/main/java/com/dsideal/base/baseApplication.java index 7c67053c..8aebd722 100644 --- a/ds-base/src/main/java/com/dsideal/gw/baseApplication.java +++ b/ds-base/src/main/java/com/dsideal/base/baseApplication.java @@ -1,11 +1,11 @@ -package com.dsideal.gw; +package com.dsideal.base; import cn.hutool.core.io.FileUtil; import com.cybermkd.mongo.plugin.MongoJFinalPlugin; -import com.dsideal.gw.Admin.Controller.LoginController; -import com.dsideal.gw.Controller.IndexController; -import com.dsideal.gw.Interceptor.*; -import com.dsideal.gw.Util.LogBackLogFactory; +import com.dsideal.base.Admin.Controller.LoginController; +import com.dsideal.base.Controller.IndexController; +import com.dsideal.base.Interceptor.*; +import com.dsideal.base.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.PathKit; import com.jfinal.kit.PropKit; @@ -195,7 +195,7 @@ public class baseApplication extends JFinalConfig { } /** - * 在jfinal启动完成后马上执行 + * 在JFinal启动完成后马上执行 */ @Override public void onStart() { diff --git a/ds-base/src/main/java/com/dsideal/gw/Tools/GenerateMysqlDoc.java b/ds-base/src/main/java/com/dsideal/gw/Tools/GenerateMysqlDoc.java deleted file mode 100644 index 2c838606..00000000 --- a/ds-base/src/main/java/com/dsideal/gw/Tools/GenerateMysqlDoc.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.dsideal.gw.Tools; - -import cn.smallbun.screw.core.Configuration; -import cn.smallbun.screw.core.engine.EngineConfig; -import cn.smallbun.screw.core.engine.EngineFileType; -import cn.smallbun.screw.core.engine.EngineTemplateType; -import cn.smallbun.screw.core.execute.DocumentationExecute; -import cn.smallbun.screw.core.process.ProcessConfig; -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; - -import javax.sql.DataSource; -import java.util.ArrayList; - -public class GenerateMysqlDoc { - public static void main(String[] args) { - String fileOutputDir = "c:\\"; - //数据源 - HikariConfig hikariConfig = new HikariConfig(); - hikariConfig.setDriverClassName("com.mysql.jdbc.Driver"); - hikariConfig.setJdbcUrl("jdbc:mysql://10.10.14.210:22066/yltcharge?useUnicode=true&characterEncoding=UTF-8&useSSL=false"); - hikariConfig.setUsername("root"); - hikariConfig.setPassword("DsideaL147258369"); - //设置可以获取tables remarks信息 - hikariConfig.addDataSourceProperty("useInformationSchema", "true"); - hikariConfig.setMinimumIdle(2); - hikariConfig.setMaximumPoolSize(5); - DataSource dataSource = new HikariDataSource(hikariConfig); - //生成配置 - EngineConfig engineConfig = EngineConfig.builder() - //生成文件路径 - .fileOutputDir(fileOutputDir) - //打开目录 - .openOutputDir(true) - //文件类型 - .fileType(EngineFileType.HTML) - //生成模板实现 - .produceType(EngineTemplateType.freemarker) - //自定义文件名称 - .fileName("驿来特数据库文档").build(); - - //忽略表 - ArrayList ignoreTableName = new ArrayList<>(); - //ignoreTableName.add("test_user"); - //ignoreTableName.add("test_group"); - //忽略表前缀 - ArrayList ignorePrefix = new ArrayList<>(); - //ignorePrefix.add("test_"); - //忽略表后缀 - ArrayList ignoreSuffix = new ArrayList<>(); - //ignoreSuffix.add("_test"); - - ProcessConfig processConfig = ProcessConfig.builder() - //指定生成逻辑、当存在指定表、指定表前缀、指定表后缀时，将生成指定表，其余表不生成、并跳过忽略表配置 - //根据名称指定表生成 - .designatedTableName(new ArrayList<>()) - //根据表前缀生成 - .designatedTablePrefix(new ArrayList<>()) - //根据表后缀生成 - .designatedTableSuffix(new ArrayList<>()) - //忽略表名 - .ignoreTableName(ignoreTableName) - //忽略表前缀 - .ignoreTablePrefix(ignorePrefix) - //忽略表后缀 - .ignoreTableSuffix(ignoreSuffix).build(); - //配置 - Configuration config = Configuration.builder() - //版本 - .version("1.0.0") - //描述 - .description("驿来特数据库设计文档生成") - //数据源 - .dataSource(dataSource) - //生成配置 - .engineConfig(engineConfig) - //生成配置 - .produceConfig(processConfig) - .build(); - //执行生成 - new DocumentationExecute(config).execute(); - } -} diff --git a/ds-base/src/main/resource/logo.txt b/ds-base/src/main/resource/logo.txt index b93cd862..bc4882f0 100644 --- a/ds-base/src/main/resource/logo.txt +++ b/ds-base/src/main/resource/logo.txt @@ -1,32 +1,13 @@ - _ooOoo_ - o8888888o - 88" . "88 - (| -_- |) - O\ = /O - ____/`---'\____ - . ' \\| |// `. - / \\||| : |||// \ - / _||||| -:- |||||- \ - | | \\\ - /// | | - | \_| ''\---/'' | | - \ .-\__ `-` ___/-. / - ___`. .' /--.--\ `. . __ - ."" '< `.___\_<|>_/___.' >'"". - | | : `- \`.;`\ _ /`;.`/ - ` : | | - \ \ `-. \_ __\ /__ _/ .-` / / - ======`-.____`-.___\_____/___.-`____.-'====== - `=---=' - ............................................. - 佛祖镇楼 BUG辟易 - 佛曰: - 写字楼里写字间，写字间里程序员； - 程序人员写程序，又拿程序换酒钱。 - 酒醒只在网上坐，酒醉还来网下眠； - 酒醉酒醒日复日，网上网下年复年。 - 但愿老死电脑间，不愿鞠躬老板前； - 奔驰宝马贵者趣，公交自行程序员。 - 别人笑我忒疯癫，我笑自己命太贱； - 不见满街漂亮妹，哪个归得程序员？ + __ _______ + / | / \ + ____$$ | _______ $$$$$$$ | ______ _______ ______ + / $$ | / | $$ |__$$ | / \ / | / \ +/$$$$$$$ |/$$$$$$$/ $$ $$< $$$$$$ |/$$$$$$$/ /$$$$$$ | +$$ | $$ |$$ \ $$$$$$$ | / $$ |$$ \ $$ $$ | +$$ \__$$ | $$$$$$ | $$ |__$$ |/$$$$$$$ | $$$$$$ |$$$$$$$$/ +$$ $$ |/ $$/ $$ $$/ $$ $$ |/ $$/ $$ | + $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ $$$$$$$/ + power by http://patorjk.com/software/taag/ \ No newline at end of file diff --git a/ds-base/src/main/resource/undertow.properties b/ds-base/src/main/resource/undertow.properties index 10f963e1..ecb797cb 100644 --- a/ds-base/src/main/resource/undertow.properties +++ b/ds-base/src/main/resource/undertow.properties @@ -1,9 +1,9 @@ # true 值支持热加载 undertow.devMode=false -undertow.port=9002 +undertow.port=9001 undertow.host=0.0.0.0 #undertow.resourcePath=/usr/local/tomcat8/webapps/QingLong,classpath:static -undertow.resourcePath=D:/dsWork/QingLong/WebRoot,classpath:static +#undertow.resourcePath=D:/dsWork/QingLong/WebRoot,classpath:static # 目录名称 undertow.contextPath=/base diff --git a/pom.xml b/pom.xml index febbfd0f..583107fe 100644 --- a/pom.xml +++ b/pom.xml @@ -57,9 +57,15 @@ 1.7.36 1.2.17 - - 4.12.0 2.3 + + 1.0.8.2 + + 3.12.14 + + 1.18.1 + + 8.5.12 \ No newline at end of file