fix version 1

2026-09-22 21:15:34 +08:00
parent 9f86366638
commit d63d7e8b3a
277 changed files with 9959 additions and 1514 deletions
--- a/module/finance/wallet/etc/wallet_dev.yaml
+++ b/module/finance/wallet/etc/wallet_dev.yaml
@@ -1,10 +1,9 @@
 Service: "{ServiceKey}"
 Port: 12238

-
-Databases: 
+Databases:
  Driver: postgres
-  Source: 
+  Source:
    - postgres://postgres:CHANGE_ME@127.0.0.1:5432/bsm_dev?sslmode=disable&TimeZone=Asia/Shanghai

 # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。
@@ -12,41 +11,27 @@ Databases:
 Cache: redis://null:CHANGE_ME@127.0.0.1:6379/

 Etcd:
-   Hosts:
-   - "127.0.0.1:2379"
-   Key: service.{Workspace}.{ServiceKey}.rpc
-
+  Endpoints:
+    - "127.0.0.1:2379"

 Gateway:
  Enable: true
  Port: 12239
-## 服务调用
-#Notify:
-#  Etcd:
-#    Hosts:
-#    - 127.0.0.1:2379
-#    Key: service.{Workspace}.notify.rpc
-#
-#Material:
-#  Etcd:
-#    Hosts:
-#    - 127.0.0.1:2379
-#    Key: service.{Workspace}.material.rpc

-MicroService: 
+MicroService:
  Enable: false
  Anonymous:
+    # 渠道回调按渠道验签放行；支付结果不再接受调用方自行提交
    - wallet.wechat.WxCallback
-    - wallet.payment.Callback
    - wallet.payment.Hello

-
 # 日志记录
 Log:
-  ServiceName: {ServiceKey}
-  Mode: file
-  Path: logs/{ServiceKey}
-  Stat: false
+  Name: wallet
+  Level: debug
+  Dir: logs/wallet
+  Console: true
+  File: true

 # 性能监控
 Prometheus:
@@ -54,26 +39,36 @@ Prometheus:
  Port: 22238
  Path: /metrics

-# 链路追踪
-# Telemetry:
-#   Name: {Workspace}.{ServiceKey}.{RuntimeMode}
-#   Endpoint: http://121.37.208.46:14268/api/traces
-#   Sampler: 1.0
-#   Batcher: jaeger
-
-# MQ Pulsar
-#Pulsar:
-#  Endpoints: 127.0.0.1
-#  Token: 9091
-#  Namespaces: {Workspace}
 WeChat:
-  AppID: wx9a2f163207219776
-  AppSecret:
-  SerialNo: 209F629E63E56D2366361969B51FBA0ADCF69F55
-  APIV3Key: MakeSupplyChainFinance1123581321
-  PrivateKey: CHANGE_ME
-  NotifyURL:
+  AppID: ${BSM_WECHAT_APPID}
+  AppSecret: ${BSM_WECHAT_APPSECRET}
+  SerialNo: ${BSM_WECHAT_SERIALNO}
+  APIV3Key: ${BSM_WECHAT_APIV3KEY}
+  PrivateKey: ${BSM_WECHAT_PRIVATEKEY}
+  NotifyURL: ${BSM_WECHAT_NOTIFYURL}
  Currency: CNY
-  MchID: 1670561983
+  MchID: ${BSM_WECHAT_MCHID}
  SubMchID:
-  OpenID:
+  OpenID:
+
+Alipay:
+  AppID: ${BSM_ALIPAY_APPID}
+  AppSecret: ${BSM_ALIPAY_APPSECRET}
+  PrivateKey: ${BSM_ALIPAY_PRIVATEKEY}
+  IsProd: false
+  NotifyURL: ${BSM_ALIPAY_NOTIFYURL}
+  ReturnURL: ${BSM_ALIPAY_RETURNURL}
+  QuitURL: ${BSM_ALIPAY_QUITURL}
+  PublicKeyRsa2Byte: ${BSM_ALIPAY_PUBLICKEYRSA2BYTE}
+  CertPublicKey: ${BSM_ALIPAY_CERTPUBLICKEY}
+  CertRoot: ${BSM_ALIPAY_CERTROOT}
+  CertPublicKeyRsa2: ${BSM_ALIPAY_CERTPUBLICKEYRSA2}
+
+Wallet:
+  Name: ${BSM_WALLET_NAME}
+  URL: ${BSM_WALLET_URL}
+  YMDHMS: "2006-01-02 15:04:05"
+  YMD: "20060102"
+  AlipyIsOpen: false
+  WalletIsOpen: true
+  WechatpayIsOpen: false
--- a/module/finance/wallet/etc/wallet_prod.yaml
+++ b/module/finance/wallet/etc/wallet_prod.yaml
@@ -1,68 +1,71 @@
-Name: {ServiceKey}
-ListenOn: 0.0.0.0:12238
+Service: "{ServiceKey}"
+Port: 12238
+BindIP: 0.0.0.0

