lab_xuhui 发布系统代码 [ibiz-task，任务调度]

app_web/src/pages/task/task-index-view/router.ts

@@ -3,10 +3,11 @@ import Router from 'vue-router';
 import { AuthGuard } from '@/utils';
 import qs from 'qs';
 import { globalRoutes, indexRoutes} from '@/router'
-
+import { ProjectSetting } from '@/setting';
 Vue.use(Router);
 
 const router = new Router({
+    ...ProjectSetting.routeSetting,
     routes: [
         {
             path: '/taskindexview/:taskindexview?',

app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

app_web/src/widgets/jobs-registry/main-grid/main-grid-base.vue

 <template>
 <div class='grid' style="height:100%">
   <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
+    <input style="display:none;" />
     <el-table v-if="isDisplay === true"
         :default-sort="{ prop: minorSortPSDEF, order: Object.is(minorSortDir, 'ASC') ? 'ascending' : Object.is(minorSortDir, 'DESC') ? 'descending' : '' }"  
         @sort-change="onSortChange($event)"  

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java

@@ -196,8 +196,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
     @Override
     @Transactional
     public JobsInfo start(JobsInfo et) {
-        et.set("Last_time","0");
         et.set("Status","0");
+        et.set("Last_time","0");
         update(et);
         return et;
     }

ibztask-core/src/main/resources/liquibase/h2_table.xml

@@ -58,7 +58,7 @@
 
 
     <!--输出实体[JOBS_LOG]数据结构 -->
-    <changeSet author="root" id="tab-jobs_log-1-3">
+    <changeSet author="root" id="tab-jobs_log-2-3">
         <createTable tableName="JOBS_LOG">
                 <column name="ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>

ibztask-core/src/main/resources/mapper/task/jobslog/JobsLogMapper.xml

@@ -29,11 +29,14 @@
 
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.core.task.filter.JobsLogSearchContext"  resultMap="JobsLogResultMap">
+	 	select * from (
          select t1.* from (
                 <include refid="Default" />
          )t1
          <where><if test="ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere">${ew.sqlSegment}</if></where>
          <if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">${ew.sqlSegment}</if>
+		 )t1
+		 order by create_time  desc  
      </select>
 
     <!--数据查询[Default]-->

ibztask-util/src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java

@@ -27,6 +27,8 @@ import cn.ibizlab.util.cache.cacheManager.LayeringCacheManager;
 import cn.ibizlab.util.cache.listener.RedisMessageListener;
 import cn.ibizlab.util.cache.redis.CustomJacksonSerializer;
 import cn.ibizlab.util.enums.RedisChannelTopic;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.data.redis.LettuceClientConfigurationBuilderCustomizer;
 
 /**
  * 缓存配置类
@@ -127,4 +129,15 @@ public class RedisCacheConfig {
         container.addMessageListener(messageListener, RedisChannelTopic.REDIS_CACHE_DYNAMICMODEL_TOPIC.getChannelTopic());
         return container;
     }
+
+    @Bean
+    @ConditionalOnProperty(
+            value = {"spring.redis.ssl"},
+            havingValue = "true"
+    )
+    public LettuceClientConfigurationBuilderCustomizer lettuceClientConfigurationBuilderCustomizer(){
+        return (clientConfigurationBuilder) ->{
+            clientConfigurationBuilder.useSsl().disablePeerVerification();
+        };
+    }
 }
\ No newline at end of file