From e1d48bbf07ba9f9acb4579058a9bd678ed34a686 Mon Sep 17 00:00:00 2001
From: liangzai <2440983361@qq.com>
Date: Thu, 21 Nov 2024 12:25:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(deploy):=20=E7=94=9F=E4=BA=A7=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/user/cmd/api/etc/main.yaml | 12 ++++++------
 docker-compose-env.yml         | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/app/user/cmd/api/etc/main.yaml b/app/user/cmd/api/etc/main.yaml
index 50b7ef3..36e32f0 100644
--- a/app/user/cmd/api/etc/main.yaml
+++ b/app/user/cmd/api/etc/main.yaml
@@ -1,9 +1,9 @@
 Name: user
 Host: 0.0.0.0
 Port: 8888
-DataSource: "qnc:5vg67b3UNHu8@tcp(127.0.0.1:20001)/qnc?charset=utf8mb4&parseTime=True&loc=Local"
+DataSource: "qnc:5vg67b3UNHu8@tcp(qnc_mysql:3306)/qnc?charset=utf8mb4&parseTime=True&loc=Local"
 CacheRedis:
-  - Host: "127.0.0.1:20002"
+  - Host: "qnc_redis:6379"
     Pass: "3m3WsgyCKWqz"          # Redis 密码，如果未设置则留空
     Type: "node"      # 单节点模式
 JwtAuth:
@@ -20,7 +20,7 @@ VerifyCode:
 Encrypt:
   SecretKey: "ff83609b2b24fc73196aac3d3dfb874f"
 WestConfig:
-  Url: "http://proxy.tianyuanapi.com/api/invoke"
+  Url: "https://apimaster.westdex.com.cn/api/invoke"
   Key: "121a1e41fc1690dd6b90afbcacd80cf4"
   SecretId: "449159"
   SecretSecondId: "296804"
@@ -29,14 +29,14 @@ Alipay:
   PrivateKey: "MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCvo8TmTNnVguKwMYrX0z01PfUlSS+AqwwCH1+/P39q6No+09yO1bjhy4LowtDfwKX8F+IZLl5Cx06f1M8KzPvjQliBAfMJ1FuTEOOXPmtE1YLAYIUMLbltR6Crnp16T28eF41Uo0PUo2ple/oSjWhYgsTJjyBMXY04f6HM2uZlHOhG2aOUz2CDNbvkEhNddazuPMgo8Xl7vwENGDFTPa85HmSSoDppFowLdYfAw2Jl1ilKNg4sOPc6d507nXdgpMlUguwZxol6OQ2hBS6v9OjII5cJ1tyR/klJRapnIPmFaPvhDozYwjU6Z3jMvcbrByl0qNpLrbEFS4pn9hfRo4YrAgMBAAECggEAZAi0Ri6TCqXnEk7FMzMec0p8auYJ5hCFYFgaIkS5/1vroUjtH3TePcu5HXSHnkiMwM2hepIMIaB+SU3dNduVwtOwsJk5oOmP1m0SErv8QFISjBrs7AjGyVS4T8ahDl5bfRoQ5pmuMld4a6B2x0Y+ndqs1ddsn9HQctNOhexOuFsSjX1N3PZxFzfRTmGzxf7kwZGlXMN7G1r3Rp4koylYHVpqjXIK34Anc8SVljxFVkFOk62QvBdYcCucepymHNl0pYwPDCCylPH8OpIXOErmPldTflmoLRc+ywu9rw4I8UvkoPgTe+16he+jdi/N7cwbMTfixq+/Aeadjv2AgMuwkQKBgQDgLS3dRFAc6FMSJIA0FKgv5D/R3NZgWilbOAF11PtnE4AX4i0yZryGtLq+3NWCWYQF8iI60lIy3rEf9zWncwfadhWTEDUBjjrqqU46N2ddTzHsDw09I56TT2vrEwCdmJ2vh1hxPfgE3fSDnKbP4Wkl77JCTH7v0rA1jb65Plt8TwKBgQDIkrXqe/pVHDdxswoPL6em32TnKiaJ/R/UDDio20mgGG7FWEJAY5yYtu0y9Ug7W8PjJE7/cJ2/dwDSvHZm8R0iq8d6XkzN03Z+uvzGnMdUraXJZHSPZ5L/2ofysXjt/OtpA1Sox5++1+obiq6CZ6IYORLSxSf+it1JUbKXsNcVZQKBgQCTPzm7984DXtqJtS38h4D9jBgbWcn6Gd7GSuAyrIXBa76ccXSsgWzdskJjcZxQdUnRufyf1Fwni7yeOXullFoZNazwHxoh/nFWh4SZmqCrWoR5AF36xbW4HtfM3XtvCLqye90s7L5HPB8Kf8/WBcJSJ8JX5/UMw7/4PTWEaaAf4wKBgQCEXu7YVgIccYbV7wdQhm7q3rxFI7hTkU6UL4ylRDQPCJDyhREUValf0DozS1XkdueM3MWWJ8i0N+G/MsohnjdQTnZT+DBQFqM5eEai/Y1AAWpMw5N5oS2O1barIR1iU2053QzeZwCyfuTuUFRjk+mSevhFSgDfKN5qKRTor7kDUQKBgB3fC6jO8XCwimPvpsiGnuddNAq/w8iqSjSwuSvbI0Q7Lq6rvAIw2AmkC5t4kW4JcZLUgDvAs4GFoPDYhoL73vc1e2c35VTNck6IxZSQzzQ9pfXFiLtTe6eqggN4EOPGHKLd92CMAgoeySsp3NydpGSx2N/NUqp8BkoFLQ/k2W9o"
   AlipayPublicKey: "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2CqoCp95w/JV3RT/gzF4/8QmVT1HQNaeW7yUp+mA7x9AbjvlTW/+eRn6oGAL/XhZLjvHD0XjKLVKX0MJVS1aUQHEHEbOJN4Eu8II45OavD4iZISa7Kp9V6AM+i4qTyaeV2wNDnGxHQBaLVUGCfMR+56EK2YpORdE1H9uy72SSQseVb3bmpsV9EW/IJNmcVL/ut3uA1JWAoRmzlQ7ekxg7p8AYXzYPEHQr1tl7W+M4zv9wO9GKZCxIqMA8U3RP5npPfRaCfIRGzXzCqFEEUvWuidOB7frsvN4jiPD07qpL2Bi9LM1X/ee2kC/oM8Uhd7ERZhG8MbZfijZKxgrsDKBcwIDAQAB"
   IsProduction: true
