Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-24 fe0ef3441cd689e3679696d990b0ca1b5d7193ac

 server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java

@@ -35,6 +35,9 @@
        if(usernamePasswordToken.getDdLogin()){
            return Boolean.TRUE;
        }
        if(usernamePasswordToken.getWxLogin()){
            return Boolean.TRUE;
        }
        // 加密密码
        String pwd = Utils.Secure.encryptPassword(new String(usernamePasswordToken.getPassword()), systemUser.getSalt());
        // 比较密码