Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

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

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>
+        
-        /// 密码
+        //[Required(ErrorMessage = "密码不能为空")]
-        /// </summary>
+        //public override string Password { get; set; }
-        [Required(ErrorMessage = "密码不能为空")]
-        public override string Password { get; set; }
 
-        /// <summary>
+        
-        /// 确认密码
+        //[Required(ErrorMessage = "确认密码不能为空"), Compare(nameof(Password), ErrorMessage = "两次密码不一致")]
-        /// </summary>
+        //public string Confirm { get; set; }
-        [Required(ErrorMessage = "确认密码不能为空"), Compare(nameof(Password), ErrorMessage = "两次密码不一致")]
-        public string Confirm { get; set; }
     }
 
     public class DeleteUserInput : UserInput

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))

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>

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>