From e1f4d6e6cff1cf19fbb8c27f28c29ba36f682576 Mon Sep 17 00:00:00 2001 From: terrfly Date: Wed, 21 Jul 2021 15:48:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4pom=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=20=E5=B0=86=E7=BB=84=E4=BB=B6=E6=8F=90=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E5=AF=B9=E5=BA=94=E7=9A=84=E7=9B=AE=E5=BD=95=E4=B8=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/devCommons/config/application.yml | 2 +- conf/manager/application.yml | 2 +- conf/merchant/application.yml | 2 +- conf/payment/application.yml | 2 +- .../jeepay-components-mq/pom.xml | 98 +++++++++++++++++++ .../src/test/java/com/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 .../jeepay-components-oss}/pom.xml | 7 +- .../jeepay/oss/config/AliyunOssYmlConfig.java | 0 .../jeepay/oss/config/OssYmlConfig.java | 0 .../jeepay/oss/constant/OssSavePlaceEnum.java | 0 .../oss/constant/OssServiceTypeEnum.java | 0 .../jeepay/oss/ctrl/OssFileController.java | 0 .../jeepay/oss/model/OssFileConfig.java | 0 .../jeepay/oss/service/AliyunOssService.java | 0 .../jeepay/oss/service/IOssService.java | 0 .../jeepay/oss/service/LocalFileService.java | 0 .../src/test/java/com/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 jeepay-components/pom.xml | 28 ++++++ jeepay-manager/pom.xml | 4 +- jeepay-merchant/pom.xml | 4 +- jeepay-payment/pom.xml | 10 +- jeepay-service/pom.xml | 1 - pom.xml | 36 ++++++- 25 files changed, 175 insertions(+), 21 deletions(-) create mode 100644 jeepay-components/jeepay-components-mq/pom.xml rename {jeepay-oss => jeepay-components/jeepay-components-mq}/src/test/java/com/.gitkeep (100%) rename {jeepay-oss => jeepay-components/jeepay-components-mq}/src/test/resources/.gitkeep (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/pom.xml (91%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/config/AliyunOssYmlConfig.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/config/OssYmlConfig.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/constant/OssSavePlaceEnum.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/constant/OssServiceTypeEnum.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/ctrl/OssFileController.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/model/OssFileConfig.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/service/AliyunOssService.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/service/IOssService.java (100%) rename {jeepay-oss => jeepay-components/jeepay-components-oss}/src/main/java/com/jeequan/jeepay/oss/service/LocalFileService.java (100%) create mode 100644 jeepay-components/jeepay-components-oss/src/test/java/com/.gitkeep create mode 100644 jeepay-components/jeepay-components-oss/src/test/resources/.gitkeep create mode 100644 jeepay-components/pom.xml diff --git a/conf/devCommons/config/application.yml b/conf/devCommons/config/application.yml index 100516a..c22a096 100644 --- a/conf/devCommons/config/application.yml +++ b/conf/devCommons/config/application.yml @@ -96,7 +96,7 @@ isys: file-private-path: ${isys.oss.file-root-path}/private #私有化本地访问,不允许url方式公共读取 ( 一般配合root-path参数进行设置,需以‘/’ 开头, 无需以‘/’结尾 ) # [local]: 本地存储,所有的文件将存在放本地,可通过nfs, rsync工具实现多机共享; - # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 + # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-components-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 service-type: local # 阿里云OSS服务配置信息 diff --git a/conf/manager/application.yml b/conf/manager/application.yml index e44a9d8..196835a 100644 --- a/conf/manager/application.yml +++ b/conf/manager/application.yml @@ -109,7 +109,7 @@ isys: file-private-path: ${isys.oss.file-root-path}/private #私有化本地访问,不允许url方式公共读取 ( 一般配合root-path参数进行设置,需以‘/’ 开头, 无需以‘/’结尾 ) # [local]: 本地存储,所有的文件将存在放本地,可通过nfs, rsync工具实现多机共享; - # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 + # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-components-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 service-type: local # 阿里云OSS服务配置信息 diff --git a/conf/merchant/application.yml b/conf/merchant/application.yml index ef2ab45..0dcaba7 100644 --- a/conf/merchant/application.yml +++ b/conf/merchant/application.yml @@ -109,7 +109,7 @@ isys: file-private-path: ${isys.oss.file-root-path}/private #私有化本地访问,不允许url方式公共读取 ( 一般配合root-path参数进行设置,需以‘/’ 开头, 无需以‘/’结尾 ) # [local]: 本地存储,所有的文件将存在放本地,可通过nfs, rsync工具实现多机共享; - # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 + # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-components-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 service-type: local # 阿里云OSS服务配置信息 diff --git a/conf/payment/application.yml b/conf/payment/application.yml index 69b7fe4..ce1691e 100644 --- a/conf/payment/application.yml +++ b/conf/payment/application.yml @@ -107,7 +107,7 @@ isys: file-private-path: ${isys.oss.file-root-path}/private #私有化本地访问,不允许url方式公共读取 ( 一般配合root-path参数进行设置,需以‘/’ 开头, 无需以‘/’结尾 ) # [local]: 本地存储,所有的文件将存在放本地,可通过nfs, rsync工具实现多机共享; - # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 + # [aliyun-oss]: 将文件统一上传到阿里云oss服务器; 注意:需调整jeepay-components-oss/pom.xml中的aliyun-sdk-oss组件依赖方式 service-type: local # 阿里云OSS服务配置信息 diff --git a/jeepay-components/jeepay-components-mq/pom.xml b/jeepay-components/jeepay-components-mq/pom.xml new file mode 100644 index 0000000..c750186 --- /dev/null +++ b/jeepay-components/jeepay-components-mq/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + com.jeequan + jeepay-components-mq + jar + ${isys.version} + Jeepay计全支付系统 [jeepay-components-mq] + https://www.jeequan.com + + + com.jeequan + jeepay-components + Final + + + + + + + + org.springframework + spring-context + provided + + + + + org.springframework.boot + spring-boot-starter-data-redis + provided + + + + + org.springframework + spring-webmvc + provided + + + + javax.servlet + javax.servlet-api + provided + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis.plus.starter.version} + provided + + + + + io.jsonwebtoken + jjwt + provided + + + + + org.springframework.security + spring-security-core + provided + + + + + com.alibaba + fastjson + + + + + org.apache.commons + commons-lang3 + + + + + + + + src/main/resources + + + src/main/java + **/*.xml + + + + + + diff --git a/jeepay-oss/src/test/java/com/.gitkeep b/jeepay-components/jeepay-components-mq/src/test/java/com/.gitkeep similarity index 100% rename from jeepay-oss/src/test/java/com/.gitkeep rename to jeepay-components/jeepay-components-mq/src/test/java/com/.gitkeep diff --git a/jeepay-oss/src/test/resources/.gitkeep b/jeepay-components/jeepay-components-mq/src/test/resources/.gitkeep similarity index 100% rename from jeepay-oss/src/test/resources/.gitkeep rename to jeepay-components/jeepay-components-mq/src/test/resources/.gitkeep diff --git a/jeepay-oss/pom.xml b/jeepay-components/jeepay-components-oss/pom.xml similarity index 91% rename from jeepay-oss/pom.xml rename to jeepay-components/jeepay-components-oss/pom.xml index 6f67038..9117b8b 100644 --- a/jeepay-oss/pom.xml +++ b/jeepay-components/jeepay-components-oss/pom.xml @@ -4,15 +4,15 @@ 4.0.0 com.jeequan - jeepay-oss + jeepay-components-oss jar ${isys.version} - Jeepay计全支付系统 [jeepay-oss] + Jeepay计全支付系统 [jeepay-components-oss] https://www.jeequan.com com.jeequan - jeepay + jeepay-components Final @@ -22,7 +22,6 @@ com.jeequan jeepay-core - ${isys.version} diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/config/AliyunOssYmlConfig.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/config/AliyunOssYmlConfig.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/config/AliyunOssYmlConfig.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/config/AliyunOssYmlConfig.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/config/OssYmlConfig.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/config/OssYmlConfig.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/config/OssYmlConfig.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/config/OssYmlConfig.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssSavePlaceEnum.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssSavePlaceEnum.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssSavePlaceEnum.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssSavePlaceEnum.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssServiceTypeEnum.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssServiceTypeEnum.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssServiceTypeEnum.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/constant/OssServiceTypeEnum.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/ctrl/OssFileController.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/ctrl/OssFileController.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/ctrl/OssFileController.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/ctrl/OssFileController.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/model/OssFileConfig.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/model/OssFileConfig.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/model/OssFileConfig.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/model/OssFileConfig.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/AliyunOssService.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/AliyunOssService.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/AliyunOssService.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/AliyunOssService.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/IOssService.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/IOssService.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/IOssService.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/IOssService.java diff --git a/jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/LocalFileService.java b/jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/LocalFileService.java similarity index 100% rename from jeepay-oss/src/main/java/com/jeequan/jeepay/oss/service/LocalFileService.java rename to jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/oss/service/LocalFileService.java diff --git a/jeepay-components/jeepay-components-oss/src/test/java/com/.gitkeep b/jeepay-components/jeepay-components-oss/src/test/java/com/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/jeepay-components/jeepay-components-oss/src/test/resources/.gitkeep b/jeepay-components/jeepay-components-oss/src/test/resources/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/jeepay-components/pom.xml b/jeepay-components/pom.xml new file mode 100644 index 0000000..a07be6d --- /dev/null +++ b/jeepay-components/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.jeequan + jeepay-components + pom + + jeepay-components + Final + Jeepay计全支付系统 + https://www.jeequan.com + + + com.jeequan + jeepay + Final + + + + + jeepay-components-oss + jeepay-components-mq + + + + diff --git a/jeepay-manager/pom.xml b/jeepay-manager/pom.xml index 00d137a..9cb555f 100644 --- a/jeepay-manager/pom.xml +++ b/jeepay-manager/pom.xml @@ -22,14 +22,12 @@ com.jeequan jeepay-service - ${isys.version} com.jeequan - jeepay-oss - ${isys.version} + jeepay-components-oss diff --git a/jeepay-merchant/pom.xml b/jeepay-merchant/pom.xml index e1a91bb..2921dd2 100644 --- a/jeepay-merchant/pom.xml +++ b/jeepay-merchant/pom.xml @@ -22,14 +22,12 @@ com.jeequan jeepay-service - ${isys.version} com.jeequan - jeepay-oss - ${isys.version} + jeepay-components-oss diff --git a/jeepay-payment/pom.xml b/jeepay-payment/pom.xml index 025bc1c..0160bf0 100644 --- a/jeepay-payment/pom.xml +++ b/jeepay-payment/pom.xml @@ -22,14 +22,18 @@ com.jeequan jeepay-service - ${isys.version} com.jeequan - jeepay-oss - ${isys.version} + jeepay-components-oss + + + + + com.jeequan + jeepay-components-mq diff --git a/jeepay-service/pom.xml b/jeepay-service/pom.xml index 58f4669..4b83d05 100644 --- a/jeepay-service/pom.xml +++ b/jeepay-service/pom.xml @@ -22,7 +22,6 @@ com.jeequan jeepay-core - ${isys.version} diff --git a/pom.xml b/pom.xml index 1986582..15cb968 100644 --- a/pom.xml +++ b/pom.xml @@ -25,19 +25,21 @@ jeepay-core jeepay-service - jeepay-oss + jeepay-manager jeepay-merchant jeepay-payment - + jeepay-components + + 1.4.0 + 1.8 UTF-8 - 1.4.0 1.1.0 @@ -56,6 +58,34 @@ + + + com.jeequan + jeepay-core + ${isys.version} + + + + + com.jeequan + jeepay-service + ${isys.version} + + + + + com.jeequan + jeepay-components-oss + ${isys.version} + + + + + com.jeequan + jeepay-components-mq + ${isys.version} + + com.jeequan