Merge branch 'develop-debt' into test-user

* develop-debt:
  添加盟主扣除日志changeType为1
  no message
  更新登陆帐号错误返回由401返回200

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/service/KxsAppUserServiceImpl.java

@@ -40,10 +40,10 @@ public class KxsAppUserServiceImpl implements KxsUserDetailsService{
         R<KxsUser> result = remoteKxsUserService.loadUserByPhone(username, SecurityConstants.FROM_IN);
         KxsUser custom = RetOps.of(result)
                 .getData()
-                .orElseThrow(() -> new UsernameNotFoundException(ErrorTypeEnum.BAD_CREDENTIALS.getDescription()));
+                .orElseThrow(() -> new UsernameNotFoundException(ErrorTypeEnum.USER_NOT_FOUND.getDescription()));
 
         if(Objects.equals(custom.getStatus(), UserStatusEnum.REMOVE.getCode())){
-            throw new UsernameNotFoundException(ErrorTypeEnum.BAD_CREDENTIALS.getDescription());
+            throw new UsernameNotFoundException(ErrorTypeEnum.ACCOUNT_DISABLED.getDescription());
         }
         if(Objects.equals(custom.getStatus(), UserStatusEnum.LOCKED.getCode())){
             throw new LockedException(ErrorTypeEnum.ACCOUNT_LOCKED.getDescription());

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/support/core/SkyDaoAuthenticationProvider.java

@@ -67,6 +67,7 @@ public class SkyDaoAuthenticationProvider extends AbstractUserDetailsAuthenticat
 	public SkyDaoAuthenticationProvider(String active) {
 		this.active = active;
 		setMessageSource(SpringUtil.getBean("securityMessageSource"));
+		setHideUserNotFoundExceptions(false);
 		setPasswordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder());
 	}
 

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/support/handler/SkyAuthenticationFailureEventHandler.java

@@ -69,7 +69,7 @@ public class SkyAuthenticationFailureEventHandler implements AuthenticationFailu
 	private void sendErrorResponse(HttpServletRequest request, HttpServletResponse response,
 			AuthenticationException exception) throws IOException {
 		ServletServerHttpResponse httpResponse = new ServletServerHttpResponse(response);
-		httpResponse.setStatusCode(HttpStatus.UNAUTHORIZED);
+		httpResponse.setStatusCode(HttpStatus.OK);
 		String errorMessage;
 
 		if (exception instanceof OAuth2AuthenticationException authorizationException) {

kxs-user/kxs-user-biz/src/main/resources/mapper/KxsMainMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.kxs.user.biz.mapper.old.KxsMainServerMapper">
 
     <insert id="addAmountLog">
-        insert into LeaderReserveRecord (UserId, Remark, AfterAmt, BeforeAmt, ChangeAmt, sort, TradeDate, TradeMonth, CreateDate)
-        values (#{userId}, #{remark}, #{afterAmount},#{beforeAmount},#{amount}, #{variationType}, DATE_FORMAT(NOW(), '%Y%m%d'), DATE_FORMAT(NOW(), '%Y%m'), NOW())
+        insert into LeaderReserveRecord (UserId, ChangeType, Remark, AfterAmt, BeforeAmt, ChangeAmt, sort, TradeDate, TradeMonth, CreateDate)
+        values (#{userId}, 1, #{remark}, #{afterAmount},#{beforeAmount},#{amount}, #{variationType}, DATE_FORMAT(NOW(), '%Y%m%d'), DATE_FORMAT(NOW(), '%Y%m'), NOW())
     </insert>
 
     <update id="deductMakerUseAmount">