diff --git a/Dockerfile b/Dockerfile
index 5f71b275..97089a03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ WORKDIR /
EXPOSE 9898
# 添加执行jar包
-ADD bootx-start/target/bootx-start.jar bootx-start.jar
+ADD dax-start/target/dax-start.jar dax-start.jar
# 执行启动命令
-CMD java $JAVA_OPTS -jar bootx-start.jar
+CMD java $JAVA_OPTS -jar dax-start.jar
diff --git a/dax-pay/pom.xml b/dax-pay/pom.xml
index b7287fa7..9b405bf1 100644
--- a/dax-pay/pom.xml
+++ b/dax-pay/pom.xml
@@ -18,24 +18,6 @@
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-undertow
-
-
org.springframework.boot
@@ -181,32 +163,6 @@
IJPay-WxPay
${IJPay.version}
-
-
-
-
- xml-apis
- xml-apis
- ${xml-apis.version}
-
-
-
- com.plumelog
- plumelog-logback
- ${plumelog.version}
-
-
-
- dax-pay
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
-
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java
index 3cac0a4e..02ecbfaf 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/DaxPayApplication.java
@@ -1,18 +1,9 @@
package cn.bootx.platform.daxpay;
-import cn.hutool.core.util.StrUtil;
-import io.minio.credentials.MinioClientConfigProvider;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Mapper;
import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.core.env.Environment;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
/**
* DaxPay 支付开发平台
@@ -23,26 +14,6 @@ import java.net.UnknownHostException;
@Slf4j
@ConfigurationPropertiesScan
@MapperScan(annotationClass = Mapper.class)
-@SpringBootApplication
public class DaxPayApplication {
- public static void main(String[] args) throws UnknownHostException {
- ConfigurableApplicationContext application = SpringApplication.run(DaxPayApplication.class, args);
- Environment env = application.getEnvironment();
- // 环境变量
- String appName = env.getProperty("spring.application.name");
- String host = InetAddress.getLocalHost().getHostAddress();
- String port = env.getProperty("server.port");
- String contextPath = env.getProperty("server.servlet.context-path", "");
- String path = env.getProperty("spring.mvc.servlet.path", "");
-
- // 应用信息栏
- String appInfo = StrUtil.format("应用 '{}' 运行成功! \n\t", appName);
- // swagger栏
- String swagger = StrUtil.format("Swagger文档: \t\thttp://{}:{}{}{}/doc.html\n\t", host, port, contextPath, path);
-
- log.info("\n----------------------------------------------------------\n\t" + "{}{} \n"
- + "----------------------------------------------------------", appInfo, swagger);
- }
-
}
diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java
index faeaf8cf..deb2cd91 100644
--- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java
+++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/voucher/service/VoucherPayService.java
@@ -300,7 +300,7 @@ public class VoucherPayService {
if (Objects.equals(v,voucher)){
voucherLog.setAmount(voucherPayment.getAmount())
.setType(VoucherCode.LOG_REFUND_SELF)
- .setRemark(String.format("退款金额 %.2f, 退款到卡号: %s 储值卡中", voucherAmount, voucher.getCardNo()))
+ .setRemark(String.format("退款金额 %.2f, 退款到卡号: %s 储值卡中", voucherAmount, voucher.getCardNo()));
}
}
voucherManager.updateById(voucher);
diff --git a/dax-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dax-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..c7c0e3e8
--- /dev/null
+++ b/dax-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+cn.bootx.platform.daxpay.DaxPayApplication
diff --git a/dax-start/pom.xml b/dax-start/pom.xml
new file mode 100644
index 00000000..9c2f5e32
--- /dev/null
+++ b/dax-start/pom.xml
@@ -0,0 +1,72 @@
+
+
+ 4.0.0
+
+ cn.bootx.platform
+ bootx-dax-pay
+ 1.3.0
+
+ dax-start
+
+
+
+
+
+ org.projectlombok
+ lombok
+ provided
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
+
+ cn.bootx.platform
+ dax-pay
+ ${dax.version}
+
+
+
+
+
+ xml-apis
+ xml-apis
+ ${xml-apis.version}
+
+
+
+ com.plumelog
+ plumelog-logback
+ ${plumelog.version}
+
+
+
+
+
+ dax-pay
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+
+
diff --git a/dax-start/src/main/java/cn/bootx/platform/daxpay/DaxPayStart.java b/dax-start/src/main/java/cn/bootx/platform/daxpay/DaxPayStart.java
new file mode 100644
index 00000000..d1c7847a
--- /dev/null
+++ b/dax-start/src/main/java/cn/bootx/platform/daxpay/DaxPayStart.java
@@ -0,0 +1,42 @@
+package cn.bootx.platform.daxpay;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.Environment;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * DaxPay 支付开发平台
+ *
+ * @author xxm
+ * @since 2023/4/20
+ */
+@Slf4j
+@SpringBootApplication
+public class DaxPayStart {
+
+ public static void main(String[] args) throws UnknownHostException {
+ ConfigurableApplicationContext application = SpringApplication.run(DaxPayStart.class, args);
+ Environment env = application.getEnvironment();
+ // 环境变量
+ String appName = env.getProperty("spring.application.name");
+ String host = InetAddress.getLocalHost().getHostAddress();
+ String port = env.getProperty("server.port");
+ String contextPath = env.getProperty("server.servlet.context-path", "");
+ String path = env.getProperty("spring.mvc.servlet.path", "");
+
+ // 应用信息栏
+ String appInfo = StrUtil.format("应用 '{}' 运行成功! \n\t", appName);
+ // swagger栏
+ String swagger = StrUtil.format("Swagger文档: \t\thttp://{}:{}{}{}/doc.html\n\t", host, port, contextPath, path);
+
+ log.info("\n----------------------------------------------------------\n\t" + "{}{} \n"
+ + "----------------------------------------------------------", appInfo, swagger);
+ }
+
+}
diff --git a/dax-pay/src/main/resources/application-dev.yml b/dax-start/src/main/resources/application-dev.yml
similarity index 100%
rename from dax-pay/src/main/resources/application-dev.yml
rename to dax-start/src/main/resources/application-dev.yml
diff --git a/dax-pay/src/main/resources/application.yml b/dax-start/src/main/resources/application.yml
similarity index 100%
rename from dax-pay/src/main/resources/application.yml
rename to dax-start/src/main/resources/application.yml
diff --git a/dax-pay/src/main/resources/banner.txt b/dax-start/src/main/resources/banner.txt
similarity index 100%
rename from dax-pay/src/main/resources/banner.txt
rename to dax-start/src/main/resources/banner.txt
diff --git a/dax-pay/src/main/resources/db/migration/V1.0.0_230511__release.sql b/dax-start/src/main/resources/db/migration/V1.0.0_230511__release.sql
similarity index 100%
rename from dax-pay/src/main/resources/db/migration/V1.0.0_230511__release.sql
rename to dax-start/src/main/resources/db/migration/V1.0.0_230511__release.sql
diff --git a/dax-pay/src/main/resources/logback-spring.xml b/dax-start/src/main/resources/logback-spring.xml
similarity index 100%
rename from dax-pay/src/main/resources/logback-spring.xml
rename to dax-start/src/main/resources/logback-spring.xml
diff --git a/dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml b/dax-start/src/main/resources/mapper/wallet/WalletMapper.xml
similarity index 100%
rename from dax-pay/src/main/resources/mapper/wallet/WalletMapper.xml
rename to dax-start/src/main/resources/mapper/wallet/WalletMapper.xml
diff --git a/dax-pay/src/main/resources/templates/errorCashier.html b/dax-start/src/main/resources/templates/errorCashier.html
similarity index 100%
rename from dax-pay/src/main/resources/templates/errorCashier.html
rename to dax-start/src/main/resources/templates/errorCashier.html
diff --git a/dax-pay/src/main/resources/templates/wechatJsapiPay.html b/dax-start/src/main/resources/templates/wechatJsapiPay.html
similarity index 100%
rename from dax-pay/src/main/resources/templates/wechatJsapiPay.html
rename to dax-start/src/main/resources/templates/wechatJsapiPay.html
diff --git a/docker-compose.yml b/docker-compose.yml
index f6c09044..c8233e91 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,12 @@
version: '3'
services:
platform:
- image: bootx-platform:latest
+ image: dax-start:latest
restart: always
ports:
- "8080:8080"
volumes:
# 宿主机目录:容器目录 日志映射
- - /data/logs/bootx-platform:/logs
- # 外部化配置文件
- - ./application.yml:/application.yml
+ - /data/logs/dax-start:/logs
+ # 读取外部化配置文件
+ - ./:/
diff --git a/pom.xml b/pom.xml
index ad419c4e..dfc9164f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
dax-pay
+ dax-start
@@ -28,6 +29,7 @@
1.3.1
+ 1.3.0
5.8.15
6.4.0