1. h2数据库文件优化, 取消h2server启动

2. 项目结构优化, pom版本统一管理
3. core的beanutils依赖升级为commons-beanutils2版本, 修复之前版本的安全风险.
4. 此版本打包部署需要替换之前所有依赖

web-service/pom.xml

@@ -5,10 +5,9 @@
     <parent>
         <artifactId>netdisk-fast-download</artifactId>
         <groupId>cn.qaiu</groupId>
-        <version>0.1.7</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>0.1.7</version>
     <artifactId>web-service</artifactId>
 
     <properties>
@@ -22,7 +21,14 @@
         <dependency>
             <groupId>cn.qaiu</groupId>
             <artifactId>core</artifactId>
-            <version>1.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.qaiu</groupId>
+            <artifactId>core-database</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.qaiu</groupId>
+            <artifactId>parser</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -47,16 +53,6 @@
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.qaiu</groupId>
-            <artifactId>core-database</artifactId>
-            <version>0.1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.qaiu</groupId>
-            <artifactId>parser</artifactId>
-            <version>0.1.7</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

web-service/src/main/resources/app-dev.yml

@@ -35,7 +35,7 @@ custom:
 # 数据源配置
 dataSource:
   provider_class: io.vertx.ext.jdbc.spi.impl.HikariCPDataSourceProvider
-  jdbcUrl: jdbc:h2:tcp://127.0.0.1:9095/./db/myData;MODE=MySQL;DATABASE_TO_UPPER=FALSE
+  jdbcUrl: jdbc:h2:file:./db/nfdData;MODE=MySQL;DATABASE_TO_UPPER=FALSE
   driverClassName: org.h2.Driver
   username: root
   password: '123456'

web-service/src/main/resources/http-tools/test.http

@@ -83,14 +83,10 @@ GET http://127.0.0.1:6400/parser?url=https://share.feijipan.com/s/nMtCOXL
 ### 小飞机盘 https://share.feijipan.com/s/laUshYGk
 # @no-redirect
 GET http://127.0.0.1:6400/parser?url=https://share.feijipan.com/s/laUshYGk
-### 小飞机盘
+### 小飞机盘 tIfhRqH
 GET http://127.0.0.1:6400/json/fj/tIfhRqH
 ### 小飞机盘 https://share.feijipan.com/s/7jy0zlv
 GET http://127.0.0.1:6400/json/fj/7jy0zlv
-
-### 小飞机盘
-# @no-redirect
-GET http://127.0.0.1:6400/fj/tIfhRqH
 ### 小飞机盘 https://share.feijipan.com/s/nMtCOXL
 # @no-redirect
 GET http://127.0.0.1:6400/fj/nMtCOXL

web-service/src/test/java/cn/qaiu/web/test/Test01.java

@@ -1,9 +1,9 @@
 package cn.qaiu.web.test;
 
 import io.vertx.ext.web.RoutingContext;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.Converter;
+import org.apache.commons.beanutils2.BeanUtils;
+import org.apache.commons.beanutils2.ConvertUtils;
+import org.apache.commons.beanutils2.Converter;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Test;