-  NotifyUrl: "https://6m4685017o.goho.co/api/v1/pay/alipay/callback"
+  NotifyUrl: "https://app.quannengcha.com/api/v1/pay/alipay/callback"
 Wxpay:
   AppID: "1682635136"
   MchID: "1682635136"
   MchCertificateSerialNumber: "5369B8AEEBDCF7AF274510252E6A8C0659C30F61"
   MchApiv3Key: "e3ea4cf0765f1e71b01bb387dfcdbc9f"
   MchPrivateKeyPath: "merchant/apiclient_key.pem"
-  NotifyUrl: "https://6m4685017o.goho.co/api/v1/pay/wechat/callback"
-  RefundNotifyUrl: "https://6m4685017o.goho.co/api/v1/wechat/refund_callback"
+  NotifyUrl: "https://app.quannengcha.com/api/v1/pay/wechat/callback"
+  RefundNotifyUrl: "https://app.quannengcha.com/api/v1/wechat/refund_callback"
 Ali:
   Code: "d55b58829efb41c8aa8e86769cba4844"
\ No newline at end of file
diff --git a/docker-compose-env.yml b/docker-compose-env.yml
index 32c249e..5932ddb 100644
--- a/docker-compose-env.yml
+++ b/docker-compose-env.yml
@@ -55,6 +55,8 @@ services:
     container_name: qnc_asynqmon
     ports:
       - "20003:8080"
+    environment:
+      - TZ=Asia/Shanghai
     command:
       - '--redis-addr=qnc_redis:6379'
       - '--redis-password=3m3WsgyCKWqz'
@@ -64,6 +66,23 @@ services:
     depends_on:
       - redis
 
+  qnc:
+    container_name: qnc
+    build:
+      context: .
+      dockerfile: ./apps/api/Dockerfile
+    ports:
+      - "20004:8888"
+    environment:
+      - TZ=Asia/Shanghai
+      - ENV=production
+    depends_on:
+      - mysql
+      - redis
+    networks:
+      - qnc_net
+    restart: always
+
 networks:
   qnc_net:
     driver: bridge