Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes

jiangping

2023-08-25 282e032b5771da13d224214d3b0b71f3efde9a42

 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());
        // 比较密码