From ee9f51ce7d88a4ec9c9a3c5298dbd67aa03288ed Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 25 Aug 2024 00:50:16 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=20quartz=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/common/constant/Const.java      |  2 ++
 .../visor/framework/common/utils/IpUtils.java | 10 ++++----
 .../OrionQuartzAutoConfiguration.java         | 24 -------------------
 .../log/core/annotation/IgnoreLog.java        |  3 +++
 .../mybatis/core/mapper/IMapper.java          |  7 +++---
 ...rion-vue-views-components-card-list.vue.vm |  2 +-
 .../src/main/resources/application.yaml       |  4 ++--
 .../asset/controller/HostController.java      |  2 +-
 .../components/host-identity-card-list.vue    |  1 +
 .../components/host-key-card-list.vue         |  1 +
 .../host-list/components/host-card-list.vue   |  1 +
 .../command-snippet-drawer.vue                |  4 ++--
 .../path-bookmark/path-bookmark-drawer.vue    |  4 ++--
 13 files changed, 25 insertions(+), 40 deletions(-)

diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
index d1bb333a..7ec76752 100644
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
@@ -29,4 +29,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons
 
     String SYSTEM_USERNAME = "system";
 
+    int BATCH_COUNT = 500;
+
 }
diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java
index 2e0398bf..3a4c7e0a 100644
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/IpUtils.java
@@ -32,11 +32,11 @@ public class IpUtils {
      * @return addr
      */
     public static String getRemoteAddr(HttpServletRequest request) {
-        // 获取实际地址
-        String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP);
-        if (!Strings.isBlank(realIp)) {
-            return realIp;
-        }
+        // 获取实际地址 X_REAL_IP 在多代理情况下会有问题
+        // String realIp = request.getHeader(StandardHttpHeader.X_REAL_IP);
+        // if (!Strings.isBlank(realIp)) {
+        //     return realIp;
+        // }
         // 获取请求地址
         return Servlets.getRemoteAddr(request);
     }
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java
index 0d474e28..05d4cff2 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-job/src/main/java/com/orion/visor/framework/job/configuration/OrionQuartzAutoConfiguration.java
@@ -7,9 +7,6 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureOrder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.quartz.SchedulerFactoryBean;
-import org.springframework.scheduling.quartz.SpringBeanJobFactory;
-
-import javax.sql.DataSource;
 
 /**
  * quartz 配置
@@ -22,27 +19,6 @@ import javax.sql.DataSource;
 @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_JOB_QUARTZ)
 public class OrionQuartzAutoConfiguration {
 
-    /**
-     * @return 任务工厂
-     */
-    @Bean
-    public SpringBeanJobFactory jobFactory() {
-        return new SpringBeanJobFactory();
-    }
-
-    /**
-     * @param dataSource dataSource
-     * @param jobFactory jobFactory
-     * @return 调度器工厂
-     */
-    @Bean
-    public SchedulerFactoryBean schedulerFactoryBean(DataSource dataSource, SpringBeanJobFactory jobFactory) {
-        SchedulerFactoryBean factory = new SchedulerFactoryBean();
-        factory.setDataSource(dataSource);
-        factory.setJobFactory(jobFactory);
-        return factory;
-    }
-
     /**
      * @param schedulerFactoryBean 调度器工厂
      * @return 调度器
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java
index f8a14ab3..4a4ce0dd 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-log/src/main/java/com/orion/visor/framework/log/core/annotation/IgnoreLog.java
@@ -6,6 +6,9 @@ import java.lang.annotation.*;
 
 /**
  * 不执行统一日志打印
+ * <p>
+ * 如果设置在方法上，则忽略该方法的日志打印
+ * 如果设置到参数上，则忽略该参数的日志打印
  *
  * @author Jiahang Li
  * @version 1.0.0
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
index 13ae6bba..6be3f252 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/java/com/orion/visor/framework/mybatis/core/mapper/IMapper.java
@@ -3,6 +3,7 @@ package com.orion.visor.framework.mybatis.core.mapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.toolkit.Db;
+import com.orion.visor.framework.common.constant.Const;
 import com.orion.visor.framework.mybatis.core.query.Conditions;
 import com.orion.visor.framework.mybatis.core.query.DataQuery;
 
@@ -61,7 +62,7 @@ public interface IMapper<T> extends BaseMapper<T> {
      * @return 是否成功
      */
     default boolean insertBatch(Collection<T> entities) {
-        return Db.saveBatch(entities);
+        return this.insertBatch(entities, Const.BATCH_COUNT);
     }
 
     /**
@@ -82,7 +83,7 @@ public interface IMapper<T> extends BaseMapper<T> {
      * @return 是否成功
      */
     default boolean updateBatch(Collection<T> entities) {
-        return Db.updateBatchById(entities);
+        return this.updateBatch(entities, Const.BATCH_COUNT);
     }
 
     /**
@@ -113,7 +114,7 @@ public interface IMapper<T> extends BaseMapper<T> {
      * @return 是否成功
      */
     default boolean insertOrUpdateBatch(Collection<T> entities) {
-        return Db.saveOrUpdateBatch(entities);
+        return this.insertOrUpdateBatch(entities, Const.BATCH_COUNT);
     }
 
     /**
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
index 401044b3..09623208 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
@@ -1,7 +1,7 @@
 <template>
   <card-list v-model:searchValue="formModel.searchValue"
              search-input-placeholder="输入搜索值"
-             create-card-position="head"
+             :create-card-position="false"
              :loading="loading"
              :field-config="fieldConfig"
              :list="list"
diff --git a/orion-visor-launch/src/main/resources/application.yaml b/orion-visor-launch/src/main/resources/application.yaml
index f6a3008b..3b5f9f8e 100644
--- a/orion-visor-launch/src/main/resources/application.yaml
+++ b/orion-visor-launch/src/main/resources/application.yaml
@@ -82,13 +82,13 @@ spring:
             instanceName: quartzScheduler
           jobStore:
             # 持久化配置
-            class: org.quartz.impl.jdbcjobstore.JobStoreTX
+            class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
             driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
             useProperties: false
             tablePrefix: QRTZ_
             misfireThreshold: 60000
             clusterCheckinInterval: 5000
-            isClustered: true
+            isClustered: false
           # 连接池
           threadPool:
             class: org.quartz.simpl.SimpleThreadPool
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
index c6057562..5fe9b7b7 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/controller/HostController.java
@@ -98,7 +98,7 @@ public class HostController {
     @IgnoreLog(IgnoreLogMode.RET)
     @GetMapping("/list")
     @Operation(summary = "查询主机")
-    @Parameter(name = "type", description = "type", required = false)
+    @Parameter(name = "type", description = "type")
     @PreAuthorize("@ss.hasPermission('asset:host:query')")
     public List<HostVO> getHostList(@RequestParam(value = "type", required = false) String type) {
         return hostService.getHostList(type);
diff --git a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
index 695b89ff..e0038292 100644
--- a/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-identity/components/host-identity-card-list.vue
@@ -1,6 +1,7 @@
 <template>
   <card-list v-model:searchValue="formModel.searchValue"
              search-input-placeholder="输入 id / 名称 / 用户名"
+             :create-card-position="false"
              :loading="loading"
              :field-config="fieldConfig"
              :list="list"
diff --git a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
index 0f3202eb..41cd9c7c 100644
--- a/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-key/components/host-key-card-list.vue
@@ -1,6 +1,7 @@
 <template>
   <card-list v-model:searchValue="formModel.searchValue"
              search-input-placeholder="输入 id / 名称"
+             :create-card-position="false"
              :loading="loading"
              :field-config="fieldConfig"
              :list="list"
diff --git a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
index b9fa59eb..79af02e0 100644
--- a/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
+++ b/orion-visor-ui/src/views/asset/host-list/components/host-card-list.vue
@@ -1,6 +1,7 @@
 <template>
   <card-list v-model:searchValue="formModel.searchValue"
              search-input-placeholder="输入 id / 名称 / 编码 / 地址"
+             :create-card-position="false"
              :loading="loading"
              :field-config="fieldConfig"
              :list="list"
diff --git a/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue b/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue
index 137b405d..a376dcce 100644
--- a/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/command-snippet/command-snippet-drawer.vue
@@ -143,8 +143,8 @@
     try {
       // 查询
       const data = await cacheStore.loadCommandSnippets(true);
-      snippetGroups.value = data.groups;
-      ungroupedItems.value = data.ungroupedItems;
+      snippetGroups.value = data.groups || [];
+      ungroupedItems.value = data.ungroupedItems || [];
       // 设置状态
       filterSnippet();
     } catch (e) {
diff --git a/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue b/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue
index b31ed710..9cc5c589 100644
--- a/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/path-bookmark/path-bookmark-drawer.vue
@@ -145,8 +145,8 @@
     try {
       // 查询
       const data = await cacheStore.loadPathBookmarks(true);
-      bookmarkGroups.value = data.groups;
-      ungroupedItems.value = data.ungroupedItems;
+      bookmarkGroups.value = data.groups || [];
+      ungroupedItems.value = data.ungroupedItems || [];
       // 设置状态
       filterPath();
     } catch (e) {