From c2e4ed1a6e3a14406db471304360cd45ac8177d1 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 11 八月 2023 18:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java b/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
index 9be80cc..8d01643 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroCredentialsMatcher.java
+++ b/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());
         // 姣旇緝瀵嗙爜

--
Gitblit v1.9.3