Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-22 95a9cddb0f20fee1cf01098846c795f4e80131ef

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/UserSiteFallbackFactory.java

@@ -36,7 +36,7 @@
    
            @Override
            public R delUserSite(Long userId) {
                return R.fail("删除用户站点失败:" + throwable.getMessage());
                throw new RuntimeException("删除用户站点失败:" + throwable.getMessage());
            }
        };
    }

 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -114,4 +114,11 @@
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        return passwordEncoder.matches(rawPassword, encodedPassword);
    }
    
    
    public static void main(String[] args) {
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        String encode = passwordEncoder.encode("49a15811ea47e8e9c6d8f3ef4d7bbc54");
        System.err.println(encode);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/query/ShopUserStart.java

New file
@@ -0,0 +1,18 @@
package com.ruoyi.system.query;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author zhibing.pu
 * @date 2024/8/21 20:24
 */
@Data
@ApiModel
public class ShopUserStart {
    @ApiModelProperty("用户id")
    private Long userId;
    @ApiModelProperty("注释")
    private String remark;
}