'commit'

.idea/compiler.xml

@@ -29,14 +29,13 @@
         <module name="ms-wallet" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="rough-dependencies" target="1.8" />
-      <module name="XuanWu" target="1.5" />
-    </bytecodeTargetLevel>
   </component>
   <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="ds-base" options="" />
+      <module name="ds-base" options="-parameters" />
+      <module name="ds-build" options="" />
+      <module name="rough" options="" />
     </option>
   </component>
 </project>

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" ]

ds-base/pom.xml

@@ -11,9 +11,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <!--项目信息-->
-    <artifactId>ds-build</artifactId>
+    <artifactId>ds-base</artifactId>
     <version>1.0.0</version>
-    <name>ds-build</name>
+    <name>ds-base</name>
     <!--依赖包-->
     <dependencies>
         <!--jfinal主框架-->
@@ -32,11 +32,20 @@
             <artifactId>cos</artifactId>
             <version>${jfinal.cos.version}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/cn.hutool/hutool-all -->
         <dependency>
             <groupId>cn.hutool</groupId>
-            <artifactId>hutool-json</artifactId>
+            <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>${jsoup.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
             <artifactId>jjwt</artifactId>
@@ -60,15 +69,70 @@
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <!--引用Mongodb的JFinal插件-->
+        <!-- https://mvnrepository.com/artifact/com.cybermkd/MongodbPlugin -->
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
+            <groupId>com.cybermkd</groupId>
-            <artifactId>okhttp</artifactId>
+            <artifactId>MongodbPlugin</artifactId>
-            <version>${okhttp.version}</version>
+            <version>${MongodbPlugin.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongo-java-driver</artifactId>
+            <version>${mongo-java-driver.version}</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>${snakeyaml.version}</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.directory.studio/org.apache.commons.codec -->
+        <dependency>
+            <groupId>org.apache.directory.studio</groupId>
+            <artifactId>org.apache.commons.codec</artifactId>
+            <version>1.8</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.minio/minio -->
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>${minio.version}</version>
+        </dependency>
+        <!--引用光-->
+        <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>4.0.3</version>
+        </dependency>
+        <!--日志logback-->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.5.6</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.28</version>
+        </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                    <encoding>UTF-8</encoding>
+                    <!-- java8 保留参数名编译参数 -->
+                    <compilerArgument>-parameters</compilerArgument>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

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.base.Util.JwtUtil;
-import com.dsideal.gw.Util.ResultVO;
+import com.dsideal.base.Util.ResultVO;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;

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;

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;

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;

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;

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.*;
 

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;

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.*;
 

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;

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.*;
 

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;
 
 /**
  * 是不是登录正确？

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.*;
 

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;

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.*;
 

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;
 

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;

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;

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;	//返回码

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.base.Admin.Controller.LoginController;
-import com.dsideal.gw.Controller.IndexController;
+import com.dsideal.base.Controller.IndexController;
-import com.dsideal.gw.Interceptor.*;
+import com.dsideal.base.Interceptor.*;
-import com.dsideal.gw.Util.LogBackLogFactory;
+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() {

ds-base/src/main/java/com/dsideal/gw/Tools/GenerateMysqlDoc.java

@@ -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<String> ignoreTableName = new ArrayList<>();
-        //ignoreTableName.add("test_user");
-        //ignoreTableName.add("test_group");
-        //忽略表前缀
-        ArrayList<String> ignorePrefix = new ArrayList<>();
-        //ignorePrefix.add("test_");
-        //忽略表后缀
-        ArrayList<String> 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();
-    }
-}

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/

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

pom.xml

@@ -57,9 +57,15 @@
         <slf4j-api.version>1.7.36</slf4j-api.version>
         <!--log4j版本号-->
         <log4j.version>1.2.17</log4j.version>
-        <!--okhttp版本号-->
-        <okhttp.version>4.12.0</okhttp.version>
         <!--yaml版本号-->
         <snakeyaml.version>2.3</snakeyaml.version>
+        <!--mongodb插件版本号-->
+        <MongodbPlugin.version>1.0.8.2</MongodbPlugin.version>
+        <!--mongodb驱动版本号-->
+        <mongo-java-driver.version>3.12.14</mongo-java-driver.version>
+        <!--jsoup版本号-->
+        <jsoup.version>1.18.1</jsoup.version>
+        <!--minio版本号-->
+        <minio.version>8.5.12</minio.version>
     </properties>
 </project>