-Dsn: postgres://postgres:CHANGE_ME@127.0.0.1:5432/{Workspace}_prod?sslmode=disable&TimeZone=Asia/Shanghai
+Databases:
+  Driver: postgres
+  Source:
+    - ${BSM_WALLET_DB_DSN}

 # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。
-Cache:  redis://null:CHANGE_ME@127.0.0.1:6379/
+Cache: ${BSM_WALLET_CACHE}

 Etcd:
-  Hosts:
-  - 192.168.0.83:2379
-  Key: service.{Workspace}.{ServiceKey}.rpc
+  Endpoints:
+    - ${BSM_ETCD_ENDPOINT}

-# 服务调用
-Notify:
-  Etcd:
-    Hosts:
-      - 192.168.5.161:2379
-    Key: service.{Workspace}.notify.rpc
+Gateway:
+  Enable: true
+  Port: 12239

-# 匿名访问清单，自动注入网关层
-# 匿名访问清单，自动注入网关层
-Anonymous:
-  Key: anonymous.{Workspace}
-  Urls:
-    - wallet.Check.Hello
-    - wallet.Check.Updates
-    - wallet.Data.Configure
-    - wallet.Data.Areas
-    - wallet.Data.Tags
+MicroService:
+  Enable: true
+  Anonymous:
+    # 渠道回调按渠道验签放行；支付结果不再接受调用方自行提交
+    - wallet.wechat.WxCallback

-# 日志记录
 Log:
-  ServiceName: {ServiceKey}
-  Mode: file
-  Path: logs/{ServiceKey}
-  Stat: false
+  Name: wallet
+  Level: info
+  Dir: /usr/local/bsm/logs/wallet
+  Console: false
+  File: true

-# 性能监控
 Prometheus:
  Host: 127.0.0.1
  Port: 22238
  Path: /metrics

-# 链路追踪
-Telemetry:
-  Name: {Workspace}.{ServiceKey}.{RuntimeMode}
-  Endpoint: http://192.168.0.85:14268/api/traces
-  Sampler: 1.0
-  Batcher: jaeger
-
 WeChat:
-  AppID: wx9a2f163207219776
-  AppSecret:
-  SerialNo: 209F629E63E56D2366361969B51FBA0ADCF69F55
-  APIV3Key: MakeSupplyChainFinance1123581321
-  PrivateKey: /usr/local/cert/wechat/apiclient_key.pem
-  NotifyURL: https://srv.make-w.com/wallet.Payment.Callback
+  AppID: ${BSM_WECHAT_APPID}
+  AppSecret: ${BSM_WECHAT_APPSECRET}
+  SerialNo: ${BSM_WECHAT_SERIALNO}
+  APIV3Key: ${BSM_WECHAT_APIV3KEY}
+  PrivateKey: ${BSM_WECHAT_PRIVATEKEY}
+  NotifyURL: ${BSM_WECHAT_NOTIFYURL}
  Currency: CNY
-  MchID: 1670561983
+  MchID: ${BSM_WECHAT_MCHID}
  SubMchID:
  OpenID:
-  
-# MQ Pulsar
-#Pulsar:
-#  Endpoints: 127.0.0.1
-#  Token: 9091
-#  Namespaces: {Workspace}
+
+Alipay:
+  AppID: ${BSM_ALIPAY_APPID}
+  AppSecret: ${BSM_ALIPAY_APPSECRET}
+  PrivateKey: ${BSM_ALIPAY_PRIVATEKEY}
+  IsProd: true
+  NotifyURL: ${BSM_ALIPAY_NOTIFYURL}
+  ReturnURL: ${BSM_ALIPAY_RETURNURL}
+  QuitURL: ${BSM_ALIPAY_QUITURL}
+  PublicKeyRsa2Byte: ${BSM_ALIPAY_PUBLICKEYRSA2BYTE}
+  CertPublicKey: ${BSM_ALIPAY_CERTPUBLICKEY}
+  CertRoot: ${BSM_ALIPAY_CERTROOT}
+  CertPublicKeyRsa2: ${BSM_ALIPAY_CERTPUBLICKEYRSA2}
+
+Wallet:
+  Name: ${BSM_WALLET_NAME}
+  URL: ${BSM_WALLET_URL}
+  YMDHMS: "2006-01-02 15:04:05"
+  YMD: "20060102"
+  AlipyIsOpen: false
+  WalletIsOpen: true
+  WechatpayIsOpen: false
--- a/module/finance/wallet/etc/wallet_test.yaml
+++ b/module/finance/wallet/etc/wallet_test.yaml
@@ -1,61 +1,71 @@
-Name: {ServiceKey}
-ListenOn: 0.0.0.0:12238
+Service: "{ServiceKey}"
+Port: 12238

