Dev

README.md

@@ -1,5 +1,5 @@
 <div align="center"><img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/9/11/11e7e78e-2af0-4c68-9811-db8a4c4400f4.png" alt="logo" width="520" /></div>
-<p style="margin-top: 12px" align="center"><b>一款高颜值、现代化的自动化运维&轻量堡垒机平台。</b></p>
+<p style="margin-top: 12px" align="center"><b>【Dromara】 一款高颜值、现代化的自动化运维&轻量堡垒机平台。</b></p>
 <p align="center">
     <a target="_blank"
        style="text-decoration: none !important;"

docker-compose-testing.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.1
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.1
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 10
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.1
     privileged: true
     ports:
       - 6380:6379

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.1
     privileged: true
     ports:
       - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
       - mysql
       - redis
   mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.1
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 15
       start_period: 3s
   redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.1
     privileged: true
     ports:
       - 6380:6379
@@ -68,7 +68,7 @@ services:
       retries: 15
       start_period: 3s
   adminer:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.1
     ports:
       - 8081:8080
     depends_on:

docker/adminer/build.sh

@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.2.0
+version=2.2.1
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}

docker/mysql/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.0
+version=2.2.1
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

docker/push.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.0
+version=2.2.1
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

docker/redis/build.sh

@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.2.0
+version=2.2.1
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

docker/service/build.sh

@@ -1,8 +1,8 @@
 #/bin/bash
-version=2.2.0
+version=2.2.1
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
-docker build -t orion-visor-service:${version} .
+docker build --no-cache -t orion-visor-service:${version} .
 rm -rf ./orion-visor-launch.jar
 rm -rf ./dist
 docker tag orion-visor-service:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:${version}

docs/index.html

@@ -20,7 +20,7 @@
         // 左侧文档名称
         name: 'orion-visor',
         // 右上角仓库
-        repo: 'https://github.com/lijiahangmax/orion-visor',
+        repo: 'https://github.com/dromara/orion-visor',
         coverpage: true,
         // 加载侧边栏
         loadSidebar: true,

orion-visor-dependencies/pom.xml

@@ -10,15 +10,15 @@
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
-    <description>项目所有依赖</description>
+    <description>项目全部依赖</description>
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.2.0</revision>
+        <revision>2.2.1</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
-        <orion.kit.version>2.0.0</orion.kit.version>
+        <orion.kit.version>2.0.1</orion.kit.version>
         <aspectj.version>1.9.7</aspectj.version>
         <lombok.version>1.18.26</lombok.version>
         <springdoc.version>1.6.15</springdoc.version>

orion-visor-framework/orion-visor-framework-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java

