From fa615ae2f51b93c54e097506849c0c51a014a67c Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 29 May 2025 00:58:11 +0800
Subject: [PATCH] 配置
---
oying-generator/src/main/resources/template/admin/Entity.ftl | 6 ++-
oying-system/src/main/resources/config/application-dev.yml | 14 +++---
.idea/vcs.xml | 6 +++
oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java | 40 ++++++++++++++++++++
oying-system/src/main/resources/config/application-prod.yml | 10 ++--
oying-system/src/main/java/com/oying/modules/security/service/WeiXinService.java | 3 +
6 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/oying-generator/src/main/resources/template/admin/Entity.ftl b/oying-generator/src/main/resources/template/admin/Entity.ftl
index d2e9ac4..5673769 100644
--- a/oying-generator/src/main/resources/template/admin/Entity.ftl
+++ b/oying-generator/src/main/resources/template/admin/Entity.ftl
@@ -1,6 +1,7 @@
package ${package}.domain;
-import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
@@ -41,7 +42,8 @@
* @author ${author}
* @date ${date}
**/
-@Data
+@Getter
+@Setter
@TableName("${tableName}")
public class ${className} implements Serializable {
<#if columns??>
diff --git a/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java b/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java
new file mode 100644
index 0000000..7724412
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/security/config/SwiftPassProperties.java
@@ -0,0 +1,40 @@
+package com.oying.modules.security.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author xin
+ * @description
+ * @date 2025/1/22 下午4:49
+ */
+@Getter
+@Setter
+@Configuration
+@ConfigurationProperties(prefix = "swift-pass")
+public class SwiftPassProperties {
+ // 交易密钥1
+ private String key;
+ // 平台私钥
+ private String mchPrivateKey;
+ // 平台公钥
+ private String platPublicKey;
+ // 门店编号1
+ private String mchId;
+ // 签名方式
+ private String signType;
+ // 原生JS
+ private String isRaw;
+ // 是否小程序支付
+ private String isMinipg;
+ // AppID
+ private String appId;
+ // 请求url
+ private String reqUrl;
+ // 支付通知地址
+ private String notifyUrl;
+ // 退款通知地址
+ private String refundUrl;
+}
diff --git a/oying-system/src/main/java/com/oying/modules/security/service/WeiXinService.java b/oying-system/src/main/java/com/oying/modules/security/service/WeiXinService.java
index 2fe0146..2826e98 100644
--- a/oying-system/src/main/java/com/oying/modules/security/service/WeiXinService.java
+++ b/oying-system/src/main/java/com/oying/modules/security/service/WeiXinService.java
@@ -82,6 +82,9 @@
* POST 该接口用于发送订阅消息。
*
* @param data 请求参数
+ * @param openId 用户openId
+ * @param templateId 订阅模板id
+ * @param page 小程序跳转链接
* @return JSONObject
*/
public JSONObject sendMessage(Map<String, Object> data, String openId, String templateId, String page) {
diff --git a/oying-system/src/main/resources/config/application-dev.yml b/oying-system/src/main/resources/config/application-dev.yml
index ce0a962..43ed09a 100644
--- a/oying-system/src/main/resources/config/application-dev.yml
+++ b/oying-system/src/main/resources/config/application-dev.yml
@@ -119,7 +119,7 @@
# 短信验证码key 时间
sms:
- key: lyhd-sms-key-
+ key: oying-sms-key-
time: 300
#微信配置
@@ -148,14 +148,14 @@
# 汇旺财
swift-pass:
- # 密钥1
- key-1: qqqqqqqqqqqqqqqqqqqq
+ # 密钥
+ key: qqqqqqqqqqqqqqqqqqqq
# 私钥
mch-private-key: qqqqqqqqqqqq
# 公钥
plat-public-key: qqqqq
- # 门店编号1
- mch-id-1: 1111
+ # 门店编号
+ mch-id: 1111
# 签名方式
sign-type: MD5
# 原生JS
@@ -167,6 +167,6 @@
# 请求url
req-url: https://pay.hstypay.com/v2/pay/gateway
# 支付通知地址
- notify-url: https://localhost/lyhd/api/swiftPass/alipayCallback
+ notify-url: https://localhost/oying/api/swiftPass/alipayCallback
# 退款通知地址
- refund-url: https://localhost/lyhd/api/swiftPass/returnNotify
+ refund-url: https://localhost/oying/api/swiftPass/returnNotify
diff --git a/oying-system/src/main/resources/config/application-prod.yml b/oying-system/src/main/resources/config/application-prod.yml
index cf83150..cefa2d9 100644
--- a/oying-system/src/main/resources/config/application-prod.yml
+++ b/oying-system/src/main/resources/config/application-prod.yml
@@ -129,7 +129,7 @@
avatarMaxSize: 5
# 短信验证码key 时间
sms:
- key: lyhd-sms-key-
+ key: oying-sms-key-
time: 300
#微信配置
@@ -159,13 +159,13 @@
# 汇旺财
swift-pass:
# 密钥1
- key-1: qqqqqqqqqqqqqqqqqqqq
+ key: qqqqqqqqqqqqqqqqqqqq
# 私钥
mch-private-key: qqqqqqqqqqqq
# 公钥
plat-public-key: qqqqq
# 门店编号1
- mch-id-1: 1111
+ mch-id: 1111
# 签名方式
sign-type: MD5
# 原生JS
@@ -177,6 +177,6 @@
# 请求url
req-url: https://pay.hstypay.com/v2/pay/gateway
# 支付通知地址
- notify-url: https://localhost/lyhd/api/swiftPass/alipayCallback
+ notify-url: https://localhost/oying/api/swiftPass/alipayCallback
# 退款通知地址
- refund-url: https://localhost/lyhd/api/swiftPass/returnNotify
+ refund-url: https://localhost/oying/api/swiftPass/returnNotify
--
Gitblit v1.9.3