-Dsn: postgres://postgres:CHANGE_ME@127.0.0.1:5432/{Workspace}_test?sslmode=disable&TimeZone=Asia/Shanghai
+Databases:
+  Driver: postgres
+  Source:
+    - postgres://postgres:CHANGE_ME@127.0.0.1:5432/{Workspace}_test?sslmode=disable&TimeZone=Asia/Shanghai

 # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。
-# DB库设置例：redis://null:Weidong1214@127.0.0.1:6379/12，代表DB12
 Cache: redis://null:CHANGE_ME@127.0.0.1:6379/

 Etcd:
-  Hosts:
-  - 127.0.0.1:2379
-  Key: service.{Workspace}.{ServiceKey}.rpc
+  Endpoints:
+    - "127.0.0.1:2379"

-# 服务调用
-Notify:
-  Etcd:
-    Hosts:
-      - 127.0.0.1:2379
-    Key: service.{Workspace}.notify.rpc
+Gateway:
+  Enable: true
+  Port: 12239

-Material:
-  Etcd:
-    Hosts:
-      - 127.0.0.1:2379
-    Key: service.{Workspace}.material.rpc
-
-# 匿名访问清单，自动注入网关层
-Anonymous:
-  Key: anonymous.{Workspace}
-  Urls:
+MicroService:
+  Enable: false
+  Anonymous:
+    # 渠道回调按渠道验签放行；支付结果不再接受调用方自行提交
    - wallet.wechat.WxCallback
-    - wallet.payment.Callback
+    - wallet.payment.Hello

-
-# 日志记录
 Log:
-  ServiceName: {ServiceKey}
-  Mode: file
-  Path: logs/{ServiceKey}
-  Stat: false
+  Name: wallet
+  Level: debug
+  Dir: logs/wallet
+  Console: true
+  File: true

-# 性能监控
 Prometheus:
  Host: 127.0.0.1
  Port: 22238
  Path: /metrics

-# 链路追踪
-Telemetry:
-  Name: {Workspace}.{ServiceKey}.{RuntimeMode}
-  Endpoint: http://192.168.0.85:14268/api/traces
-  Sampler: 1.0
-  Batcher: jaeger
+WeChat:
+  AppID: ${BSM_WECHAT_APPID}
+  AppSecret: ${BSM_WECHAT_APPSECRET}
+  SerialNo: ${BSM_WECHAT_SERIALNO}
+  APIV3Key: ${BSM_WECHAT_APIV3KEY}
+  PrivateKey: ${BSM_WECHAT_PRIVATEKEY}
+  NotifyURL: ${BSM_WECHAT_NOTIFYURL}
+  Currency: CNY
+  MchID: ${BSM_WECHAT_MCHID}
+  SubMchID:
+  OpenID:

-# MQ Pulsar
-#Pulsar:
-#  Endpoints: 127.0.0.1
-#  Token: 9091
-#  Namespaces: {Workspace}
+Alipay:
+  AppID: ${BSM_ALIPAY_APPID}
+  AppSecret: ${BSM_ALIPAY_APPSECRET}
+  PrivateKey: ${BSM_ALIPAY_PRIVATEKEY}
+  IsProd: false
+  NotifyURL: ${BSM_ALIPAY_NOTIFYURL}
+  ReturnURL: ${BSM_ALIPAY_RETURNURL}
+  QuitURL: ${BSM_ALIPAY_QUITURL}
+  PublicKeyRsa2Byte: ${BSM_ALIPAY_PUBLICKEYRSA2BYTE}
+  CertPublicKey: ${BSM_ALIPAY_CERTPUBLICKEY}
+  CertRoot: ${BSM_ALIPAY_CERTROOT}
+  CertPublicKeyRsa2: ${BSM_ALIPAY_CERTPUBLICKEYRSA2}

+Wallet:
+  Name: ${BSM_WALLET_NAME}
+  URL: ${BSM_WALLET_URL}
+  YMDHMS: "2006-01-02 15:04:05"
+  YMD: "20060102"
+  AlipyIsOpen: false
+  WalletIsOpen: true
+  WechatpayIsOpen: false