@@ -29,7 +29,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.2.0";
+    String VERSION = "2.2.1";
 
     /**
      * 同 ${spring.application.name}

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-server-module-service-impl.java.vm

@@ -142,8 +142,8 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         // 查询
         return ${typeLower}DAO.of(wrapper).list(${type}Convert.MAPPER::to);
     }
-
     #if($meta.enableCache)
+
     @Override
     public List<${type}VO> get${type}ListByCache() {
         // 查询缓存

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-api.ts.vm

@@ -72,14 +72,14 @@ export interface ${vue.featureEntity}QueryResponse extends TableData {
  * $apiComment.create
  */
 export function create${vue.featureEntity}(request: ${vue.featureEntity}CreateRequest) {
-  return axios.post('/${package.ModuleName}/${typeHyphen}/create', request);
+  return axios.post<number>('/${package.ModuleName}/${typeHyphen}/create', request);
 }
 
 /**
  * $apiComment.updateById
  */
 export function update${vue.featureEntity}(request: ${vue.featureEntity}UpdateRequest) {
-  return axios.put('/${package.ModuleName}/${typeHyphen}/update', request);
+  return axios.put<number>('/${package.ModuleName}/${typeHyphen}/update', request);
 }
 
 /**
@@ -126,14 +126,14 @@ export function get${vue.featureEntity}Count(request: ${vue.featureEntity}QueryR
  * $apiComment.deleteById
  */
 export function delete${vue.featureEntity}(id: number) {
-  return axios.delete('/${package.ModuleName}/${typeHyphen}/delete', { params: { id } });
+  return axios.delete<number>('/${package.ModuleName}/${typeHyphen}/delete', { params: { id } });
 }
 
 /**
  * $apiComment.batchDelete
  */
 export function batchDelete${vue.featureEntity}(idList: Array<number>) {
-  return axios.delete('/${package.ModuleName}/${typeHyphen}/batch-delete', {
+  return axios.delete<number>('/${package.ModuleName}/${typeHyphen}/batch-delete', {
     params: { idList },
     paramsSerializer: params => {
       return qs.stringify(params, { arrayFormat: 'comma' });

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm

@@ -34,8 +34,8 @@
           #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long")
           <a-input-number v-model="formModel.${field.propertyName}"
                           placeholder="请输入${field.comment}"
-                          allow-clear
-                          hide-button />
+                          hide-button
+                          allow-clear />
           #elseif("$field.propertyType" == "Date")
           <a-date-picker v-model="formModel.${field.propertyName}"
                          style="width: 100%"
@@ -180,19 +180,12 @@
     });
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchCardData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchCardData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 重置条件
   const reset = () => {

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm

@@ -21,17 +21,20 @@
           #if(${dictMap.containsKey(${field.propertyName})})
           <a-select v-model="formModel.${field.propertyName}"
                     :options="toOptions($dictMap.get(${field.propertyName}).keyField)"
-                    placeholder="请选择${field.comment}" />
+                    placeholder="请选择${field.comment}"
+                    allow-clear />
           #else
           #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long")
           <a-input-number v-model="formModel.${field.propertyName}"
                           placeholder="请输入${field.comment}"
-                          hide-button />
+                          hide-button
+                          allow-clear />
           #elseif("$field.propertyType" == "Date")
           <a-date-picker v-model="formModel.${field.propertyName}"
                          style="width: 100%"
                          placeholder="请选择${field.comment}"
-                         show-time />
+                         show-time
+                         allow-clear />
           #else
           <a-input v-model="formModel.${field.propertyName}"
                    placeholder="请输入${field.comment}"

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm

@@ -25,17 +25,20 @@
         #if(${dictMap.containsKey(${field.propertyName})})
           <a-select v-model="formModel.${field.propertyName}"
                     :options="toOptions($dictMap.get(${field.propertyName}).keyField)"
-                    placeholder="请选择${field.comment}" />
+                    placeholder="请选择${field.comment}"
+                    allow-clear />
           #else
           #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long")
           <a-input-number v-model="formModel.${field.propertyName}"
                           placeholder="请输入${field.comment}"
-                          hide-button />
+                          hide-button
+                          allow-clear />
           #elseif("$field.propertyType" == "Date")
           <a-date-picker v-model="formModel.${field.propertyName}"
                          style="width: 100%"
                          placeholder="请选择${field.comment}"
-                         show-time />
+                         show-time
+                         allow-clear />
           #else
           <a-input v-model="formModel.${field.propertyName}"
                    placeholder="请输入${field.comment}"

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm

@@ -18,8 +18,8 @@
         #if("$field.propertyType" == "Integer" || "$field.propertyType" == "Long")
         <a-input-number v-model="formModel.${field.propertyName}"
                         placeholder="请输入${field.comment}"
-                        allow-clear
-                        hide-button />
+                        hide-button
+                        allow-clear />
         #elseif("$field.propertyType" == "Date")
         <a-date-picker v-model="formModel.${field.propertyName}"
                        style="width: 100%"
@@ -63,7 +63,7 @@
           <a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
                         position="br"
                         type="warning"
-                        @ok="deleteSelectRows">
+                        @ok="deleteSelectedRows">
             <a-button v-permission="['${package.ModuleName}:${typeHyphen}:delete']"
                       type="secondary"
                       status="danger"
@@ -182,7 +182,7 @@
 
   #if($vue.enableRowSelection)
   // 删除选中行
-  const deleteSelectRows = async () => {
+  const deleteSelectedRows = async () => {
     try {
       setLoading(true);
       // 调用删除接口
@@ -215,19 +215,12 @@
     }
   };
 
-  // 添加后回调
-  const addedCallback = () => {
+  // 重新加载
+  const reload = () => {
     fetchTableData();
   };
 
-  // 更新后回调
-  const updatedCallback = () => {
-    fetchTableData();
-  };
-
-  defineExpose({
-    addedCallback, updatedCallback
-  });
+  defineExpose({ reload });
 
   // 加载数据
   const doFetchTableData = async (request: ${vue.featureEntity}QueryRequest) => {

orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-index.vue.vm

@@ -18,15 +18,15 @@
                   @open-update="(e) =>#if($vue.enableDrawerForm) drawer#else modal#end.openUpdate(e)" />
     #end
     #if($vue.enableDrawerForm)
-    <!-- 添加修改模态框 -->
+    <!-- 添加修改抽屉 -->
     <${vue.feature}-form-drawer ref="drawer"
-                   @added="modalAddCallback"
-                   @updated="modalUpdateCallback" />
+                   @added="reload"
+                   @updated="reload" />
     #else
     <!-- 添加修改模态框 -->
     <${vue.feature}-form-modal ref="modal"
-                   @added="modalAddCallback"
-                   @updated="modalUpdateCallback" />
+                   @added="reload"
+                   @updated="reload" />
     #end
   </div>
 </template>
@@ -81,29 +81,16 @@
   const modal = ref();
   #end
 
-  // 添加回调
-  const modalAddCallback = () => {
-    #if($vue.enableCardView)
-    if (renderTable.value) {
-      table.value.addedCallback();
-    } else {
-      card.value.addedCallback();
-    }
-    #else
-    table.value.addedCallback();
-    #end
-  };
-
-  // 修改回调
-  const modalUpdateCallback = () => {
+  // 重新加载
+  const reload = () => {
     #if($vue.enableCardView)
     if (renderTable.value) {
-      table.value.updatedCallback();
+      table.value.reload();
     } else {
-      card.value.updatedCallback();
+      card.value.reload();
     }
     #else
-    table.value.updatedCallback();
+    table.value.reload();
     #end
   };
 

orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java

@@ -112,7 +112,7 @@ public Long createExecJob(ExecJobCreateRequest request) {
         // 设置任务主机
         execJobHostService.setHostIdByJobId(id, request.getHostIdList());
         // 设置 quartz 状态
-        this.setQuartzJobStatus(record, false, true);
+        // this.setQuartzJobStatus(record, false, false);
         log.info("ExecJobService-createExecJob id: {}, effect: {}", id, effect);
         return id;
     }

orion-visor-ui/.env.development

@@ -1,5 +1,5 @@
 VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
 VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.2.0'
+VITE_APP_VERSION= '2.2.1'
 VITE_APP_RELEASE= 'community'
 VITE_DEMO_MODE= false