From 3725f586d2a16187ce2e0b0bc3edfb6e769375c3 Mon Sep 17 00:00:00 2001
From: ky_yusj <2655568377@qq.com>
Date: Fri, 2 Jul 2021 09:50:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Ewide.Core.xml                    | 10 ----------
 Api/Ewide.Core/Service/User/Dto/UserInput.cs     | 16 ++++++----------
 Api/Ewide.Core/Service/User/SysUserService.cs    |  2 +-
 .../src/pages/business/house/member/form.jsx     |  4 ++--
 web-react/src/pages/system/user/form.jsx         |  4 ++--
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Api/Ewide.Core/Ewide.Core.xml b/Api/Ewide.Core/Ewide.Core.xml
index 113caf5..5d038ce 100644
--- a/Api/Ewide.Core/Ewide.Core.xml
+++ b/Api/Ewide.Core/Ewide.Core.xml
@@ -6804,16 +6804,6 @@
             账号
             </summary>
         </member>
-        <member name="P:Ewide.Core.Service.AddUserInput.Password">
-            <summary>
-            密码
-            </summary>
-        </member>
-        <member name="P:Ewide.Core.Service.AddUserInput.Confirm">
-            <summary>
-            确认密码
-            </summary>
-        </member>
         <member name="P:Ewide.Core.Service.DeleteUserInput.Id">
             <summary>
             用户Id
diff --git a/Api/Ewide.Core/Service/User/Dto/UserInput.cs b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
index 28068f9..a096e4c 100644
--- a/Api/Ewide.Core/Service/User/Dto/UserInput.cs
+++ b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
@@ -84,17 +84,13 @@ namespace Ewide.Core.Service
         [Required(ErrorMessage = "账号名称不能为空")]
         public override string Account { get; set; }
 
-        /// <summary>
-        /// 密码
-        /// </summary>
-        [Required(ErrorMessage = "密码不能为空")]
-        public override string Password { get; set; }
+        
+        //[Required(ErrorMessage = "密码不能为空")]
+        //public override string Password { get; set; }
 
-        /// <summary>
-        /// 确认密码
-        /// </summary>
-        [Required(ErrorMessage = "确认密码不能为空"), Compare(nameof(Password), ErrorMessage = "两次密码不一致")]
-        public string Confirm { get; set; }
+        
+        //[Required(ErrorMessage = "确认密码不能为空"), Compare(nameof(Password), ErrorMessage = "两次密码不一致")]
+        //public string Confirm { get; set; }
     }
 
     public class DeleteUserInput : UserInput
diff --git a/Api/Ewide.Core/Service/User/SysUserService.cs b/Api/Ewide.Core/Service/User/SysUserService.cs
index e32a508..2a36cb5 100644
--- a/Api/Ewide.Core/Service/User/SysUserService.cs
+++ b/Api/Ewide.Core/Service/User/SysUserService.cs
@@ -113,7 +113,7 @@ namespace Ewide.Core.Service
 
             var isExist = await _sysUserRep.AnyAsync(u => u.Account == input.Account, false);
             if (isExist) throw Oops.Oh(ErrorCode.D1003);
-
+            input.Password = CommonConst.DEFAULT_PASSWORD;
             var user = input.Adapt<SysUser>();
             user.Password = MD5Encryption.Encrypt(input.Password);
             if (string.IsNullOrEmpty(user.Name))
diff --git a/web-react/src/pages/business/house/member/form.jsx b/web-react/src/pages/business/house/member/form.jsx
index 3a8145b..db24377 100644
--- a/web-react/src/pages/business/house/member/form.jsx
+++ b/web-react/src/pages/business/house/member/form.jsx
@@ -204,7 +204,7 @@ export default class form extends Component {
                         >
                             <Input autoComplete="off" placeholder="请输入姓名" />
                         </Form.Item>
-                        {this.props.mode == 'add' && (
+                        {/* {this.props.mode == 'add' && (
                             <>
                                 <Form.Item
                                     label="密码"
@@ -225,7 +225,7 @@ export default class form extends Component {
                                     <Input.Password autoComplete="off" placeholder="请确认密码" />
                                 </Form.Item>
                             </>
-                        )}
+                        )} */}
                         <Form.Item label="昵称" name="nickName">
                             <Input autoComplete="off" placeholder="请输入昵称" />
                         </Form.Item>
diff --git a/web-react/src/pages/system/user/form.jsx b/web-react/src/pages/system/user/form.jsx
index 204c88a..8504d3a 100644
--- a/web-react/src/pages/system/user/form.jsx
+++ b/web-react/src/pages/system/user/form.jsx
@@ -298,7 +298,7 @@ export default class form extends Component {
                         >
                             <Input autoComplete="off" placeholder="请输入姓名" />
                         </Form.Item>
-                        {this.props.mode == 'add' && (
+                        {/* {this.props.mode == 'add' && (
                             <>
                                 <Form.Item
                                     label="密码"
@@ -319,7 +319,7 @@ export default class form extends Component {
                                     <Input.Password autoComplete="off" placeholder="请确认密码" />
                                 </Form.Item>
                             </>
-                        )}
+                        )} */}
                         <Form.Item label="昵称" name="nickName">
                             <Input autoComplete="off" placeholder="请输入昵称" />
                         </Form.Item>