From 135c183e7621ea51f6a004c76f295a01bd9f538d Mon Sep 17 00:00:00 2001
From: axzsd <atva725@qq.com>
Date: Thu, 8 Jun 2023 11:04:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 builds/docker-compose-test.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/builds/docker-compose-test.yml b/builds/docker-compose-test.yml
index bbc9e9322..290d59145 100644
--- a/builds/docker-compose-test.yml
+++ b/builds/docker-compose-test.yml
@@ -25,4 +25,10 @@ services:
       test: ["CMD", "curl", "-f", "http://localhost:48080/actuator/health"]
       timeout: 30s
       interval: 45s
-      retries: 3
\ No newline at end of file
+      retries: 3
+    networks:
+      - app_net
+networks:
+  app_net:
+    external: true
+    name: cyywlnet
\ No newline at end of file

From 29347ab0ad2d16f2f91ed665d3e24eb37733013a Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Thu, 8 Jun 2023 12:35:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/.env.front | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/yudao-ui-admin/.env.front b/yudao-ui-admin/.env.front
index d36aa63b6..11e9040ac 100644
--- a/yudao-ui-admin/.env.front
+++ b/yudao-ui-admin/.env.front
@@ -7,6 +7,9 @@ VUE_APP_TITLE = 创盈商户管理系统
 # 创盈管理系统/本地环境
 VUE_APP_BASE_API = 'http://api-dashboard.yudao.iocoder.cn'
 
+# 根据服务器或域名修改
+PUBLIC_PATH = 'http://admin.nnhwl.top'
+
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 

From 724c591d9fbebd77de15fabdebd03f9da60915e0 Mon Sep 17 00:00:00 2001
From: TianYu <332368756@qq.com>
Date: Fri, 9 Jun 2023 09:54:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/.env.dev                          | 4 ++--
 yudao-ui-admin/.env.prod                         | 2 +-
 yudao-ui-admin/.env.test                         | 8 +-------
 yudao-ui-admin/src/settings.js                   | 2 +-
 yudao-ui-admin/src/views/system/tenant/index.vue | 1 +
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/yudao-ui-admin/.env.dev b/yudao-ui-admin/.env.dev
index 0e883e135..1007f3053 100644
--- a/yudao-ui-admin/.env.dev
+++ b/yudao-ui-admin/.env.dev
@@ -1,12 +1,12 @@
 # 开发环境配置
-ENV = 'development'
+VUE_APP_ENV = 'dev'
 
 # 页面标题
 VUE_APP_TITLE = 创盈商户管理系统
 
 # 芋道管理系统/开发环境
 #VUE_APP_BASE_API = 'https://cmx.bskies.cc:8000/cyywl-api'
-VUE_APP_BASE_API = 'http://api.cyywl.top'
+VUE_APP_BASE_API = 'http://api.nnhwl.top'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/yudao-ui-admin/.env.prod b/yudao-ui-admin/.env.prod
index d8df84b8f..705224209 100644
--- a/yudao-ui-admin/.env.prod
+++ b/yudao-ui-admin/.env.prod
@@ -1,5 +1,5 @@
 # 生产环境配置
-ENV = 'production'
+VUE_APP_ENV = 'production'
 
 # 页面标题
 VUE_APP_TITLE = 创盈商户管理系统
diff --git a/yudao-ui-admin/.env.test b/yudao-ui-admin/.env.test
index 4a749e28f..148067eb0 100644
--- a/yudao-ui-admin/.env.test
+++ b/yudao-ui-admin/.env.test
@@ -1,5 +1,5 @@
 # 开发环境配置
-ENV = 'test'
+VUE_APP_ENV = 'test'
 
 # 页面标题
 VUE_APP_TITLE = 创盈商户管理系统
@@ -7,12 +7,6 @@ VUE_APP_TITLE = 创盈商户管理系统
 # 创盈管理系统/本地环境
 VUE_APP_BASE_API = 'http://api.nnhwl.top'
 
-# 根据服务器或域名修改
-PUBLIC_PATH = 'http://admin.nnhwl.top'
-
-# 根据服务器或域名修改
-PUBLIC_PATH = 'http://admin.nnhwl.top'
-
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
diff --git a/yudao-ui-admin/src/settings.js b/yudao-ui-admin/src/settings.js
index 7c73fb448..bb3420ac5 100644
--- a/yudao-ui-admin/src/settings.js
+++ b/yudao-ui-admin/src/settings.js
@@ -3,7 +3,7 @@ module.exports = {
   /**
    * 推广链接域名
    */
-  spreadDomain: process.env.ENV === 'production' ? 'http://h5.cyywl.top' : 'http://h5.nnhwl.top',
+  spreadDomain: process.env.VUE_APP_ENV === 'production' ? 'http://h5.cyywl.top' : 'http://h5.nnhwl.top',
 
   /**
    * 推广码生成访问H5链接地址
diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue
index bb481684b..1df13bcf1 100755
--- a/yudao-ui-admin/src/views/system/tenant/index.vue
+++ b/yudao-ui-admin/src/views/system/tenant/index.vue
@@ -342,6 +342,7 @@ export default {
       this.resetForm('form');
     },
     handleQRCode(row) {
+      console.log('config.spreadDomain', config.spreadDomain)
       const url =`${config.spreadDomain}${config.spreadLink}?redirectUrl=${config.spreadDomain}&tenantId=${row.id}&isProperty=1`
       QRCode.toCanvas(document.getElementById(`id-${row.id}`), url, {
         scale: 2