diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java
new file mode 100644
index 000000000..ec19d7474
--- /dev/null
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenConfiguration.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package top.charles7c.continew.admin.auth.config.satoken;
+
+import cn.dev33.satoken.stp.StpInterface;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Sa-Token 配置
+ *
+ * @author Charles7c
+ * @since 2022/12/19 22:13
+ */
+@Configuration
+public class SaTokenConfiguration {
+
+ /**
+ * Sa-Token 权限认证配置
+ */
+ @Bean
+ public StpInterface stpInterface() {
+ return new SaTokenPermissionImpl();
+ }
+}
diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java
index ca003669c..7e027abff 100644
--- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java
+++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/config/satoken/SaTokenPermissionImpl.java
@@ -16,35 +16,27 @@
package top.charles7c.continew.admin.auth.config.satoken;
-import java.util.ArrayList;
-import java.util.List;
-
import cn.dev33.satoken.stp.StpInterface;
-
import top.charles7c.continew.admin.common.model.dto.LoginUser;
import top.charles7c.continew.admin.common.util.helper.LoginHelper;
+import java.util.ArrayList;
+import java.util.List;
+
/**
- * Sa-Token 权限认证适配
+ * Sa-Token 权限认证实现
*
- * @author Lion Li(RuoYi-Vue-Plus)
* @author Charles7c
* @since 2023/3/1 22:28
*/
public class SaTokenPermissionImpl implements StpInterface {
- /**
- * 获取菜单权限列表
- */
@Override
public List getPermissionList(Object loginId, String loginType) {
LoginUser loginUser = LoginHelper.getLoginUser();
return new ArrayList<>(loginUser.getPermissions());
}
- /**
- * 获取角色权限列表
- */
@Override
public List getRoleList(Object loginId, String loginType) {
LoginUser loginUser = LoginHelper.getLoginUser();
diff --git a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
index 1f5167fe9..3516970ad 100644
--- a/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
+++ b/continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CaptchaController.java
@@ -47,14 +47,13 @@
import top.charles7c.continew.admin.common.constant.RegexConstants;
import top.charles7c.continew.admin.common.model.resp.CaptchaResp;
import top.charles7c.continew.starter.cache.redisson.util.RedisUtils;
-import top.charles7c.continew.starter.captcha.graphic.autoconfigure.GraphicCaptchaProperties;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.charles7c.continew.starter.core.util.TemplateUtils;
import top.charles7c.continew.starter.core.util.validate.CheckUtils;
import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
-import top.charles7c.continew.starter.web.model.R;
import top.charles7c.continew.starter.log.common.annotation.Log;
import top.charles7c.continew.starter.messaging.mail.util.MailUtils;
+import top.charles7c.continew.starter.web.model.R;
import java.time.Duration;
import java.util.LinkedHashMap;
@@ -75,9 +74,9 @@
public class CaptchaController {
private final CaptchaService captchaService;
+ private final Captcha captcha;
private final ProjectProperties projectProperties;
private final CaptchaProperties captchaProperties;
- private final GraphicCaptchaProperties graphicCaptchaProperties;
@Log(ignore = true)
@Operation(summary = "获取行为验证码", description = "获取行为验证码(Base64编码)")
@@ -98,7 +97,6 @@ public R