From 4454daa9e07af7c7202c386e533ea055bb79f0df Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 18 Nov 2024 23:17:39 +0800
Subject: [PATCH] =?UTF-8?q?refactor(open):=20=E4=BC=98=E5=8C=96=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/frontend/AddModal.ftl |  8 +++----
 .../handler/SaCheckPermissionHandler.java     |  2 +-
 .../continew/admin/open/mapper/AppMapper.java | 15 +++++++++++-
 .../open/service/impl/AppServiceImpl.java     | 23 ++++++-------------
 .../admin/open/util/ApiSignCheckUtils.java    |  6 ++---
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
index a5250624..83983352 100644
--- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
+++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl
@@ -41,6 +41,10 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  // todo 待补充
+})
+
 const columns: Columns = reactive([
 <#list fieldConfigs as fieldConfig>
   <#if fieldConfig.showInForm>
@@ -81,10 +85,6 @@ const columns: Columns = reactive([
 </#list>
 ])
 
-const { form, resetForm } = useForm({
-  // todo 待补充
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java
index 3a311119..abe438b6 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java
@@ -41,7 +41,7 @@ public class SaCheckPermissionHandler implements SaAnnotationHandlerInterface<Sa
 
     @Override
     public void checkMethod(SaCheckPermission at, Method method) {
-        if (!ApiSignCheckUtils.isExistSignParam()) {
+        if (!ApiSignCheckUtils.isSignParamExists()) {
             _checkMethod(at.type(), at.value(), at.mode(), at.orRole());
         }
     }
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
index 121ac571..66d6de52 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java
@@ -16,8 +16,11 @@
 
 package top.continew.admin.open.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import top.continew.starter.data.mp.base.BaseMapper;
 import top.continew.admin.open.model.entity.AppDO;
+import top.continew.starter.security.crypto.annotation.FieldEncrypt;
 
 /**
  * 应用 Mapper
@@ -25,4 +28,14 @@ import top.continew.admin.open.model.entity.AppDO;
  * @author chengzi
  * @since 2024/10/17 16:03
  */
-public interface AppMapper extends BaseMapper<AppDO> {}
\ No newline at end of file
+public interface AppMapper extends BaseMapper<AppDO> {
+
+    /**
+     * 根据 Access Key 查询
+     * 
+     * @param accessKey Access Key
+     * @return 应用信息
+     */
+    @Select("select * from sys_app where access_key = #{accessKey}")
+    AppDO selectByAccessKey(@FieldEncrypt @Param("accessKey") String accessKey);
+}
\ No newline at end of file
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java
index f6f60e3f..4cd7d112 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java
@@ -33,7 +33,7 @@ import top.continew.admin.open.service.AppService;
 import top.continew.starter.core.constant.StringConstants;
 import top.continew.starter.extension.crud.service.impl.BaseServiceImpl;
 
-import java.time.LocalDateTime;
+import java.util.Optional;
 
 /**
  * 应用业务实现
@@ -74,31 +74,22 @@ public class AppServiceImpl extends BaseServiceImpl<AppMapper, AppDO, AppResp, A
 
     @Override
     public String getSecretKeyByAccessKey(String accessKey) {
-        return baseMapper.lambdaQuery()
-            .select(AppDO::getSecretKey)
-            .eq(AppDO::getAccessKey, accessKey)
-            .oneOpt()
-            .map(AppDO::getSecretKey)
-            .orElse(null);
+        return Optional.ofNullable(baseMapper.selectByAccessKey(accessKey)).map(AppDO::getSecretKey).orElse(null);
     }
 
     @Override
     public boolean isAppExists(String accessKey) {
-        return baseMapper.lambdaQuery().eq(AppDO::getAccessKey, accessKey).exists();
+        return baseMapper.selectByAccessKey(accessKey) != null;
     }
 
     @Override
     public boolean isAppSecretExpired(String accessKey) {
-        LocalDateTime expireTime = baseMapper.lambdaQuery()
-            .select(AppDO::getExpireTime)
-            .eq(AppDO::getAccessKey, accessKey)
-            .oneOpt()
-            .map(AppDO::getExpireTime)
-            .orElse(null);
-        if (expireTime == null) {
+        AppDO app = baseMapper.selectByAccessKey(accessKey);
+        ValidationUtils.throwIfNull(app, "应用不存在");
+        if (app.getExpireTime() == null) {
             return false;
         }
-        return expireTime.isBefore(DateUtil.date().toLocalDateTime());
+        return app.getExpireTime().isBefore(DateUtil.date().toLocalDateTime());
     }
 
     /**
diff --git a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java
index 0f43e2fa..b7c1fb33 100644
--- a/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java
+++ b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java
@@ -18,6 +18,7 @@ package top.continew.admin.open.util;
 
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.context.model.SaRequest;
+import cn.dev33.satoken.sign.SaSignTemplate;
 
 import java.util.List;
 
@@ -37,10 +38,9 @@ public class ApiSignCheckUtils {
      *
      * @return 是否包含sign参数（true：包含；false：不包含）
      */
-    public static boolean isExistSignParam() {
+    public static boolean isSignParamExists() {
         SaRequest saRequest = SaHolder.getRequest();
         List<String> paramNames = saRequest.getParamNames();
-        return paramNames.stream().anyMatch(paramName -> paramName.equals("sign"));
+        return paramNames.stream().anyMatch(SaSignTemplate.sign::equals);
     }
-
 }