feat: update application config and quickstart doc

2025-02-08 18:34:20 +08:00
parent bc4a1d14fe
commit a10f70e8ae
4 changed files with 105 additions and 123 deletions
--- a/build/docker/conf/default/application-common.yml
+++ b/build/docker/conf/default/application-common.yml
@@ -44,19 +44,19 @@ management:
 mail:
  enabled: true
  host: mail.agrandtech.com
-  port: 465
+  port: 25
  # Enable authentication
  auth: true
  # Sender, follows RFC-822 standard
-  from: smtpex <smtpex@agrantech.com>
+  from: smtpext <smtpex@agrandtech.com>
  # User name
-  user: smtpex
+  user: smtpext
  # Password
  pass: Smtp123@agt
  # Use TLS security connection
-  starttlsEnable: true
+  starttlsEnable: false
  # Use SSL security connection
-  sslEnable: true
+  sslEnable: false
  # Timeout value for sending mail, in milliseconds
  timeout: 0
  # Connection timeout value, in milliseconds
--- a/build/docker/wfc/modules/payment/conf/default/application.yml
+++ b/build/docker/wfc/modules/payment/conf/default/application.yml
@@ -85,74 +85,24 @@ logging:
  file:
    name: /opt/wfc/logs/wfc-payment.log

-wxpay:
-    appId: 121412414112
-    mchId: 1131412414
-    mchKey: 1525342aa
-    subAppId: #服务商模式下的子商户公众账号ID
-    subMchId: #服务商模式下的子商户号    
-    keyPath: /opt/wfc/conf/cert/wxpay/wfc-wxpay.pem
-    useSandboxEnv: false
-
+# payment configuration, 
+# alipay configuration
 alipay:
