From a896e5e336e4ed0141ec9851583ee6ab6497f0a0 Mon Sep 17 00:00:00 2001 From: bootx Date: Sun, 8 Dec 2024 10:24:55 +0800 Subject: [PATCH] =?UTF-8?q?build=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=92=8C=E9=85=8D=E7=BD=AE=E6=B3=A8=E9=87=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _config/postgresql/dax-pay-single.sql | 4 ++-- _doc/ChangeLog.md | 2 +- .../channel/union/sdk/api/UnionPayKit.java | 6 ++--- daxpay-single-server/pom.xml | 17 +++++++------- .../src/main/resources/application-dev.yml | 23 ++++++++++--------- .../src/main/resources/application-docker.yml | 3 ++- 6 files changed, 28 insertions(+), 27 deletions(-) diff --git a/_config/postgresql/dax-pay-single.sql b/_config/postgresql/dax-pay-single.sql index d0092cd6..d0076a4b 100644 --- a/_config/postgresql/dax-pay-single.sql +++ b/_config/postgresql/dax-pay-single.sql @@ -252,7 +252,7 @@ CREATE TABLE "public"."base_param" ( "version" int4 NOT NULL, "deleted" bool NOT NULL, "name" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, - "key" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, + "param_key" varchar(50) COLLATE "pg_catalog"."default" NOT NULL, "value" varchar(500) COLLATE "pg_catalog"."default" NOT NULL, "type" varchar(20) COLLATE "pg_catalog"."default", "enable" bool NOT NULL, @@ -268,7 +268,7 @@ COMMENT ON COLUMN "public"."base_param"."last_modified_time" IS '最后修改时 COMMENT ON COLUMN "public"."base_param"."version" IS '版本号'; COMMENT ON COLUMN "public"."base_param"."deleted" IS '删除标志'; COMMENT ON COLUMN "public"."base_param"."name" IS '参数名称'; -COMMENT ON COLUMN "public"."base_param"."key" IS '参数键名'; +COMMENT ON COLUMN "public"."base_param"."param_key" IS '参数键名'; COMMENT ON COLUMN "public"."base_param"."value" IS '参数值'; COMMENT ON COLUMN "public"."base_param"."type" IS '参数类型'; COMMENT ON COLUMN "public"."base_param"."enable" IS '启用状态'; diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md index bb75239f..f237586d 100644 --- a/_doc/ChangeLog.md +++ b/_doc/ChangeLog.md @@ -1,5 +1,5 @@ # CHANGELOG -## [v3.0.0.beta2] 2024-11-08 +## [v3.0.0.beta2] 2024-12-05 - 新增: 增加PC收银台功能 - 新增: 增加H5收银台功能 - 新增: 增加聚合收银台功能 diff --git a/daxpay-single-channel/daxpay-single-union/src/main/java/org/dromara/daxpay/channel/union/sdk/api/UnionPayKit.java b/daxpay-single-channel/daxpay-single-union/src/main/java/org/dromara/daxpay/channel/union/sdk/api/UnionPayKit.java index 3b791f34..bf063243 100644 --- a/daxpay-single-channel/daxpay-single-union/src/main/java/org/dromara/daxpay/channel/union/sdk/api/UnionPayKit.java +++ b/daxpay-single-channel/daxpay-single-union/src/main/java/org/dromara/daxpay/channel/union/sdk/api/UnionPayKit.java @@ -238,10 +238,8 @@ public class UnionPayKit extends BasePayService { * @return 具体的时间字符串 */ private String getPayTimeout(Date expirationTime) { - if (null != expirationTime) { - return DateUtil.format(expirationTime, DatePattern.PURE_DATETIME_PATTERN); - } - return DateUtil.format(new Timestamp(System.currentTimeMillis() + 30 * 60 * 1000), DatePattern.PURE_DATETIME_PATTERN); + Date date = Objects.requireNonNullElseGet(expirationTime, () -> new Timestamp(System.currentTimeMillis() + 30 * 60 * 1000)); + return DateUtil.format(date,DatePattern.PURE_DATETIME_PATTERN); } /** diff --git a/daxpay-single-server/pom.xml b/daxpay-single-server/pom.xml index 35724ce6..1bf407ab 100644 --- a/daxpay-single-server/pom.xml +++ b/daxpay-single-server/pom.xml @@ -64,16 +64,17 @@ - - - - + + org.postgresql + postgresql + runtime + - - com.mysql - mysql-connector-j - + + + + diff --git a/daxpay-single-server/src/main/resources/application-dev.yml b/daxpay-single-server/src/main/resources/application-dev.yml index 85ec7c7f..0b0aef85 100644 --- a/daxpay-single-server/src/main/resources/application-dev.yml +++ b/daxpay-single-server/src/main/resources/application-dev.yml @@ -5,15 +5,15 @@ spring: datasource: master: # Postgresql连接 -# driver-class-name: org.postgresql.Driver -# url: jdbc:postgresql://postgresql:5432/daxpay?serverTimezone=Asia/Shanghai&autoReconnect=true&reWriteBatchedInserts=true -# username: bootx -# password: bootx123 + driver-class-name: org.postgresql.Driver + url: jdbc:postgresql://127.0.0.1:5432/dax-pay-single?serverTimezone=Asia/Shanghai&autoReconnect=true&reWriteBatchedInserts=true + username: bootx + password: bootx123 # MySQL连接 - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://mysql:3306/dax-pay-single?serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&useSSL=false&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: root +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://127.0.0.1:3306/dax-pay-single?serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&useSSL=false&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true +# username: root +# password: root hikari: keepalive-time: 300000 data: @@ -55,10 +55,7 @@ bootx-platform: - org.dromara.daxpay starter: auth: - # 是否启用超级管理员登录 enable-admin: true - # 用户管理列表中是否显示超级管理员 - admin-in-list: true ignore-urls: - '/actuator/**' - '/v3/api-docs/**' @@ -72,8 +69,12 @@ bootx-platform: - '/web/**' - '/h5/**' - '/css/**' + - '/**' - '/error' - '/favicon.ico' + file-upload: + # 使用后端代理访问, 线上请使用 Nginx 配置或者直连方式，效率更高 + forward-server-url: http://127.0.0.1:9999 dax-pay: # 推荐只使用字母和数字, 特殊符号会导致部分通道出问题 env: DEV diff --git a/daxpay-single-server/src/main/resources/application-docker.yml b/daxpay-single-server/src/main/resources/application-docker.yml index 67fb8916..7ea765c3 100644 --- a/daxpay-single-server/src/main/resources/application-docker.yml +++ b/daxpay-single-server/src/main/resources/application-docker.yml @@ -25,8 +25,9 @@ springdoc: # 默认展开对象类型的属性, 主要用在get类型的参数中 default-flat-param-object: true knife4j: + # 开启接口文档增强特性 enable: true - # 为true 关闭swagger接口 + # 是否为生产环境, 为true关闭swagger接口 production: ${KNIFE4J_PRODUCTION:false} # 基础脚手架配置 bootx-platform: