From b8f5bd6301da86eb3f7fc358746c53115fec9a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Mon, 21 Oct 2024 22:26:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E6=AD=A3=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 7 +++++-- .env.local | 2 +- .env.prod | 8 +++++++- .env.stage | 6 ++++++ .env.test | 6 ++++++ 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/.env.dev b/.env.dev index 2008a0027..38eefccbb 100644 --- a/.env.dev +++ b/.env.dev @@ -1,5 +1,5 @@ # 开发环境：本地只启动前端项目，依赖开发环境（后端、APP） -NODE_ENV=production +NODE_ENV=development VITE_DEV=true @@ -25,10 +25,13 @@ VITE_SOURCEMAP=true VITE_BASE_PATH=/ # 输出路径 -VITE_OUT_DIR=dist +VITE_OUT_DIR=dist-dev # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=true + +# 文档地址的开关 +VITE_APP_DOCALERT_ENABLE=true diff --git a/.env.local b/.env.local index ad0847004..2f37b2a67 100644 --- a/.env.local +++ b/.env.local @@ -1,5 +1,5 @@ # 本地开发环境：本地启动所有项目（前端、后端、APP）时使用，不依赖外部环境 -NODE_ENV=development +NODE_ENV=local VITE_DEV=true diff --git a/.env.prod b/.env.prod index 8b78c4155..25e63d0db 100644 --- a/.env.prod +++ b/.env.prod @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='http://180.76.238.127:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server @@ -29,3 +29,9 @@ VITE_OUT_DIR=dist-prod # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=true + +# 文档地址的开关 +VITE_APP_DOCALERT_ENABLE=false diff --git a/.env.stage b/.env.stage index 3d005c7b3..741a60c83 100644 --- a/.env.stage +++ b/.env.stage @@ -29,3 +29,9 @@ VITE_OUT_DIR=dist-stage # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=true + +# 文档地址的开关 +VITE_APP_DOCALERT_ENABLE=false diff --git a/.env.test b/.env.test index 80f4c660d..4459101a8 100644 --- a/.env.test +++ b/.env.test @@ -29,3 +29,9 @@ VITE_OUT_DIR=dist-test # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=true + +# 文档地址的开关 +VITE_APP_DOCALERT_ENABLE=true From 612afb9beca60d5f5fae8120b89a34649d461a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Thu, 31 Oct 2024 11:32:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BF=AE=E6=AD=A3=E7=8E=AF=E5=A2=83=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .env.prod | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 4b0f5bf6a..543811769 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ VITE_APP_CAPTCHA_ENABLE=true VITE_APP_DOCALERT_ENABLE=true # 百度统计 -VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc +VITE_APP_BAIDU_CODE=a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 diff --git a/.env.prod b/.env.prod index 25e63d0db..7a925fd8f 100644 --- a/.env.prod +++ b/.env.prod @@ -4,7 +4,7 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://180.76.238.127:48080' +VITE_BASE_URL='https://localhost:48080' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server @@ -28,7 +28,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-prod # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' +VITE_MALL_H5_DOMAIN='https://mall.zhenxiangqu.com' # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=true From 6a555f83cbdacee2851fd928dd96a3577d881754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Thu, 31 Oct 2024 11:36:20 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E6=9C=89=E7=A9=BA=E6=A0=BC=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E9=BB=84=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.env b/.env index 543811769..06b30f288 100644 --- a/.env +++ b/.env @@ -20,6 +20,6 @@ VITE_APP_DOCALERT_ENABLE=true VITE_APP_BAIDU_CODE=a1ff8825baa73c3a78eb96aa40325abc # 默认账户密码 -VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码 -VITE_APP_DEFAULT_LOGIN_USERNAME = admin -VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123 +VITE_APP_DEFAULT_LOGIN_TENANT=芋道源码 +VITE_APP_DEFAULT_LOGIN_USERNAME=admin +VITE_APP_DEFAULT_LOGIN_PASSWORD=admin123 From abaab2458ac13e59f92275b22f0c564f189baa53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Thu, 31 Oct 2024 11:37:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=95=86=E5=9F=8E=E5=9C=B0=E5=9D=80=E8=BF=98?= =?UTF-8?q?=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.prod b/.env.prod index 7a925fd8f..0818eaf7b 100644 --- a/.env.prod +++ b/.env.prod @@ -28,7 +28,7 @@ VITE_BASE_PATH=/ VITE_OUT_DIR=dist-prod # 商城H5会员端域名 -VITE_MALL_H5_DOMAIN='https://mall.zhenxiangqu.com' +VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' # 验证码的开关 VITE_APP_CAPTCHA_ENABLE=true From e42eb59053009689e194517768829608257cae4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com> Date: Fri, 22 Nov 2024 14:59:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E7=99=BB=E5=BD=95=E9=A1=B5=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=82=AC=E6=8C=82=E5=A4=87=E6=A1=88=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en.ts | 1 + src/locales/zh-CN.ts | 1 + src/views/Login/Login.vue | 15 ++++++++++++--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/locales/en.ts b/src/locales/en.ts index 6562c9b75..c2c468d9f 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -115,6 +115,7 @@ export default { login: { welcome: 'Welcome to the system', message: 'Backstage management system', + beian: '冀ICP备20240000000号', tenantname: 'TenantName', username: 'Username', password: 'Password', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b9deb3f24..c85571e61 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -116,6 +116,7 @@ export default { login: { welcome: '欢迎使用本系统', message: '开箱即用的中后台管理系统', + beian: '冀ICP备20240000000号', tenantname: '租户名称', username: '用户名', password: '密码', diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index ff6f068a7..d03612525 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -24,6 +24,15 @@
{{ t('login.message') }}
+
+ + {{ t('login.beian') }} + +
@@ -33,11 +42,11 @@
- {{ underlineToHump(appStore.getTitle) }} + {{ underlineToHump(appStore.getTitle) }}
@@ -116,4 +125,4 @@ $prefix-cls: #{$namespace}-login; background-color: var(--login-bg-color); } } - \ No newline at end of file +