From 30c71d62b2ab59600c0c01ccbe0cb85dcfb26895 Mon Sep 17 00:00:00 2001
From: zhaotao <zhaotaohunan@qq.com>
Date: Sun, 17 Jul 2022 09:37:13 +0800
Subject: [PATCH 1/3] =?UTF-8?q?package(docker):=20=E4=BF=AE=E5=A4=8Dwindow?=
 =?UTF-8?q?s=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6crlf=E9=A3=8E=E6=A0=BC=E5=AF=BC=E8=87=B4=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 6ad5a105..86046e97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,9 @@ WORKDIR /app
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 RUN npm config set registry https://registry.npmmirror.com
 RUN npm i -g pm2 @nestjs/cli pnpm
-RUN apk --no-cache add bash
+RUN apk --no-cache add bash dos2unix \
+    && find . -name "*.sh" -exec dos2unix {} \; \
+    && apk del dos2unix
 RUN bash build-output.sh
 
 FROM node:18-alpine as prod

From c2df1060626d6d80a7014c2c8ff5c3068053bf76 Mon Sep 17 00:00:00 2001
From: zhaotao <zhaotaohunan@qq.com>
Date: Sun, 17 Jul 2022 13:54:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?package(docker):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E2=80=9C.dockerignore=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

开发环境下不排除相关文件构建出来的镜像有将近4个G
---
 .dockerignore | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..65c31f59
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,6 @@
+.idea
+runtime
+.git
+
+**/.next/**
+**/node_modules/**
\ No newline at end of file

From bafef2027770a9da1d5185bc1cc8ffecdcb2f0fc Mon Sep 17 00:00:00 2001
From: zhaotao <zhaotaohunan@qq.com>
Date: Sun, 17 Jul 2022 13:55:32 +0800
Subject: [PATCH 3/3] =?UTF-8?q?admin(mail):=20=E4=BF=AE=E6=94=B9=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=9C=8D=E5=8A=A1=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 调整用户名与密码框顺序
2. 修改邮件服务用户名输入框提示
---
 .../components/admin/system-config/mail/index.tsx    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/admin/system-config/mail/index.tsx b/packages/client/src/components/admin/system-config/mail/index.tsx
index fec4553e..83b84eca 100644
--- a/packages/client/src/components/admin/system-config/mail/index.tsx
+++ b/packages/client/src/components/admin/system-config/mail/index.tsx
@@ -51,16 +51,16 @@ export const Mail = () => {
             />
 
             <Form.Input
-              field="emailServicePassword"
-              label="邮件服务密码"
+              field="emailServiceUser"
+              label="邮件服务用户"
               style={{ width: '100%' }}
-              placeholder="输入邮件服务密码"
-              rules={[{ required: true, message: '请输入邮件服务密码' }]}
+              placeholder="输入邮件服务用户名"
+              rules={[{ required: true, message: '请输入邮件服务用户名' }]}
             />
 
             <Form.Input
-              field="emailServiceUser"
-              label="邮件服务用户"
+              field="emailServicePassword"
+              label="邮件服务密码"
               style={{ width: '100%' }}
               placeholder="输入邮件服务密码"
               rules={[{ required: true, message: '请输入邮件服务密码' }]}