diff --git a/Dockerfile b/Dockerfile index c6dbe28c..beb211be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,17 +8,22 @@ MAINTAINER xxm1995@outlook.com ENV TZ=Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -# jvm启动参数, 启动内存256M,最大内存1G,使用G1垃圾回收器 -ENV JAVA_OPTS="-Xms256m -Xmx1G -XX:+UseG1GC -Djava.security.egd=file:/dev/./urandom -Dlogging.config=./logback-spring.xml" - +# 启动命令 +ENV JAVA_COMM="-Djava.security.egd=file:/dev/./urandom -Dfile.encoding=UTF-8" +# 启动选项配置 +ENV JAVA_OPTS="" +# Agent配置 +ENV JAVA_AGENT="" +# 参数配置 +ENV JAVA_ARGS="" # 工作目录 WORKDIR / # 端口暴露 -EXPOSE 9898 +EXPOSE 9000 # 添加执行jar包 -ADD dax-start/target/dax-start.jar dax-start.jar +ADD daxpay-single/daxpay-single-start/target/daxpay-start.jar.jar dax-start.jar # 执行启动命令 CMD java $JAVA_OPTS -jar dax-start.jar diff --git a/README.md b/README.md index 041d6318..8c1bb1ce 100644 --- a/README.md +++ b/README.md @@ -47,12 +47,16 @@ ### 网关接口 > 注:接口平台只开放支付网关相关的接口,不开放系统其他接口。 -地址: https://daxpay.server.demo.bootx.cn:9000/doc.html +地址: https://daxpay.server.bootx.cn/doc.html 账号: daxpay 密码: 123456 +### 收银台演示 + +地址: https://daxpay.demo.bootx.cn/#/cashier + ## 🥞 核心技术栈 | 名称 | 描述 | 版本要求 | |-------------|----------|----------------------------| @@ -66,6 +70,13 @@ ## 💾 系统截图 +### 收银台演示 +![pc.jpg](https://s11.ax1x.com/2024/02/12/pF8n9x0.md.jpg) +### H5收银台演示 +![h5.png](https://s11.ax1x.com/2024/02/12/pF8nPMV.md.png) +### +![pay.png](https://s11.ax1x.com/2024/02/12/pF8np2q.md.png) + ## 🍎 路线图 [**查看开发进度**](https://gitee.com/bootx/dax-pay/issues/I8TQ9Q) diff --git a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java index 18a2aad4..3404a2f2 100644 --- a/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java +++ b/daxpay-single/daxpay-single-gateway/src/main/java/cn/bootx/platform/daxpay/gateway/controller/PayCallbackController.java @@ -27,7 +27,7 @@ import java.util.Map; @Slf4j @Tag(name = "支付通道信息回调") @RestController -@RequestMapping("/pay/callback") +@RequestMapping("/callback/pay") @AllArgsConstructor public class PayCallbackController { diff --git a/daxpay-single/daxpay-single-start/pom.xml b/daxpay-single/daxpay-single-start/pom.xml index c48e97ef..045e69ba 100644 --- a/daxpay-single/daxpay-single-start/pom.xml +++ b/daxpay-single/daxpay-single-start/pom.xml @@ -42,5 +42,14 @@ - + + daxpay-start + + + + org.springframework.boot + spring-boot-maven-plugin + + +