-    appId: 121412414112
-    privateKey: 1131412414
-    publicKey: 1525342aa
-    notifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/alipay/notify
-    returnUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/alipay/return
-    signType: RSA2
-    charset: utf-8
-    gatewayUrl: https://openapi.alipaydev.com/gateway.do
-    logPath: /opt/wfc/logs/alipay/alipay_log.txt
-    maxQueryRetry: 5
-    queryDuration: 5
-    maxCancelRetry: 3
-    cancelDuration: 2
-    heartbeatDelay: 5
-    heartbeatDuration: 5
-    storeId: 
-    storeName: 
-    supportEmail: 
-    supportPhone:
+  appId: 9021000122699258
+  privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7YAcIXV5GJlTWBOoBcrVG1zKxHunznSjYXwTS2DM3YgloxzKye4apfcmBDVnoL93m4QrJTtbiHYvu4yJjJfJsQEY+Wo44IczhDypyu+Il6JpQOwylTs94/+3aaQ1wThsDaGs8edaFGteuw+1pUVl4nxF00fS1VoIR30riqAGFAXrPhcSA6Y9c8HK1htxCelICnPzjpqC4s8ZjrjS7FoyHP2ZAay5fx1VEtah30E4RvycFfV/i2+k3JGFOSeevdCx6Ufu+9Y/RaG4Sh84QuYRQUhAHUswlFDHpRrAnxHzt0zDkOkg3BrCT7vMtBbSOP9BdIhpVTaZm4diQdNbLSl4hAgMBAAECggEAKb1Xc7aQ1KGfTlmj4xSxawlvImOXjAwbWC+6fFlq91BgdjXBhl7b/Y+mvpfBymY3UUIaTAPC/HXGgT2ZoGqImTKsMyGrArgM0qm1M//EfdtV3L96rqxirTqduoSiWL0daWHuWXduoRH8r9K3ZTmY67TLh7FpiKevq9mI7fqs8/qgq5QAN4UPFb3Cq9hDNTU4l6+Bywdg1KkwJ2Jc98SlrIdVl+1eCMAgueLR0aNHTobyPBZ/KfwGRV0OQ3QqjLVgL3zlbzuylYhaZqPgxxd46vgWwkyMiiv7u2OyCetq4LFd+tcNDz0Yqk6rK9/S0oxbN8NM5DLkpwFh/433BoPS3QKBgQD/dsxNr2PYdPLp6pOvw7H2AFMH8CkwTlRg+2f/0fgQF14rJwZgEU6fL5A2JvQeRRC5mCff2m5tDqrS321JNyH/JIKJ+4J8I34GEo/kSCHL3RmyvJGQOQ/EpEyxvP8BV3ob6UO3LR58DOGlJr8eTsr3Y8o9cAMuknCNxvsd2LvybwKBgQC7xKkx4KIPBny6sCOtChOkgIrY3hOCi+ZsHQVESXKzeku0NkH/qrAG+S9pb1XCzXdM2HrzkMeuz6tqi+2TY8nORyY2DZHNW7FqzkAiZ/NO2AgGIlALq1ZfJZke2MxgtBnxSsQ03gfXP9opu/FsLH9a+s6edfHPvKD4kHxlLBfAbwKBgQDYvr6QmuKn4HHJLZGoau0uvw+ziHwp1AubTTLrxgYmAO2Qx0eNcqG2RfChQWOV2xtZnFMYhodyWCNvTsm2eOSLSTrIP3ByStq95DnZganLAgivsXX/W6qZOJ0poCTryoB79enSHKHktjksmjdFS6zBQRVyEvtgJDcC03Rz2lN8WQKBgQCCoJE4otb7bv7s/ccEBeOeaNKvhue5xUwbYKEeXZ6PYAA0sh5+GCf34flq90qJiFl7u4rl0Y4pfk35hLlV9XEasYLSzePmIuktrakOhpTNABus8MgRJjSjYsvAmwCsMf9uTx5qzSBVThWfPSH6qIY9LAj8Un9UjxzJb/Mqi19GvwKBgQC0/KB+3robTqy9KOV4iEKJ4kmnXDRu7ecpMyc8k5HzpolIHcXLZHkBK9pMCXBQ9Kwy6BjRGNnUZOahS+tvnMcjHpwdhu90r7D51GXW/+PeFtphYTscFhHv1yuWbbojzhKf69pZnsVmyllIBqRgtbkS2WNHxWo/peCg47TcLaQNMA==
+  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhBZoE6p1TKpd/WsAJRTA2D6yUTzqLmZ73scxbPxxKwPIg2ys2Ap21u/lVmqBWO9Wf2Z7wUwr/6BP1PQqVpg0GAqU3yjjZ0LGfBitzMBMbGrlOLqJQ3PKgnUNmnOdLR4FlHCAjKtuyxjHkxBTHg/L4punk4lkFJQD8YvzFrYalS6WYw5j1/oq080NbcjPirPCRlsU7MRraQuUqSTdPwm2iHkroKwCEbGv+RtNJCfOkKNQVtRFFgPGMhU4nQ620gdfzsGJsNFKVJnD5SjeDWniBAbaGaVF4rEfKJPe6+XrcMg3h+9Fz+A2IU1KCCoth2neEZEaU1t0KBGxXIuo4efi/QIDAQAB
+  appCertPath: \u5E94\u7528\u516C\u94A5\u8BC1\u4E66
+  aliPayCertPath: \u652F\u4ED8\u5B9D\u516C\u94A5\u8BC1\u4E66
+  aliPayRootCertPath: \u652F\u4ED8\u5B9D\u6839\u8BC1\u4E66
+  serverUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
+  domain: http://192.168.2.249
+  testDomain: http://129.204.171.210:8085

-ccpay:
-    url: https://api.paymentgateway.com/v1/payments
-    apiKey: api-key-from-yml 
-    merchantId: merchant-id-from-yml
-    currency: USD
-    timeout: 30
-    callbackUrl: https://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/payment/callback
-
-unionpay:
-    merId: 700000000000001
-    keyPrivateCert: /opt/wfc/conf/cert/unionpay/wfc-root.pfx
-    keyPrivateCertPwd: 123456
-    signCertType: PKCS12
-    encryptCertPath: /opt/wfc/conf/cert/unionpay/wfc-root.cer
-    acpMiddleCert: /opt/wfc/conf/cert/unionpay/wfc-middle.cer
-    acpRootCert: /opt/wfc/conf/cert/unionpay/wfc-root.cer
-    certSign: true
-    frontUrl: https://gateway.test.95516.com/gateway/api/frontTransReq.do
-    backUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/notify
-    signMethod: 01
-    version: 5.1.0
-    channelType: 07
-    accessType: 0
-    currencyCode: 156
-    bizType: 000201
-    txnType: 01
-    txnSubType: 01
-    payTimeout: 30
-    queryTimeout: 30
-    refundTimeout: 30
-    frontFailUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/fail
-    frontSuccessUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/success
-    frontBackUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/front
-    backBackUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/back
-    frontNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/front/notify
-    backNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/back/notify
-    refundNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/notify
-    queryNotifyUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/query/notify
-    refundSuccessUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/success
-    refundFailUrl: http://wfc-gateway:${GATEWAY_SERVER_PORT:8080}/unionpay/refund/fail
-    querySuccessUrl:    
+# wxpay configuration
+wxpay:
+  appId:
+  appSecret:
+  mchId:
+  partnerKey:
+  certPath:
+  domain: http://192.168.2.249/u
--- a/docs/03-configuration/03-wfc-quickstart.md
+++ b/docs/03-configuration/03-wfc-quickstart.md
@@ -167,57 +167,89 @@ docker-compose >= v2.10.0

 * 修改配置文件

