Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-common/yifu-common-ldap/src/main/resources/application.properties

-spring.ldap.urls=ldap://192.168.0.240:389
+spring.ldap.urls=ldap://192.168.1.65:389
 spring.ldap.username=cn=admin,dc=worfu,dc=com
-spring.ldap.password=Yifu123456!
+spring.ldap.password=yifu123456!
 spring.ldap.base=dc=worfu,dc=com
\ No newline at end of file

yifu-common/yifu-common-ldap/src/main/resources/ldapConfig.properties

-ldap.url=192.168.0.240
+ldap.url=192.168.1.65
 ldap.port=389
 ldap.userName=cn=admin,dc=worfu,dc=com
-ldap.password=Yifu123456!
+ldap.password=yifu123456!
 ldap.dn=dc=worfu,dc=com
 ldap.baseDn=ou=\u7696\u4FE1\u4EBA\u529B\u96C6\u56E2,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file

yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/service/impl/SysUserServiceImpl.java

@@ -187,7 +187,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 					user.setPassword(ENCODER.encode(password));
 				}else {
 					// 登录失败，随机密码，保证用户密码不一致
-					user.setPassword(password+RandomUtil.getSix());
+					user = null;
+					//user.setPassword(password+RandomUtil.getSix());
+					throw  new RuntimeException("LDAP登录失败："+ username);
 				}
 			} catch (Exception e) {
 				log.error("LDAP登录异常",e);