-修改如下omada的配置项
+    * 修改如下omada的配置项, 用于与Omada进行平台整合

-```sh
-    cd /opt/wfc/conf
-    cat application-common.yml 
-        spring:
-            autoconfigure:
-                exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-            mvc:
-                pathmatch:
-                matching-strategy: ant_path_matcher
-            # 资源信息
-            messages:
-                # 国际化资源文件路径
-                basename: i18n/messages
-                
-        # feign 配置
-        feign:
-            sentinel:
-                enabled: true
-            okhttp:
-                enabled: false
-            httpclient:
-                enabled: true
-                disable-ssl-validation: true
-            client:
-                config:
-                default:
-                    connectTimeout: 60000
-                    readTimeout: 60000
-            compression:
-                request:
-                enabled: true
-                min-request-size: 8192
-                response:
-                enabled: true
+    ```sh
+        cd /opt/wfc/docker/conf
+        cat application-common.yml 

-        # 暴露监控端点
-        management:
-            endpoints:
-                web:
-                exposure:
-                    include: '*'
-                
-        # Omada 配置
-        omada:
-            omada-url: 'https://192.168.2.249:8043'
-            omadac-id: 'f3aa6e479b94222581523710cc2c2a9d'
-            client-id: '5036e77c81a74008821c694a715fe2b8'
-            client-secret: '29faa06fb7f244b094377b48eb3083a7 
-```
+            ...
+                    
+            # Omada config
+            omada:
+            # web url or host exp: 'https://192.168.2.249:8043'
+            omada-url: 'https://aps1-omada-northbound.tplinkcloud.com'
+            omadac-id: 'c4decbf73f80094019d664506ec9b4d4'
+            client-id: '6110a77822234243a033e652d1e8a3ae'
+            client-secret: '651957da95f14f45b719876bb68bd6f5'  
+
+            ...    
+    ```
+
+    * 修改如下email的配置项, 用于发送邮箱验证码
+
+    ```sh
+        cd /opt/wfc/docker/conf
+        cat application-common.yml 
+
+            ...
+                    
+            mail:
+                enabled: true
+                host: mail.agrandtech.com
+                port: 25
+                # Enable authentication
+                auth: true
+                # Sender, follows RFC-822 standard
+                from: smtpext <smtpext@agrandtech.com>
+                # User name
+                user: smtpext
+                # Password
+                pass: Smtp123@agt
+                # Use TLS security connection
+                starttlsEnable: false
+                # Use SSL security connection
+                sslEnable: false
+                # Timeout value for sending mail, in milliseconds
+                timeout: 0
+                # Connection timeout value, in milliseconds
+                connectionTimeout: 0
+
+            ...
+    ```
+
+    * 修改支付配置项
+
+    ```sh
+        cd /opt/wfc/docker/wfc/modules/payment/conf/
+        cat application.yml 
+
+            ...
+            
+            # payment configuration, 
+            # alipay configuration        
+            alipay:
+                appId: 9021000122699258
+                privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC7YAcIXV5GJlTWBOoBcrVG1zKxHunznSjYXwTS2DM3YgloxzKye4apfcmBDVnoL93m4QrJTtbiHYvu4yJjJfJsQEY+Wo44IczhDypyu+Il6JpQOwylTs94/+3aaQ1wThsDaGs8edaFGteuw+1pUVl4nxF00fS1VoIR30riqAGFAXrPhcSA6Y9c8HK1htxCelICnPzjpqC4s8ZjrjS7FoyHP2ZAay5fx1VEtah30E4RvycFfV/i2+k3JGFOSeevdCx6Ufu+9Y/RaG4Sh84QuYRQUhAHUswlFDHpRrAnxHzt0zDkOkg3BrCT7vMtBbSOP9BdIhpVTaZm4diQdNbLSl4hAgMBAAECggEAKb1Xc7aQ1KGfTlmj4xSxawlvImOXjAwbWC+6fFlq91BgdjXBhl7b/Y+mvpfBymY3UUIaTAPC/HXGgT2ZoGqImTKsMyGrArgM0qm1M//EfdtV3L96rqxirTqduoSiWL0daWHuWXduoRH8r9K3ZTmY67TLh7FpiKevq9mI7fqs8/qgq5QAN4UPFb3Cq9hDNTU4l6+Bywdg1KkwJ2Jc98SlrIdVl+1eCMAgueLR0aNHTobyPBZ/KfwGRV0OQ3QqjLVgL3zlbzuylYhaZqPgxxd46vgWwkyMiiv7u2OyCetq4LFd+tcNDz0Yqk6rK9/S0oxbN8NM5DLkpwFh/433BoPS3QKBgQD/dsxNr2PYdPLp6pOvw7H2AFMH8CkwTlRg+2f/0fgQF14rJwZgEU6fL5A2JvQeRRC5mCff2m5tDqrS321JNyH/JIKJ+4J8I34GEo/kSCHL3RmyvJGQOQ/EpEyxvP8BV3ob6UO3LR58DOGlJr8eTsr3Y8o9cAMuknCNxvsd2LvybwKBgQC7xKkx4KIPBny6sCOtChOkgIrY3hOCi+ZsHQVESXKzeku0NkH/qrAG+S9pb1XCzXdM2HrzkMeuz6tqi+2TY8nORyY2DZHNW7FqzkAiZ/NO2AgGIlALq1ZfJZke2MxgtBnxSsQ03gfXP9opu/FsLH9a+s6edfHPvKD4kHxlLBfAbwKBgQDYvr6QmuKn4HHJLZGoau0uvw+ziHwp1AubTTLrxgYmAO2Qx0eNcqG2RfChQWOV2xtZnFMYhodyWCNvTsm2eOSLSTrIP3ByStq95DnZganLAgivsXX/W6qZOJ0poCTryoB79enSHKHktjksmjdFS6zBQRVyEvtgJDcC03Rz2lN8WQKBgQCCoJE4otb7bv7s/ccEBeOeaNKvhue5xUwbYKEeXZ6PYAA0sh5+GCf34flq90qJiFl7u4rl0Y4pfk35hLlV9XEasYLSzePmIuktrakOhpTNABus8MgRJjSjYsvAmwCsMf9uTx5qzSBVThWfPSH6qIY9LAj8Un9UjxzJb/Mqi19GvwKBgQC0/KB+3robTqy9KOV4iEKJ4kmnXDRu7ecpMyc8k5HzpolIHcXLZHkBK9pMCXBQ9Kwy6BjRGNnUZOahS+tvnMcjHpwdhu90r7D51GXW/+PeFtphYTscFhHv1yuWbbojzhKf69pZnsVmyllIBqRgtbkS2WNHxWo/peCg47TcLaQNMA==
+                publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhBZoE6p1TKpd/WsAJRTA2D6yUTzqLmZ73scxbPxxKwPIg2ys2Ap21u/lVmqBWO9Wf2Z7wUwr/6BP1PQqVpg0GAqU3yjjZ0LGfBitzMBMbGrlOLqJQ3PKgnUNmnOdLR4FlHCAjKtuyxjHkxBTHg/L4punk4lkFJQD8YvzFrYalS6WYw5j1/oq080NbcjPirPCRlsU7MRraQuUqSTdPwm2iHkroKwCEbGv+RtNJCfOkKNQVtRFFgPGMhU4nQ620gdfzsGJsNFKVJnD5SjeDWniBAbaGaVF4rEfKJPe6+XrcMg3h+9Fz+A2IU1KCCoth2neEZEaU1t0KBGxXIuo4efi/QIDAQAB
+                appCertPath: \u5E94\u7528\u516C\u94A5\u8BC1\u4E66
+                aliPayCertPath: \u652F\u4ED8\u5B9D\u516C\u94A5\u8BC1\u4E66
+                aliPayRootCertPath: \u652F\u4ED8\u5B9D\u6839\u8BC1\u4E66
+                serverUrl: https://openapi-sandbox.dl.alipaydev.com/gateway.do
+                domain: http://192.168.2.249
+                testDomain: http://129.204.171.210:8085
+
+            # wxpay configuration
+            wxpay:
+                appId:
+                appSecret:
+                mchId:
+                partnerKey:
+                certPath:
+                domain: http://192.168.2.249/u
+
+            ...
+    ```

 * 启动/查看/停止/版本软件

--- a/docs/03-configuration/03-wfc-quickstart.pdf
+++ b/docs/03-configuration/03-wfc-quickstart.pdf