From cb4e11b19446843188cf628ac8f6be5fe1fa68c7 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 06 六月 2023 18:01:52 +0800
Subject: [PATCH] 配置

---
 Source/data/applogs/xxl-job/xxl-job-admin.log                                                                              | 2195 ++++++++++++++++++++++++++++++++++
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java                 |    6 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java                      |   25 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java   |    4 
 Source/UBCS-WEB/vue.config.js                                                                                              |    5 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java                     |    9 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java               |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java                              |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java                           |   15 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java                  |   21 
 Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml                                                                         |   20 
 Source/UBCS-WEB/src/api/code/mdmrule.js                                                                                    |    6 
 Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue                                                            |   86 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java                      |  136 ++
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml                                     |   56 
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java                    |    1 
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java                           |    6 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java                  |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java         |   46 
 Source/UBCS-WEB/src/views/code/code.vue                                                                                    |  178 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java                |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java                      |   65 
 Source/UBCS/ubcs-service/ubcs-code/pom.xml                                                                                 |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java               |    9 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java                            |    1 
 Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue                                                  |   32 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml                                        |   43 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java               |   30 
 Source/UBCS-WEB/src/const/code/mdmrule.js                                                                                  |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java                      |   13 
 /dev/null                                                                                                                  |   87 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java        |   53 
 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java                     |  231 +++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java                  |   42 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java                   |   19 
 Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log                                                         |   92 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java            |  121 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java                     |   93 -
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml                                                  |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java                   |   32 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java                          |    8 
 42 files changed, 2,980 insertions(+), 824 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/code/mdmrule.js b/Source/UBCS-WEB/src/api/code/mdmrule.js
index 3dac202..dc5b352 100644
--- a/Source/UBCS-WEB/src/api/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/api/code/mdmrule.js
@@ -1,13 +1,13 @@
 import request from '@/router/axios';
 
-export const gridCodeRule = (current, size, params) => {
+export const gridCodeRule = (page, limit, params) => {
   return request({
     url: '/api/ubcs-code/mdmRule/gridCodeRule',
     method: 'get',
     params: {
+      page,
+      limit,
       ...params,
-      current,
-      size,
     }
   })
 }
diff --git a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
index d9e17d9..8e6bea6 100644
--- a/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
+++ b/Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -14,7 +14,7 @@
         destroy-on-close>
         <div class="search-total">
             <!-- 澶撮儴鎸夐挳鍖哄煙 -->
-            <div class="dialog-search-button"> 
+            <div slot="title" class="dialog-search-button"> 
                 <el-button 
                     type="primary"  
                     size="small"
@@ -55,7 +55,6 @@
                                 <el-option
                                     v-for="condition in item.fieldType=='text' ? searchConditions:switchSearchConditions"
                                     :key="condition.value"
-
                                     :label="condition.label"
                                     :value="condition.value">
                                 </el-option>
@@ -64,8 +63,8 @@
                     </el-col>
                     <el-col :span="12">
                         <div class="grid-content">
-                            <el-input v-show="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
-                            <el-select v-show="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
+                            <el-input v-if="item.fieldType==='text' || item.fieldType===''" v-model="searchFormArrays[index].fieldValue" type="text" placeholder="璇疯緭鍏�"></el-input>
+                            <el-select v-else-if="item.fieldType==='combox'" v-model="searchFormArrays[index].fieldValue" placeholder="璇烽�夋嫨">
                                 <el-option
                                     v-for="option in item.data"
                                     :key="option.value"
@@ -73,7 +72,7 @@
                                     :value="option.value">
                                 </el-option>
                             </el-select>
-                            <el-switch  v-show="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
+                            <el-switch  v-else-if="item.fieldType==='truefalse'" v-model="searchFormArrays[index].fieldValue"></el-switch>
                         </div>
                     </el-col>
                     <el-col :span="2">
@@ -88,6 +87,7 @@
 </template>
 
 <script>
+import { getDictionary } from "@/api/omd/enum";
 export default {
     name: "advancedQuery",
     props: {
@@ -101,10 +101,6 @@
             type: "Object",
             default: {},
         },
-        conditionMapParams: {
-            type: "Object",
-            default: {},
-        },
     },
     data() {
         return {
@@ -114,33 +110,37 @@
             // 瀛楁鏄緭鍏ユ绫诲瀷鐨勬潯浠舵暟缁�
             searchConditions: [
                 {
-                    value: "=",
+                    value: "_equal",
                     label: "绛変簬",
                 },{
-                    value: "like",
-                    label: "鍖呭惈",
-                },{
-                    value: "!=",
+                    value: "_notequal",
                     label: "涓嶇瓑浜�",
                 },{
-                    value: ">",
-                    label: "澶т簬",
+                    value: "_like",
+                    label: "鍖呭惈",
                 },{
-                    value: "<",
+                    value: "_notlike",
+                    label: "涓嶅寘鍚�",
+                },{
+                    value: "_ge", //澶т簬锛岄粯璁や负澶т簬绛変簬
+                    label: "澶т簬", 
+                },{
+                    value: "_le", //灏忎簬锛岄粯璁や负灏忎簬绛変簬
                     label: "灏忎簬",
                 },
             ],
             // 瀛楁鏄崟閫夋垨涓嬫媺妗嗙被鍨嬬殑鏉′欢鏁扮粍
             switchSearchConditions: [
                 {
-                    value: "=",
+                    value: "_equal",
                     label: "绛変簬",
                 },{
-                    value: "!=",
+                    value: "_notequal",
                     label: "涓嶇瓑浜�",
-                },
+                }
             ],
             searchFormArrays: [],
+            fieldValue: '',
         }
     },
     watch: {
@@ -153,12 +153,19 @@
             // 灏唎ptions閰嶇疆璧嬪�煎埌data涓殑option涓紝閬垮厤娣辨祬鎷疯礉鐨勯棶棰樻墍浠ラ渶瑕佽浆json涔嬪悗鍐嶈祴鍊�
             const data = JSON.stringify(this.options);
             this.initOptions = JSON.parse(data);
-            // console.log(this.initOptions);
+            //console.log(this.initOptions); 
             this.initOptions.forEach((item,index) => {
+                if(item.fieldType==='combox') {
+
+                   this.getEnum(item.comboxKey).then(res=>{
+                        console.log(res.data);
+                   })
+                   //item.data = 
+                }
                 let add = {
                     queryField: String(item.queryField),
-                    condition: item.fieldType=='text' ? String("like"):String("="),
-                    fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
+                    condition: item.fieldType==='text' ? String("_like"):String("_equal"),
+                    fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(""),
                 }
                 this.searchFormArrays.push(add)
             });
@@ -169,6 +176,17 @@
         
     },
     methods: {
+
+        async getEnum(enumText){
+            let enumParam = '';
+            await getDictionary({code: enumText}).then(res=>{
+                enumParam = res.data.data;
+                // console.log(res.data);
+            })
+            //console.log(enumParam);
+            return enumParam;
+        },
+
         // 绉婚櫎鎼滅储妗�
         removeInput(index){
             //console.log(this.initOptions);
@@ -183,7 +201,7 @@
             this.initOptions.forEach((item,index) => {
                 let add = {
                     queryField: String(item.queryField),
-                    condition:item.fieldType=='text' ? String("like"):String("="),
+                    condition:item.fieldType=='text' ? String("_like"):String("_equal"),
                     fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
                 }
                 array.push(add)
@@ -203,22 +221,21 @@
             const searchConditions = this.searchFormArrays;
             for(let index = 0; index < searchConditions.length; index++) {
                 //console.log(condtionParam['conditionMap['+searchConditions[index].queryField+']']+'' == 'undefined');
-                if(searchConditions[index].fieldValue != '' || searchConditions[index].fieldValue+''==='false') {
+                if(searchConditions[index].fieldValue.trim() != '' || searchConditions[index].fieldValue+''==='false') {
                     // 瀛樺湪鐩稿悓鐨勬煡璇㈡潯浠�
                     if(condtionParam['conditionMap['+searchConditions[index].queryField+']']+''.trim() != 'undefined' ) {
                         this.$message.warning("瀛樺湪閲嶅鏌ヨ鏉′欢锛岃浠旂粏鏍稿!");
                         return false;
                     }
-                    condtionParam['conditionMap['+searchConditions[index].queryField+']'] = searchConditions[index].fieldValue;
+                    //鎷兼帴鎴恗ap瀵硅薄锛屽皢鏌ヨ瀵硅薄鍜宑ondition鎷兼帴鍦ㄤ竴璧凤紝缁勬垚楂樼骇鏌ヨmap鐨刱ey
+                    condtionParam['conditionMap['+searchConditions[index].queryField+searchConditions[index].condition+']'] = searchConditions[index].fieldValue;
                 }
             }
-            //鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
-            //console.log(condtionParam);
-            // if(){
-
-            // }
-            this.$emit('echoContion',condtionParam)         
-        },
+            // 鏌ヨ鏉′欢娌℃湁鍑虹幇閲嶅灞炴�э紝骞朵笖杩囨护鎺変簡绌哄�硷紝浼犻�掔粰鐖剁粍浠�
+            // console.log(condtionParam);
+            this.$emit('echoContion',condtionParam)
+            this.isShowDialog = false;
+        },    
     }
 }
 </script>
@@ -240,7 +257,8 @@
         position: fixed;
         display: block;
         background-color: #fff;
-        top: 90px;
+        // top: 10%;
+        margin-top: -30px;
         width: 50%;
         z-index: 1000;
     }
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index 6a91563..8800bad 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -413,21 +413,21 @@
                             type: "select",
                             cell: true,
                             clearable: false,
-                            dicData: [{
-                                value: 'like', label: '鍖呭惈'
-                            }, {
-                                value: '=', label: '绛変簬'
-                            }, {
-                                value: '>', label: '澶т簬'
-                            }, {
-                                value: '<', label: '灏忎簬'
-                            }, {
-                                value: '!=', label: '涓嶇瓑浜�'
-                            }, {
-                                value: '>=', label: '澶т簬绛変簬'
-                            }, {
-                                value: '<=', label: '灏忎簬绛変簬'
-                            }]
+                            dicData: [
+                                {
+                                    value: '_like', label: '鍖呭惈'
+                                },{
+                                    value: "_notlike", label: "涓嶅寘鍚�",
+                                }, {
+                                    value: 'equal', label: '绛変簬'
+                                }, {
+                                    value: '_notequal', label: '涓嶇瓑浜�'
+                                }, {
+                                    value: '_ge', label: '澶т簬'
+                                }, {
+                                    value: '_le', label: '灏忎簬'
+                                }
+                            ]
                         },{
                             label: "绛涢�夊��",
                             prop: "filterValue",
@@ -1193,7 +1193,7 @@
                         this.form.codeSrchCondConfigVOS.push(
                             {
                                 filterField: item.id,
-                                filterType: '=',
+                                filterType: 'equal',
                                 filterTypeText: item.name, 
                                 filterValue: '',
                                 $cellEdit: false
diff --git a/Source/UBCS-WEB/src/const/code/mdmrule.js b/Source/UBCS-WEB/src/const/code/mdmrule.js
index 3fb66a1..8793588 100644
--- a/Source/UBCS-WEB/src/const/code/mdmrule.js
+++ b/Source/UBCS-WEB/src/const/code/mdmrule.js
@@ -53,12 +53,12 @@
     },
     {
       label: "鐘舵��",
-      prop: "lcStatusText",
+      prop: "lcStatus",
+      value: "0",
       search: true,
       searchLabelWidth: 45,
       searchSpan: 5,
       type: 'select',
-      //鐢变簬杩欎釜鎺ュ彛杩樺湪璋冭瘯鎵�浠ヨ绛夎皟濂戒簡鎵嶈兘璋冪敤
       dicUrl: "/api/ubcs-omd/enum/dictionary?code=codeSearchLCStatus",
       props: {
         label: "itemName",
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 5e3a4ec..aaeef02 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -63,40 +63,46 @@
             @click="handleDelete">
             鍒� 闄�
           </el-button>
-          <el-button size="small"
+          <el-button type="primary"
+            size="small"
+            icon="el-icon-search"
+            plain
+            @click="openAdvancedQuery('codeRule')">
+            楂樼骇鏌ヨ
+          </el-button>
+          <el-button
+            size="small"
             icon="icon-kelong"
             plain
             @click="openCodeRuleDialog">
             鍏� 闅�
           </el-button>
-          <el-button size="small"
+          <el-button
+            size="small"
             icon="icon-lianjiekelong"
             style="font-size: 12px;"
             plain
             @click="openOtherCodeRuleDialog">
             浠庡叾浠栬鍒欎腑鍏嬮殕鐮佹
           </el-button>
-          <el-button size="small"
+          <el-button
+            size="small"
             icon="el-icon-s-help"
             plain
             @click="handleRange">
             浣跨敤鑼冨洿
           </el-button>
-          <el-button size="small"
+          <el-button 
+              size="small"
               icon="icon-qingkong"
               plain
               @click="clearAllCodeSec">
               娓呯┖鐮佸��
           </el-button>
-          <el-button size="small"
-            icon="el-icon-search"
-            plain
-            @click="openAdvancedQuery">
-            楂樼骇鏌ヨ
-        </el-button>
         </template>
       </avue-crud>
     </basic-container>
+
     <!-- 楂樼骇鏌ヨ瀵硅瘽妗� -->
     <advanced-query
       :ref="advancedQueryParam.ref"
@@ -104,6 +110,7 @@
       :visible.sync="advancedQueryParam.advancedQuerySettingBox"
       @echoContion="echoSeniorContionMap">
     </advanced-query>
+
     <!-- 缂栫爜瑙勫垯鐩稿叧瀵硅瘽妗� -->
     <el-dialog title="缂栫爜瑙勫垯浣跨敤鑼冨洿"
       append-to-body
@@ -117,6 +124,7 @@
         @refresh-change="refreshUseRangeChange">
       </avue-crud>
     </el-dialog>
+
     <!-- 缂栫爜瑙勫垯,鍏嬮殕瀵硅瘽妗� -->
     <el-dialog title="鍏嬮殕缂栫爜瑙勫垯"
       append-to-body
@@ -170,6 +178,7 @@
         <el-button @click="cloneSettingBox = false">鍙� 娑�</el-button>
       </div>
     </el-dialog>
+
     <!-- 缂栫爜瑙勫垯,浠庡叾浠栬鍒欏厠闅嗗璇濇 -->
     <el-dialog title="鍏嬮殕缂栫爜瑙勫垯鐨勫熀纭�淇℃伅"
       append-to-body
@@ -286,6 +295,13 @@
             plain
             @click="deleteBasicCode(scope.row)">
             鍒� 闄�
+        </el-button>
+        <el-button type="primary"
+            size="small"
+            icon="el-icon-search"
+            plain
+            @click="openAdvancedQuery('codeBasicSec')">
+            楂樼骇鏌ヨ
         </el-button>
       </template>
 
@@ -1052,7 +1068,7 @@
           advancedQueryParam: {
             ref: 'advancedQuery',
             advancedQuerySettingBox: false,
-            options: {},
+            options: [],
             //conditionMapParams: {},
           },
 
@@ -1069,47 +1085,16 @@
           };
         },
       },
-      created() {
-          MasterTable({
-            codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
-            functionId: 5,
-          }).then(res=>{
-            console.log(res.data.tableDefineVO.seniorQueryColumns);
-            this.advancedQueryParam.options = res.data.tableDefineVO.seniorQueryColumns;
-          }) 
-          // this.advancedQueryParam.options = [
-          //   {
-          //     data: [],
-          //     title: '缂栧彿',
-          //     fieldType: 'text',
-          //     queryField: 'id',
-          //   },{
-          //     data: [],
-          //     title: '鍚嶇О',
-          //     fieldType: 'text',
-          //     queryField: 'name',
-          //   },{
-          //     data: [],
-          //     title: '鎻忚堪',
-          //     fieldType: 'text',
-          //     queryField: 'description',
-          //   }, {
-          //     data: [],
-          //     title: '鐘舵��',
-          //     fieldType: 'text',
-          //     queryField: 'description',
-          //   }
-          // ]
-      },
       watch:{
 
       },
       methods: {
 
-        /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀鍜屼箣鍓嶄竴鏍� */
+        /** 楂樼骇鏌ヨ瀵硅瘽妗嗙粍浠�,缁勪欢杩斿洖鐨勫�兼槸condtionMap[field]褰㈠紡鐨勬煡璇㈡潯浠讹紝淇濈暀浜嗗拰涔嬪墠涓�鏍风殑鏂瑰紡 */
         echoSeniorContionMap(conditionMaps){
-          console.log(conditionMaps);
-          
+          // console.log(conditionMaps);
+          this.query = conditionMaps;
+          this.onLoad(this.page);
         },
 
         /* 鍏紡缂栬緫妗嗗唴瀹规敼鍙�,瀛愮粍浠剁紪杈戝畬鍏紡涔嬪悗鍐呭鍥炴樉鏃惰皟鐢� */
@@ -2005,8 +1990,78 @@
 
         /** 缂栫爜瑙勫垯鐩稿叧鏂规硶 */
         // 鎵撳紑楂樼骇鏌ヨ绐楀彛
-        openAdvancedQuery(){
-          this.advancedQueryParam.advancedQuerySettingBox = !this.advancedQueryParam.advancedQuerySettingBox;
+        openAdvancedQuery(condition){
+          // MasterTable({
+          //   codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
+          //   functionId: 5,
+          // }).then(res=>{
+          //   console.log(res.data.tableDefineVO.seniorQueryColumns);
+          // }) 
+          if(condition=='codeRule'){
+            this.advancedQueryParam.options = [
+              {
+                data: [],
+                title: '缂栧彿',
+                fieldType: 'text',
+                queryField: 'id',
+              },{
+                data: [],
+                title: '鍚嶇О',
+                fieldType: 'text',
+                queryField: 'name',
+              },{
+                data: [],
+                title: '鎻忚堪',
+                fieldType: 'text',
+                queryField: 'description',
+              },{
+                data: [
+                  // {
+                  //   key: '缂栬緫涓�',
+                  //   value: 'Editing',
+                  // },
+                  // {
+                  //   key: '宸插彂甯�',
+                  //   value: 'Released',
+                  // },
+                  // {
+                  //   key: '鍋滅敤',
+                  //   value: 'Disabled',
+                  // },
+                ],
+                title: '鐘舵��',
+                fieldType: 'combox',
+                queryField: 'lcStatus',
+                comboxKey: 'Eummaterialtype',
+              }
+            ]
+          }else {
+            this.advancedQueryParam.options = [
+              {
+                data: [],
+                title: '鐮佹缂栧彿',
+                fieldType: 'text',
+                queryField: 'id',
+              },{
+                data: [],
+                title: '鐮佹鍚嶇О',
+                fieldType: 'text',
+                queryField: 'name',
+              },{
+                data: [],
+                title: '鎻忚堪',
+                fieldType: 'text',
+                queryField: 'description',
+              },{
+                data: [],
+                title: '鐮佹绫诲瀷',
+                fieldType: 'combox',
+                queryField: 'secType',
+                comboxKey: 'codeSecType',
+              }
+            ]
+          }
+          this.advancedQueryParam.advancedQuerySettingBox = true;
         },
         // 鏌ヨ浣跨敤鑼冨洿
         handleRange(){
@@ -2275,16 +2330,22 @@
           this.onLoad(this.page);
         },
         searchChange(params, done) {
-          this.query = params;
           this.page.currentPage = 1;
-          this.onLoad(this.page, params);
+          // 澶氫釜conditionMap杩欐牱浼犲弬锛屽揩閫熸煡璇㈤粯璁ら噰鐢ㄦā绯婃煡璇�
+          if(params){
+              Object.keys(params).forEach(key=>{
+                this.query['conditionMap['+key+'_like]'] = params[key];
+              });
+          }
+          console.log(this.query);
+          this.onLoad(this.page);
           done();
         }, 
         // 缂栫爜瑙勫垯褰撳墠閫変腑琛屽彉鍖栫殑鏃跺�欒Е鍙�
         selectionChange(list) {
           this.selectionList = list;
           this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
-          //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�
+          //褰撳墠閫変腑琛屼负绌虹殑鏃跺�欏氨灏嗙爜娈电鐞嗚〃鏍兼暟鎹疆绌�,骞剁鐢ㄧ浉鍏冲姛鑳�
           if(list == ''){
             this.basicData = [];
             this.hideBasicTable(false);
@@ -2308,14 +2369,25 @@
         refreshChange() {
           this.onLoad(this.page, this.query);
         },
-        onLoad(page, params = {}) {
+        onLoad(page,params={}) {
           this.loading = true;
-          gridCodeRule(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          gridCodeRule(
+            page.currentPage, 
+            page.pageSize, 
+            this.query
+          ).then(res => {
             //console.log(res.data);
             const data = res.data.data;
             this.page.total = data.total;
             this.data = data.records;
             this.loading = false;
+            // 鏌ヨ鐨勫�间负绌烘椂锛岃灏嗙爜娈电鐞嗙浉鍏崇殑鍐呭绂佺敤
+            if(data.records.length <= 0) {
+              this.hideBasicTable(false);
+              this.selectionList = [];
+              this.basicData = [];
+              return;
+            }
             this.loadBasic(this.data[0])
             this.$nextTick(() => {
               this.$refs.crud.toggleRowSelection(this.data[0]);
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index c3b6e82..99a052c 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,11 +26,12 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-        //  target: 'http://localhost:37000',
+        target: 'http://localhost:37000',
         // target: 'http://192.168.1.63:37000',
         //target: 'http://192.168.3.7:37000',
         // target: 'http://dev.vci-tech.com:37000',
-        target: 'http://192.168.1.51:37000/',
+        //target: 'http://dev.vci-tech.com:37000',
+        // target: 'http://192.168.1.51:37000/',
         //杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
         // target: 'https://saber.bladex.vip/api',
         ws: true,
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
index a367691..bd06787 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/pom.xml
@@ -58,26 +58,6 @@
             <artifactId>staxon</artifactId>
             <version>1.3</version>
         </dependency>-->
-        <!-- poi  -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>4.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>4.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>4.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.vci.ubcs</groupId>
             <artifactId>ubcs-util-api</artifactId>
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
index ae54b6f..beacef8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeReferConfig.java
@@ -11,9 +11,6 @@
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
-import org.apache.commons.math3.util.Precision;
-import org.aspectj.weaver.ast.Not;
-import org.ietf.jgss.Oid;
 
 import java.util.List;
 
@@ -151,15 +148,9 @@
 	private String referTypeName;
 
 	/**
-<<<<<<< Updated upstream
 	 * 鏄惁寮�鍚叏灞�
 	 */
 	private String isOpenGlobal;
-=======
-	 * 鎵�灞為鍩�
-	 */
-	private String doMain;
->>>>>>> Stashed changes
 
 	/**
 	 * 鎺掑簭
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
index e7fae53..53d85f1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeRule.java
@@ -16,6 +16,7 @@
  */
 package com.vci.ubcs.code.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.vci.ubcs.starter.revision.model.BaseModel;
 import io.swagger.annotations.ApiModel;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
index eafa258..1243815 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
@@ -8,15 +8,9 @@
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringPool;
-<<<<<<< Updated upstream
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-=======
-
-import java.util.*;
-import java.util.stream.Collectors;
->>>>>>> Stashed changes
 
 /**
  * Description:
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
deleted file mode 100644
index cb34015..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/MPJLambdaWrapperSqlKeyword.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.vci.ubcs.starter.util;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-
-import java.util.Map;
-
-public class MPJLambdaWrapperSqlKeyword {
-
-	private static final String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
-	private static final String EQUAL = "_equal";
-	private static final String NOT_EQUAL = "_notequal";
-	private static final String LIKE = "_like";
-	private static final String LIKE_LEFT = "_likeleft";
-	private static final String LIKE_RIGHT = "_likeright";
-	private static final String NOT_LIKE = "_notlike";
-	private static final String GE = "_ge";
-	private static final String LE = "_le";
-	private static final String GT = "_gt";
-	private static final String LT = "_lt";
-	private static final String DATE_GE = "_datege";
-	private static final String DATE_GT = "_dategt";
-	private static final String DATE_EQUAL = "_dateequal";
-	private static final String DATE_LT = "_datelt";
-	private static final String DATE_LE = "_datele";
-	private static final String IS_NULL = "_null";
-	private static final String NOT_NULL = "_notnull";
-	private static final String IGNORE = "_ignore";
-
-	public MPJLambdaWrapperSqlKeyword() {
-	}
-
-	public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
-		if (!Func.isEmpty(query)) {
-			query.forEach((k, v) -> {
-				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
-					if (k.endsWith("_equal")) {
-						qw.eq(getColumn(k, "_equal"), v);
-					} else if (k.endsWith("_notequal")) {
-						qw.ne(getColumn(k, "_notequal"), v);
-					} else if (k.endsWith("_likeleft")) {
-						qw.likeLeft(getColumn(k, "_likeleft"), v);
-					} else if (k.endsWith("_likeright")) {
-						qw.likeRight(getColumn(k, "_likeright"), v);
-					} else if (k.endsWith("_notlike")) {
-						qw.notLike(getColumn(k, "_notlike"), v);
-					} else if (k.endsWith("_ge")) {
-						qw.ge(getColumn(k, "_ge"), v);
-					} else if (k.endsWith("_le")) {
-						qw.le(getColumn(k, "_le"), v);
-					} else if (k.endsWith("_gt")) {
-						qw.gt(getColumn(k, "_gt"), v);
-					} else if (k.endsWith("_lt")) {
-						qw.lt(getColumn(k, "_lt"), v);
-					} else if (k.endsWith("_datege")) {
-						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_dategt")) {
-						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_dateequal")) {
-						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_datele")) {
-						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_datelt")) {
-						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_null")) {
-						qw.isNull(getColumn(k, "_null"));
-					} else if (k.endsWith("_notnull")) {
-						qw.isNotNull(getColumn(k, "_notnull"));
-					} else {
-						qw.like(getColumn(k, "_like"), v);
-					}
-
-				}
-			});
-		}
-	}
-
-	public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
-		if (!Func.isEmpty(query)) {
-			query.forEach((k, v) -> {
-				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
-					if (k.endsWith("_equal")) {
-						qw.eq(getColumn(k, "_equal"), v);
-					} else if (k.endsWith("_notequal")) {
-						qw.ne(getColumn(k, "_notequal"), v);
-					} else if (k.endsWith("_likeleft")) {
-						qw.likeLeft(getColumn(k, "_likeleft"), v);
-					} else if (k.endsWith("_likeright")) {
-						qw.likeRight(getColumn(k, "_likeright"), v);
-					} else if (k.endsWith("_notlike")) {
-						qw.notLike(getColumn(k, "_notlike"), v);
-					} else if (k.endsWith("_ge")) {
-						qw.ge(getColumn(k, "_ge"), v);
-					} else if (k.endsWith("_le")) {
-						qw.le(getColumn(k, "_le"), v);
-					} else if (k.endsWith("_gt")) {
-						qw.gt(getColumn(k, "_gt"), v);
-					} else if (k.endsWith("_lt")) {
-						qw.lt(getColumn(k, "_lt"), v);
-					} else if (k.endsWith("_datege")) {
-						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_dategt")) {
-						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_dateequal")) {
-						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_datele")) {
-						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_datelt")) {
-						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
-					} else if (k.endsWith("_null")) {
-						qw.isNull(getColumn(k, "_null"));
-					} else if (k.endsWith("_notnull")) {
-						qw.isNotNull(getColumn(k, "_notnull"));
-					} else {
-						qw.like(getColumn(k, "_like"), v);
-					}
-
-				}
-			});
-		}
-	}
-
-	private static String getColumn(String column, String keyword) {
-		return StringUtil.humpToUnderline(StringUtil.removeSuffix(column, keyword));
-	}
-
-	public static String filter(String param) {
-		return param == null ? null : param.replaceAll("(?i)'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql", "");
-	}
-
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
deleted file mode 100644
index 99e6480..0000000
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/Map2MPJLambdaUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.vci.ubcs.starter.util;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.StringUtil;
-
-import java.util.Map;
-
-public class Map2MPJLambdaUtil {
-
-	public Map2MPJLambdaUtil() {
-	}
-
-	public static <T> IPage<T> getPage(Query query) {
-		Page<T> page = new Page((long) Func.toInt(query.getCurrent(), 1), (long)Func.toInt(query.getSize(), 10));
-		String[] ascArr = Func.toStrArray(query.getAscs());
-		String[] descArr = ascArr;
-		int var4 = ascArr.length;
-
-		int var5;
-		for(var5 = 0; var5 < var4; ++var5) {
-			String asc = descArr[var5];
-			page.addOrder(new OrderItem[]{OrderItem.asc(StringUtil.cleanIdentifier(asc))});
-		}
-
-		descArr = Func.toStrArray(query.getDescs());
-		String[] var8 = descArr;
-		var5 = descArr.length;
-
-		for(int var9 = 0; var9 < var5; ++var9) {
-			String desc = var8[var9];
-			page.addOrder(new OrderItem[]{OrderItem.desc(StringUtil.cleanIdentifier(desc))});
-		}
-
-		return page;
-	}
-
-	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(T entity) {
-		return new MPJLambdaWrapper(entity);
-	}
-
-	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Class<T> clazz) {
-		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
-		return getMPJLambdaWrapper(query, exclude, clazz);
-	}
-
-	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Class<T> clazz) {
-		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
-		return getMPJLambdaWrapperByMapString(query, exclude, clazz);
-	}
-
-	/**
-	 * map杞崲涓篗PJLambdaWrapper
-	 * @param query
-	 * @param exclude
-	 * @param clazz
-	 * @param <T>
-	 * @return
-	 */
-	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
-		exclude.forEach((k, v) -> {
-			query.remove(k);
-		});
-		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
-		qw.setEntity(BeanUtil.newInstance(clazz));
-		MPJLambdaWrapperSqlKeyword.buildCondition(query, qw);
-		return qw;
-	}
-
-	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
-		exclude.forEach((k, v) -> {
-			query.remove(k);
-		});
-		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
-		qw.setEntity(BeanUtil.newInstance(clazz));
-		MPJLambdaWrapperSqlKeyword.buildConditionByMapString(query, qw);
-		return qw;
-	}
-
-
-}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
new file mode 100644
index 0000000..1f63213
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSCondition.java
@@ -0,0 +1,136 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.util.Map;
+
+/**
+ * map杞崟琛ㄦ煡璇㈠璞�
+ * 涓洪伩鍏岯ladeX妗嗘灦鑷甫鐨凪ap杞琖rapper鑷姩鏄犲皠椹煎嘲锛�
+ * 杩欒竟鍗曠嫭鍐欎竴涓互鍏嶆贩娣�
+ * @author ludc
+ * @date 2023/6/6 15:26
+ */
+public class UBCSCondition {
+
+	public UBCSCondition() {
+	}
+
+	public static <T> IPage<T> getPage(Query query) {
+		Page<T> page = new Page((long) Func.toInt(query.getCurrent(), 1), (long)Func.toInt(query.getSize(), 10));
+		String[] ascArr = Func.toStrArray(query.getAscs());
+		String[] descArr = ascArr;
+		int var4 = ascArr.length;
+
+		int var5;
+		for(var5 = 0; var5 < var4; ++var5) {
+			String asc = descArr[var5];
+			page.addOrder(new OrderItem[]{OrderItem.asc(StringUtil.cleanIdentifier(asc))});
+		}
+
+		descArr = Func.toStrArray(query.getDescs());
+		String[] var8 = descArr;
+		var5 = descArr.length;
+
+		for(int var9 = 0; var9 < var5; ++var9) {
+			String desc = var8[var9];
+			page.addOrder(new OrderItem[]{OrderItem.desc(StringUtil.cleanIdentifier(desc))});
+		}
+
+		return page;
+	}
+
+	public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
+		return new QueryWrapper<T>(entity);
+	}
+
+	public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getQueryWrapper(query, exclude, clazz);
+	}
+
+	public static <T> QueryWrapper<T> getQueryWrapperByMapString(Map<String, String> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getQueryWrapperByMapString(query, exclude, clazz);
+	}
+
+	/**
+	 * map杞崲涓篞ueryWrapper
+	 * @param query
+	 * @param exclude
+	 * @param clazz
+	 * @param <T>
+	 * @return
+	 */
+	public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		QueryWrapper<T> qw = new QueryWrapper();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		UBCSSqlKeyword.buildCondition(query, qw);
+		return qw;
+	}
+
+	public static <T> QueryWrapper<T> getQueryWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		QueryWrapper<T> qw = new QueryWrapper<>();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		UBCSSqlKeyword.buildConditionByMapString(query, qw);
+		return qw;
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(T entity) {
+		return new MPJLambdaWrapper(entity);
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getMPJLambdaWrapper(query, exclude, clazz);
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Class<T> clazz) {
+		Kv exclude = Kv.create().set("Blade-Auth", "Blade-Auth").set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
+		return getMPJLambdaWrapperByMapString(query, exclude, clazz);
+	}
+
+	/**
+	 * map杞崲涓篗PJLambdaWrapper
+	 * @param query
+	 * @param exclude
+	 * @param clazz
+	 * @param <T>
+	 * @return
+	 */
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		UBCSSqlKeyword.buildCondition(query, qw);
+		return qw;
+	}
+
+	public static <T> MPJLambdaWrapper<T> getMPJLambdaWrapperByMapString(Map<String, String> query, Map<String, Object> exclude, Class<T> clazz) {
+		exclude.forEach((k, v) -> {
+			query.remove(k);
+		});
+		MPJLambdaWrapper<T> qw = new MPJLambdaWrapper();
+		qw.setEntity(BeanUtil.newInstance(clazz));
+		UBCSSqlKeyword.buildConditionByMapString(query, qw);
+		return qw;
+	}
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
new file mode 100644
index 0000000..f4016c1
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/UBCSSqlKeyword.java
@@ -0,0 +1,231 @@
+package com.vci.ubcs.starter.util;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * UBCSSqlKeyword
+ * map杞瑆rapper鏃剁敤鍒扮殑姣斿杞崲
+ * @author ludc
+ * @date 2023/06/06 10:01
+ */
+public class UBCSSqlKeyword {
+
+	private static final String SQL_REGEX = "'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql";
+	private static final String EQUAL = "_equal";
+	private static final String NOT_EQUAL = "_notequal";
+	private static final String LIKE = "_like";
+	private static final String LIKE_LEFT = "_likeleft";
+	private static final String LIKE_RIGHT = "_likeright";
+	private static final String NOT_LIKE = "_notlike";
+	private static final String GE = "_ge";
+	private static final String LE = "_le";
+	private static final String GT = "_gt";
+	private static final String LT = "_lt";
+	private static final String DATE_GE = "_datege";
+	private static final String DATE_GT = "_dategt";
+	private static final String DATE_EQUAL = "_dateequal";
+	private static final String DATE_LT = "_datelt";
+	private static final String DATE_LE = "_datele";
+	private static final String IS_NULL = "_null";
+	private static final String NOT_NULL = "_notnull";
+	private static final String IGNORE = "_ignore";
+
+	public UBCSSqlKeyword() {
+	}
+
+	public static void buildCondition(Map<String, Object> query, QueryWrapper<?> qw) {
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_equal")) {
+						qw.eq(getColumn(k, "_equal"), v);
+					} else if (k.endsWith("_notequal")) {
+						qw.ne(getColumn(k, "_notequal"), v);
+					} else if (k.endsWith("_likeleft")) {
+						qw.likeLeft(getColumn(k, "_likeleft"), v);
+					} else if (k.endsWith("_likeright")) {
+						qw.likeRight(getColumn(k, "_likeright"), v);
+					} else if (k.endsWith("_notlike")) {
+						qw.notLike(getColumn(k, "_notlike"), v);
+					} else if (k.endsWith("_ge")) {
+						qw.ge(getColumn(k, "_ge"), v);
+					} else if (k.endsWith("_le")) {
+						qw.le(getColumn(k, "_le"), v);
+					} else if (k.endsWith("_gt")) {
+						qw.gt(getColumn(k, "_gt"), v);
+					} else if (k.endsWith("_lt")) {
+						qw.lt(getColumn(k, "_lt"), v);
+					} else if (k.endsWith("_datege")) {
+						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dategt")) {
+						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dateequal")) {
+						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datele")) {
+						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datelt")) {
+						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_null")) {
+						qw.isNull(getColumn(k, "_null"));
+					} else if (k.endsWith("_notnull")) {
+						qw.isNotNull(getColumn(k, "_notnull"));
+					} else {
+						qw.like(getColumn(k, "_like"), v);
+					}
+
+				}
+			});
+		}
+	}
+
+	public static void buildCondition(Map<String, Object> query, MPJLambdaWrapper<?> qw) {
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_equal")) {
+						qw.eq(getColumn(k, "_equal"), v);
+					} else if (k.endsWith("_notequal")) {
+						qw.ne(getColumn(k, "_notequal"), v);
+					} else if (k.endsWith("_likeleft")) {
+						qw.likeLeft(getColumn(k, "_likeleft"), v);
+					} else if (k.endsWith("_likeright")) {
+						qw.likeRight(getColumn(k, "_likeright"), v);
+					} else if (k.endsWith("_notlike")) {
+						qw.notLike(getColumn(k, "_notlike"), v);
+					} else if (k.endsWith("_ge")) {
+						qw.ge(getColumn(k, "_ge"), v);
+					} else if (k.endsWith("_le")) {
+						qw.le(getColumn(k, "_le"), v);
+					} else if (k.endsWith("_gt")) {
+						qw.gt(getColumn(k, "_gt"), v);
+					} else if (k.endsWith("_lt")) {
+						qw.lt(getColumn(k, "_lt"), v);
+					} else if (k.endsWith("_datege")) {
+						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dategt")) {
+						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dateequal")) {
+						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datele")) {
+						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datelt")) {
+						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_null")) {
+						qw.isNull(getColumn(k, "_null"));
+					} else if (k.endsWith("_notnull")) {
+						qw.isNotNull(getColumn(k, "_notnull"));
+					} else {
+						qw.like(getColumn(k, "_like"), v);
+					}
+
+				}
+			});
+		}
+	}
+
+	public static void buildConditionByMapString(Map<String, String> query, MPJLambdaWrapper<?> qw) {
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_equal")) {
+						qw.eq(getColumn(k, "_equal"), v);
+					} else if (k.endsWith("_notequal")) {
+						qw.ne(getColumn(k, "_notequal"), v);
+					} else if (k.endsWith("_likeleft")) {
+						qw.likeLeft(getColumn(k, "_likeleft"), v);
+					} else if (k.endsWith("_likeright")) {
+						qw.likeRight(getColumn(k, "_likeright"), v);
+					} else if (k.endsWith("_notlike")) {
+						qw.notLike(getColumn(k, "_notlike"), v);
+					} else if (k.endsWith("_ge")) {
+						qw.ge(getColumn(k, "_ge"), v);
+					} else if (k.endsWith("_le")) {
+						qw.le(getColumn(k, "_le"), v);
+					} else if (k.endsWith("_gt")) {
+						qw.gt(getColumn(k, "_gt"), v);
+					} else if (k.endsWith("_lt")) {
+						qw.lt(getColumn(k, "_lt"), v);
+					} else if (k.endsWith("_datege")) {
+						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dategt")) {
+						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dateequal")) {
+						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datele")) {
+						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datelt")) {
+						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_null")) {
+						qw.isNull(getColumn(k, "_null"));
+					} else if (k.endsWith("_notnull")) {
+						qw.isNotNull(getColumn(k, "_notnull"));
+					} else {
+						qw.like(getColumn(k, "_like"), v);
+					}
+
+				}
+			});
+		}
+	}
+
+	public static void buildConditionByMapString(Map<String, String> query, QueryWrapper<?> qw) {
+		if (!Func.isEmpty(query)) {
+			query.forEach((k, v) -> {
+				if (!Func.hasEmpty(new Object[]{k, v}) && !k.endsWith("_ignore")) {
+					if (k.endsWith("_equal")) {
+						qw.eq(getColumn(k, "_equal"), v);
+					} else if (k.endsWith("_notequal")) {
+						qw.ne(getColumn(k, "_notequal"), v);
+					} else if (k.endsWith("_likeleft")) {
+						qw.likeLeft(getColumn(k, "_likeleft"), v);
+					} else if (k.endsWith("_likeright")) {
+						qw.likeRight(getColumn(k, "_likeright"), v);
+					} else if (k.endsWith("_notlike")) {
+						qw.notLike(getColumn(k, "_notlike"), v);
+					} else if (k.endsWith("_ge")) {
+						qw.ge(getColumn(k, "_ge"), v);
+					} else if (k.endsWith("_le")) {
+						qw.le(getColumn(k, "_le"), v);
+					} else if (k.endsWith("_gt")) {
+						qw.gt(getColumn(k, "_gt"), v);
+					} else if (k.endsWith("_lt")) {
+						qw.lt(getColumn(k, "_lt"), v);
+					} else if (k.endsWith("_datege")) {
+						qw.ge(getColumn(k, "_datege"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dategt")) {
+						qw.gt(getColumn(k, "_dategt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_dateequal")) {
+						qw.eq(getColumn(k, "_dateequal"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datele")) {
+						qw.le(getColumn(k, "_datele"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_datelt")) {
+						qw.lt(getColumn(k, "_datelt"), DateUtil.parse(String.valueOf(v), "yyyy-MM-dd HH:mm:ss"));
+					} else if (k.endsWith("_null")) {
+						qw.isNull(getColumn(k, "_null"));
+					} else if (k.endsWith("_notnull")) {
+						qw.isNotNull(getColumn(k, "_notnull"));
+					} else {
+						qw.like(getColumn(k, "_like"), v);
+					}
+
+				}
+			});
+		}
+	}
+
+	private static String getColumn(String column, String keyword) {
+		//娌℃湁杞笅鍒掔嚎鏄犲皠
+		return StringUtil.removeSuffix(column, keyword).toLowerCase(Locale.ROOT);
+	}
+
+	public static String filter(String param) {
+		return param == null ? null : param.replaceAll("(?i)'|%|--|insert|delete|select|count|group|union|drop|truncate|alter|grant|execute|exec|xp_cmdshell|call|declare|sql", "");
+	}
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/pom.xml b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
index c885818..369d597 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/pom.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/pom.xml
@@ -80,6 +80,7 @@
             <scope>compile</scope>
         </dependency>-->
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
index 2f9e561..1ac0859 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyController.java
@@ -223,7 +223,7 @@
 	 * @return 涓婚搴撳垎绫绘樉绀烘爲
 	 */
 	@GetMapping("/referTree")
-	public List<Tree> referTree(TreeQueryObject treeQueryObject)  {
+	public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject)  {
 		return codeClassifyService.referTree(treeQueryObject);
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
index 6618060..0af732b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferConfigController.java
@@ -2,12 +2,7 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-<<<<<<< Updated upstream
 import com.vci.ubcs.code.service.ICodeReferConfigService;
-=======
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.service.CodeReferConfigService;
->>>>>>> Stashed changes
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import org.springblade.core.tool.api.R;
@@ -15,10 +10,6 @@
 
 import javax.annotation.Resource;
 import java.util.List;
-<<<<<<< Updated upstream
-=======
-import java.util.Map;
->>>>>>> Stashed changes
 
 /**
  * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ帶鍒跺眰
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
index 0540298..425b65a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeRuleController.java
@@ -25,6 +25,8 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
 import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
 
+import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,24 +68,14 @@
 	}
 
 	/**
-	 * 缂栫爜瑙勫垯 鍒嗛〉
-	 */
-	@GetMapping("/list")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆codeRuleVO")
-	public R<IPage<CodeRuleVO>> list(CodeRule codeRule, Query query) {
-		IPage<CodeRule> pages = codeRuleService.page(Condition.getPage(query), Condition.getQueryWrapper(codeRule));
-		return R.data(CodeRuleWrapper.build().pageVO(pages));
-	}
-
-	/**
 	 * 缂栫爜瑙勫垯 鑷畾涔夊垎椤�
+	 * @return baseQueryObject
 	 */
 	@GetMapping("/gridCodeRule")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆CodeRule")
-	public R<IPage<CodeRuleVO>> gridCodeRule(CodeRuleVO CodeRule, Query query) {
-		IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(Condition.getPage(query.setDescs("CREATETIME")), CodeRule);
+	public R<IPage<CodeRuleVO>> gridCodeRule(BladeQueryObject bladeQueryObject) {
+		IPage<CodeRuleVO> pages = codeRuleService.gridCodeRule(bladeQueryObject.getQuery().setDescs("CREATETIME"), bladeQueryObject.getConditionMap());
 		return R.data(pages);
 	}
 
@@ -151,15 +143,14 @@
 
 	/**
 	 * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
-	 * @param CodeRule
-	 * @param query
+	 * @param bladeQueryObject
 	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 */
 	@GetMapping("/refDataGrid")
 	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�", notes = "浼犲叆oids")
-	public R<IPage<CodeRuleVO>> refDataGridCodeRule(CodeRuleVO CodeRule, Query query){
-		return R.data(codeRuleService.refDataGridCodeRule(Condition.getPage(query),CodeRule));
+	public R<IPage<CodeRuleVO>> refDataGridCodeRule(BladeQueryObject bladeQueryObject){
+		return R.data(codeRuleService.refDataGridCodeRule(bladeQueryObject));
 	}
 
 	/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
index ee01f3b..87aa4dd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -31,7 +31,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 //@AllArgsConstructor
@@ -94,20 +96,20 @@
 		String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
 		File file1 = new File(excelFileName);
 		try {
-			file.transferTo(new File(excelFileName));
-			CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
-			if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
-				//鏀惧埌map閲�
-				R result = R.fail("瀵煎叆澶辫触");
-				if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
-					String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
-					codeImProtRusultVO.setFileOid(filedUUid);
-				}
-				result.setData(codeImProtRusultVO);
-				return result;
-			}else {
-				return R.success("鎿嶄綔鎴愬姛锛�");
-			}
+//			file.transferTo(new File(excelFileName));
+//			CodeImProtRusultVO codeImProtRusultVO = mdmIOService.batchImportCode(orderDTO,file1);
+//			if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())||StringUtils.isNotBlank(codeImProtRusultVO.getRedisUuid())){
+//				//鏀惧埌map閲�
+//				R result = R.fail("瀵煎叆澶辫触");
+//				if(StringUtils.isNotBlank(codeImProtRusultVO.getFilePath())) {
+//					String filedUUid = ControllerUtil.putErrorFile(codeImProtRusultVO.getFilePath());
+//					codeImProtRusultVO.setFileOid(filedUUid);
+//				}
+//				result.setData(codeImProtRusultVO);
+//				return result;
+//			}else {
+//				return R.success("鎿嶄綔鎴愬姛锛�");
+//			}
 		}catch (Throwable e) {
 			logger.error("瀵煎叆閿欒",e);
 			String errorFile = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒.txt";
@@ -124,7 +126,7 @@
 		}finally {
 			file1.delete();
 		}
-//		return null;
+		return null;
 	}
 
 
@@ -472,63 +474,8 @@
 
 	@GetMapping("/thisistest")
 	@ResponseBody
-	public Integer thisistest(String codeClassifyOid, String functionId) throws Exception {
-//		return engineService.selectByTypeAndOid("wupin", "b1511bb3-a773-43e2-ac85-a7fde7314a0f,3e08970024835e69f6c2b2ecd90c48c3,582ff205-0dfb-43e0-8223-e772ff1851ab,db0400fe-cc90-4d9d-8da7-1edf06b1481b");
-
-		List<BaseModel> models = new ArrayList<>();
-		BaseModel baseModel = new BaseModel();
-		Map<String,String > map = new HashMap<>();
-		map.put("JZL","6789");
-		map.put("JZRXX","67891");
-		map.put("JZXZB","67892");
-		map.put("JSZGL","67893");
-		map.put("JSSXT","67894");
-		baseModel.setBtmname("djii");
-		baseModel.setCreator("fjivis");
-		baseModel.setId("vcia");
-		baseModel.setOid("0d86b1ba-9e9e-4d3d-9ae4-f862c3684e74");
-		baseModel.setCreateTime(new Date());
-		baseModel.setTs(new Date());
-		baseModel.setData(map);
-		models.add(baseModel);
-
-		BaseModel baseModel1 = new BaseModel();
-		Map<String,String > map1 = new HashMap<>();
-		map1.put("JZL","6789z");
-		map1.put("JZRXX","67891z");
-		map1.put("JZXZB","67892z");
-		map1.put("JSZGL","67893z");
-		map1.put("JSSXT","67894z");
-		baseModel1.setBtmname("djiiz");
-		baseModel1.setCreator("fjivisz");
-		baseModel1.setId("vciaz");
-		baseModel1.setTs(new Date());
-		baseModel1.setOid("4a00be07-f5a8-4a9b-88fb-d52a0d9cf546");
-		baseModel1.setCreateTime(new Date());
-		baseModel1.setData(map1);
-		models.add(baseModel1);
-
-		BaseModel baseModel2 = new BaseModel();
-		Map<String,String > map2 = new HashMap<>();
-		map2.put("JZL","67892");
-		map2.put("JZRXX","678912");
-		map2.put("JZXZB","678922");
-		map2.put("JSZGL","678932");
-		map2.put("JSSXT","678942");
-		baseModel2.setBtmname("djii2");
-		baseModel2.setCreator("fjivis2");
-		baseModel2.setTs(new Date());
-		baseModel2.setId("vcia2");
-		baseModel2.setOid("fa430ff9-f141-4dcf-8809-6f87905c1dea");
-		baseModel2.setCreateTime(new Date());
-		baseModel2.setData(map2);
-		models.add(baseModel2);
-
-		return 0;
-
-
-
-//		return engineService.updateBatchByBaseModel("wupin", models);
+	public List<BaseModel> thisistest(String codeClassifyOid, String functionId) throws Exception {
+		return engineService.selectByTypeAndOid("wupin", "b1511bb3-a773-43e2-ac85-a7fde7314a0f,3e08970024835e69f6c2b2ecd90c48c3,582ff205-0dfb-43e0-8223-e772ff1851ab,db0400fe-cc90-4d9d-8da7-1edf06b1481b");
 //		return engineService.getUIInfoByClassifyOid(codeClassifyOid,functionId);
 	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 2dc59a5..ea1d998 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -75,14 +75,6 @@
 	 * @param oid 鍒嗙被鐨勪富閿�
 	 * @return 鏁版嵁闆嗗悎
 	 */
-	List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid);
-
-	/**
-	 * 鏌ユ壘鏍戝舰缁撴瀯
-	 *
-	 * @param oid 鍒嗙被鐨勪富閿�
-	 * @return 鏁版嵁闆嗗悎
-	 */
 	List<CodeClassify> selectAllLevelChildHasPath(@Param("oid") String oid);
 
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
index f408ad9..631095d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeRuleMapper.java
@@ -24,7 +24,7 @@
 	 * @param codeRule
 	 * @return
 	 */
-	List<CodeRule> selectCodeRulePage(IPage page,@Param("codeRule") CodeRuleVO codeRule);
+//	List<CodeRule> selectCodeRulePage(IPage page,@Param("codeRule") CodeRuleVO codeRule);
 
 
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java
deleted file mode 100644
index 234c29c..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeReferConfigService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.github.yulichang.base.MPJBaseService;
-import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
-import java.util.List;
-
-/**
- * 鍙傜収閰嶇疆琛�(CodeReferConfig)琛ㄦ湇鍔℃帴鍙�
- *
- * @author ludc
- * @since 2023-05-19 17:47:59
- */
-public interface CodeReferConfigService extends MPJBaseService<CodeReferConfig> {
-
-    /**
-     * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
-     *
-     * @param oid 涓婚敭
-     * @return 瀹炰緥瀵硅薄
-     */
-    CodeReferConfigVO queryById(String oid);
-
-    /**
-     * 鍒嗛〉鏌ヨ
-     *
-     * @param bladeQueryObject 绛涢�夋潯浠�
-     * @return 鏌ヨ缁撴灉
-     */
-	IPage<CodeReferConfigVO> queryByJoinPage(BladeQueryObject bladeQueryObject);
-
-	/**
-	 * 鍒嗛〉鏌ヨ
-	 *
-	 * @param codeReferConfigVO 绛涢�夋潯浠�
-	 * @return 鏌ヨ缁撴灉
-	 */
-	List<CodeReferConfigVO> queryByList(CodeReferConfigVO codeReferConfigVO);
-
-    /**
-     * 鏂板鏁版嵁
-     *
-     * @param codeReferConfigVO 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-	R insert(CodeReferConfigVO codeReferConfigVO);
-
-    /**
-     * 淇敼鏁版嵁
-     *
-     * @param codeReferConfigVO 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-	R update(CodeReferConfigVO codeReferConfigVO);
-
-    /**
-     * 閫氳繃涓婚敭鍒犻櫎鏁版嵁
-     *
-     * @param codeReferConfigDTO
-     * @return 鏄惁鎴愬姛
-     */
-    R deleteById(CodeReferConfigDTO codeReferConfigDTO);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java
deleted file mode 100644
index 0cfca8b..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeShowFieldConfigService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
-import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
-import jdk.internal.dynalink.linker.LinkerServices;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
-import java.util.List;
-
-/**
- * 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏄剧ず鐨勫睘鎬ч厤缃〃(CodeShowFieldConfig)琛ㄦ湇鍔℃帴鍙�
- *
- * @author ludc
- * @since 2023-05-19 17:58:56
- */
-public interface CodeShowFieldConfigService extends IService<CodeShowFieldConfig> {
-
-    /**
-     * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
-     *
-     * @param oid 涓婚敭
-     * @return 瀹炰緥瀵硅薄
-     */
-    CodeShowFieldConfig queryById(String oid);
-
-    /**
-     * 鏂板鏁版嵁
-     *
-     * @param codeShowFieldConfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-	boolean insert(CodeShowFieldConfig codeShowFieldConfig);
-
-	/**
-	 * 鎵归噺鏂板鏁版嵁
-	 *
-	 * @param codeShowFieldConfigVOS 瀹炰緥瀵硅薄
-	 * @return 瀹炰緥瀵硅薄
-	 */
-	boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS);
-
-    /**
-     * 淇敼鏁版嵁
-     *
-     * @param codeShowFieldConfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-	boolean update(CodeShowFieldConfig codeShowFieldConfig);
-
-	/**
-	 * 鎵归噺淇敼鏁版嵁
-	 *
-	 * @param codeShowFieldConfigVOS 瀹炰緥瀵硅薄
-	 * @return 瀹炰緥瀵硅薄
-	 */
-	boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS);
-
-	/**
-	 * 閫氳繃涓婚敭鍒犻櫎鏁版嵁
-	 *
-	 * @param oid 涓婚敭
-	 * @return 鏄惁鎴愬姛
-	 */
-	boolean deleteById(String oid);
-
-    /**
-     * 閫氳繃鍏宠仈鐨勫弬鐓ч厤缃富閿垹闄ゆ暟鎹�
-     *
-     * @param oid
-     * @return 鏄惁鎴愬姛
-     */
-    boolean deleteByReferConfigOid(String oid);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java
deleted file mode 100644
index 1e4a91a..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/CodeSrchCondConfigService.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.vci.ubcs.code.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
-import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.service.impl.CodeSrchCondConfigServiceImpl;
-import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-
-import java.util.List;
-
-/**
- * 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏌ヨ鏉′欢閰嶇疆琛�(CodeSrchCondConfig)琛ㄦ湇鍔℃帴鍙�
- *
- * @author ludc
- * @since 2023-05-19 17:58:56
- */
-public interface CodeSrchCondConfigService extends IService<CodeSrchCondConfig> {
-
-    /**
-     * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
-     *
-     * @param oid 涓婚敭
-     * @return 瀹炰緥瀵硅薄
-     */
-	CodeSrchCondConfig queryById(String oid);
-
-    /**
-     * 鍒嗛〉鏌ヨ
-     *
-     * @param codeSrchCondConfig 绛涢�夋潯浠�
-     * @param pageRequest      鍒嗛〉瀵硅薄
-     * @return 鏌ヨ缁撴灉
-     */
-    Page<CodeSrchCondConfig> queryByPage(CodeSrchCondConfig codeSrchCondConfig, PageRequest pageRequest);
-
-    /**
-     * 鏂板鏁版嵁
-     *
-     * @param codeSrchCondConfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-    boolean insert(CodeSrchCondConfig codeSrchCondConfig);
-
-	/**
-	 * 鎵归噺鏂板鏁版嵁
-	 *
-	 * @param codeSrchCondConfigVOS 瀹炰緥瀵硅薄
-	 * @return 瀹炰緥瀵硅薄
-	 */
-	boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS);
-
-    /**
-     * 淇敼鏁版嵁
-     *
-     * @param codeSrchCondConfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-	boolean update(CodeSrchCondConfig codeSrchCondConfig);
-
-	/**
-	 * 鎵归噺鈥斺�斾慨鏀规暟鎹�
-	 *
-	 * @param codeSrchCondConfigVOS 瀹炰緥瀵硅薄
-	 * @return 瀹炰緥瀵硅薄
-	 */
-	boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS);
-
-    /**
-     * 閫氳繃涓婚敭鍒犻櫎鏁版嵁
-     *
-     * @param oid 涓婚敭
-     * @return 鏄惁鎴愬姛
-     */
-    boolean deleteById(String oid);
-
-	/**
-	 * 閫氳繃鍏宠仈鐨勫弬鐓ч厤缃甶d鍒犻櫎鏁版嵁
-	 *
-	 * @param oid 鍙傜収閰嶇疆涓婚敭
-	 * @return 鏄惁鎴愬姛
-	 */
-	boolean deleteByReferConfigOid(String oid);
-
-}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
index ac9a4ae..3095155 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeRuleService.java
@@ -24,9 +24,13 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
 
 import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
+import org.apache.commons.codec.net.QCodec;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * 缂栫爜瑙勫垯 鏈嶅姟绫�
@@ -39,11 +43,11 @@
 	/**
 	 * 鑷畾涔夊垎椤�
 	 *
-	 * @param page
-	 * @param codeRule
+	 * @param query
+	 * @param condtionMap
 	 * @return
 	 */
-	IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule);
+	IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> condtionMap);
 
 	/**
 	 * 鏍¢獙缂栫爜瑙勫垯鐨勭姸鎬佹槸鍚﹀彲浠ョ紪杈戞垨鍒犻櫎
@@ -106,12 +110,11 @@
 
 	/**
 	 * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
-	 * @param codeRule 鏌ヨ鏉′欢
-	 * @param page 鍒嗛〉鍜屾帓搴�
+	 * @param bladeQueryObject 鏌ヨ鏉′欢
 	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
-	IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException;
+	IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException;
 
 	/**
 	 * 鍋滅敤涓庡惎鐢ㄧ紪鐮佽鍒�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
index 606d401..db048a4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
@@ -24,7 +24,6 @@
 import com.vci.ubcs.code.service.ICodeAllCodeService;
 import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
 import java.util.List;
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index 31251d8..4c46eb9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
@@ -772,7 +772,7 @@
 	public CodeBasicSecVO codeBasicSecDO2VO(CodeBasicSec codeBasicSecDO) throws VciBaseException {
 		CodeBasicSecVO codeBasicSecVO = new CodeBasicSecVO();
 		if (codeBasicSecDO != null) {
-			BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDO, codeBasicSecVO);
+			BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecVO, codeBasicSecVO);
 			codeBasicSecVO.setSecTypeText(CodeSecTypeEnum.getTextByValue(codeBasicSecVO.getSecType()));
 			codeBasicSecVO.setCodeLevelTypeText(CodeLevelTypeEnum.getTextByValue(codeBasicSecVO.getCodeLevelType()));
 			codeBasicSecVO.setCodeSecLengthTypeText(CodeSecLengthTypeEnum.getTextByValue(codeBasicSecVO.getCodeSecLengthType()));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 31ea7b7..24ae819 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -19,14 +19,11 @@
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-<<<<<<< Updated upstream
 import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.enums.EnumEnum;
 import com.vci.ubcs.omd.feign.IBtmTypeClient;
 import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
-=======
 import com.vci.ubcs.omd.feign.IBtmTypeClient;
->>>>>>> Stashed changes
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.starter.bo.WriteExcelData;
 import com.vci.ubcs.starter.exception.VciBaseException;
@@ -41,7 +38,6 @@
 import com.vci.ubcs.starter.util.LocalFileUtil;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.pagemodel.Tree;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.LangBaseUtil;
@@ -57,7 +53,6 @@
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -81,19 +76,7 @@
 	private ICodeRuleService codeRuleService;
 
 	@Resource
-<<<<<<< Updated upstream
 	private IBtmTypeClient btmTypeClient;
-=======
-	private CodeOsbtmtypeMapper codeOsbtmtypeMapper;
-
-	@Resource
-	private CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
-
-	@Resource
-	private IBtmTypeClient btmTypeClient;
-
-
->>>>>>> Stashed changes
 
 	/**
 	 * 鏃ュ織
@@ -1048,7 +1031,15 @@
 
 	/**
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	 * 涓婚搴撶殑鏍�,宸茶仈璋冧笟鍔$被鍨嬫煡璇eign
+=======
+	 * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
+>>>>>>> Stashed changes
+=======
+	 * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
+>>>>>>> Stashed changes
 =======
 	 * 涓婚搴撶殑鏍�,宸茬粡鑱旇皟涓氬姟绫诲瀷鏌ヨ
 >>>>>>> Stashed changes
@@ -1073,7 +1064,6 @@
 		if(Func.isEmpty(btmTypeVOS) || Func.isEmpty(trees)){
 			return null;
 		}
-<<<<<<< Updated upstream
 		List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
 					if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
 						tree.getAttributes().put("btmTypeOid",btmType.getOid());
@@ -1082,10 +1072,6 @@
 					return false;
 				}).collect(Collectors.toList())))
 			.collect(Collectors.toList());
-=======
-		List<Tree> treeList = trees.stream().filter(tree -> btmTypeVOS.stream().
-			anyMatch(btmType -> Objects.equals(tree.getAttributes().get("id"), btmType.getId()))).collect(Collectors.toList());
->>>>>>> Stashed changes
 		return treeList;
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index b8aa484..7f6b022 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -24,9 +24,9 @@
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.PatternUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
 import com.vci.ubcs.starter.web.pagemodel.*;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -135,7 +135,7 @@
 		if(conditionMap == null){
 			conditionMap = new HashMap<String, String>();
 		}
-		return gridCodeClassifyTemplateAttr(Map2MPJLambdaUtil.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
+		return gridCodeClassifyTemplateAttr(UBCSCondition.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
 	}
 
 	@Override
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
index f9223cb..94a54f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateButtonServiceImpl.java
@@ -36,7 +36,7 @@
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtil;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -286,7 +286,7 @@
 		CodeClassifyTemplateButton codeClassifyTemplateButton = new CodeClassifyTemplateButton();
 		BeanMap beanMap = BeanMap.create(codeClassifyTemplateButton);
 		beanMap.putAll(conditionMap);
-		MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(codeClassifyTemplateButton)
+		MPJLambdaWrapper<CodeClassifyTemplateButton> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(codeClassifyTemplateButton)
 			.selectAll(CodeClassifyTemplateButton.class)
 			.selectAs(CodeButton::getName, CodeClassifyTemplateButton::getClassifyButtonOidName)
 			.selectAs(CodeButton::getId, CodeClassifyTemplateButton::getClassifyButtonId)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
index 8e6dcf0..ba2ca81 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferConfigServiceImpl.java
@@ -3,7 +3,6 @@
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.base.MPJBaseServiceImpl;
@@ -15,68 +14,26 @@
 import com.vci.ubcs.code.service.ICodeReferConfigService;
 import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
 import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
-=======
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
-import com.vci.ubcs.code.dto.CodeClassifyProcessTempDTO;
-import com.vci.ubcs.code.dto.CodeReferConfigDTO;
-import com.vci.ubcs.code.entity.*;
-import com.vci.ubcs.code.mapper.CodeReferConfigMapper;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-import com.vci.ubcs.code.service.CodeReferConfigService;
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
->>>>>>> Stashed changes
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
-import com.vci.ubcs.code.wrapper.CodeClassifyProcessTempWrapper;
 import com.vci.ubcs.code.wrapper.CodeReferConfigWraper;
-<<<<<<< Updated upstream
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-=======
-import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
-import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
-import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
->>>>>>> Stashed changes
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
-<<<<<<< Updated upstream
 import org.springblade.core.tool.utils.Func;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.stereotype.Service;
-=======
-import org.springframework.cglib.beans.BeanMap;
-import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
->>>>>>> Stashed changes
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-<<<<<<< Updated upstream
-=======
-import java.util.Objects;
->>>>>>> Stashed changes
 
 import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.TS_NOT_PROCESS;
 
@@ -87,27 +44,16 @@
  * @since 2023-05-19 17:48:02
  */
 @Service("CodeReferconfigService")
-<<<<<<< Updated upstream
 public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements ICodeReferConfigService {
-=======
-public class CodeReferConfigServiceImpl extends MPJBaseServiceImpl<CodeReferConfigMapper,CodeReferConfig> implements CodeReferConfigService {
->>>>>>> Stashed changes
 
     @Resource
     private CodeReferConfigMapper codeReferconfigMapper;
 
 	@Resource
-<<<<<<< Updated upstream
 	private ICodeShowFieldConfigService ICodeShowFieldConfigService;
 
 	@Resource
 	private ICodeSrchCondConfigService ICodeSrchCondConfigService;
-=======
-	private CodeShowFieldConfigService codeShowFieldConfigService;
-
-	@Resource
-	private CodeSrchCondConfigService codeSrchCondConfigService;
->>>>>>> Stashed changes
 
     /**
      * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
@@ -121,27 +67,20 @@
 		return CodeReferConfigWraper.build().entityVO(codeReferConfig);
     }
 
-<<<<<<< Updated upstream
 	/**
 	 * 鍒嗛〉鏌ヨ
 	 *
 	 * @param bladeQueryObject 绛涢�夋潯浠�
 	 * @return 鏌ヨ缁撴灉
 	 */
-=======
->>>>>>> Stashed changes
 	@Override
 	public IPage<CodeReferConfigVO> queryByJoinPage(BladeQueryObject bladeQueryObject) {
 		CodeReferConfig codeReferConfig = new CodeReferConfig();
 		// 鏍规嵁绉熸埛杩涜鍖哄垎瀵瑰簲鐨勫弬鐓ч厤缃�
 		Map<String, Object> conditionMap = bladeQueryObject.getConditionMap();
-<<<<<<< Updated upstream
 		// 鏌ヨ鎵�灞炵鎴蜂笅鐨勫拰寮�鍚叏灞�鐨勫弬鐓ч厤缃俊鎭�
 		conditionMap.put("tenantId",AuthUtil.getTenantId());
 		conditionMap.put("isOpenGlobal","true");
-=======
-		conditionMap.put("tenantId",AuthUtil.getTenantId());
->>>>>>> Stashed changes
 		BeanMap beanMap = BeanMap.create(codeReferConfig);
 		beanMap.putAll(conditionMap);
 		// 娣诲姞榛樿鎺掑簭瀛楁,鏍规嵁鏃堕棿杩涜鎺掑簭
@@ -151,19 +90,10 @@
 		return CodeReferConfigWraper.build().pageVO(codeReferConfigs);
 	}
 
-<<<<<<< Updated upstream
-=======
-	/**
-     * 鍒嗛〉鏌ヨ
-     *
-     * @param codeReferConfigVO 绛涢�夋潯浠�
-     * @return 鏌ヨ缁撴灉
-     */
->>>>>>> Stashed changes
     @Override
     public List<CodeReferConfigVO> queryByList(CodeReferConfigVO codeReferConfigVO) {
 		codeReferConfigVO.setTenantId(AuthUtil.getTenantId());
-		//MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = Map2MPJLambdaUtil.getMPJLambdaWrapper(bladeQueryObject.getConditionMap(), CodeReferConfig.class)
+		//MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = UBCSCondition.getMPJLambdaWrapper(bladeQueryObject.getConditionMap(), CodeReferConfig.class)
 		MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = getMPJLambdaWrapper()
 			.setEntity(codeReferConfigVO)
 			.orderBy(true, true, CodeReferConfig::getCreateTime);
@@ -184,7 +114,6 @@
 		if (StringUtils.isBlank(codeReferConfigVO.getReferType())){
 			throw new VciBaseException("鍙傜収閰嶇疆涓嶈兘涓虹┖");
 		}
-<<<<<<< Updated upstream
 		// Long count = countCodeReferConfig(codeReferConfigVO);
 		// if(count > 0){
 		//    throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
@@ -204,20 +133,6 @@
 		if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
 			ICodeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS(),codeReferConfig.getOid());
 		}
-=======
-		Long count = countCodeReferConfig(codeReferConfigVO);
-		if(count > 0){
-			throw new VciBaseException("宸插瓨鍦ㄧ浉鍚岀殑鍙傜収閰嶇疆");
-		}
-
-		CodeReferConfig CodeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
-		boolean resInsertReferConfig = this.codeReferconfigMapper.insert(CodeReferConfig) > 0;
-		if (!resInsertReferConfig) {
-			return R.fail("鏂板鍙傜収閰嶇疆澶辫触锛�");
-		}
-		codeShowFieldConfigService.insertBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
-		codeSrchCondConfigService.insertBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
->>>>>>> Stashed changes
 		return R.data(codeReferConfigVO);
     }
 
@@ -228,7 +143,6 @@
 	 */
 	private Long countCodeReferConfig(CodeReferConfigVO codeReferConfigVO) {
 		String templateName = codeReferConfigVO.getName();
-<<<<<<< Updated upstream
 		String templateId = codeReferConfigVO.getId();
 		if (StringUtils.isBlank(templateName) && StringUtils.isBlank(templateId)){
 			throw new VciBaseException("鍙傜収閰嶇疆缂栧彿鍜屽悕绉颁笉鑳戒负绌�");
@@ -240,14 +154,6 @@
 			.eq(CodeReferConfig::getIsOpenGlobal,"true") // 鏌ヨ寮�鍚叏灞�鐨勫弬鐓ч厤缃�
 			.eq(CodeReferConfig::getId,templateId)
 			.eq(CodeReferConfig::getName,templateName);
-=======
-		if (StringUtils.isBlank(templateName)){
-			throw new VciBaseException("鍙傜収閰嶇疆鍚嶇О涓嶈兘涓虹┖");
-		}
-		LambdaQueryWrapper<CodeReferConfig> wrapper = Wrappers.<CodeReferConfig>query()
-			.lambda().eq(CodeReferConfig::getId, codeReferConfigVO.getId())
-			.eq(CodeReferConfig::getTenantId, codeReferConfigVO.getTenantId());
->>>>>>> Stashed changes
 		Long count = codeReferconfigMapper.selectCount(wrapper);
 		return count;
 	}
@@ -259,7 +165,6 @@
 	private MPJLambdaWrapper<CodeReferConfig> getMPJLambdaWrapper(){
 		MPJLambdaWrapper<CodeReferConfig> mpjLambdaWrapper = new MPJLambdaWrapper<>(CodeReferConfig.class)
 			.selectAll(CodeReferConfig.class)
-<<<<<<< Updated upstream
 			// .select(CodeShowFieldConfig::getField
 			// ,CodeShowFieldConfig::getTitle
 			// ,CodeShowFieldConfig::getFieldType
@@ -272,20 +177,6 @@
 			// CodeSrchCondConfig::getFilterType,
 			// CodeSrchCondConfig::getFilterField,
 			// CodeSrchCondConfig::getFilterValue)
-=======
-			//			.select(CodeShowFieldConfig::getField
-//				,CodeShowFieldConfig::getTitle
-//				,CodeShowFieldConfig::getFieldType
-//				,CodeShowFieldConfig::getSort
-//				,CodeShowFieldConfig::getAttrSortField
-//				,CodeShowFieldConfig::getWidth
-//				,CodeShowFieldConfig::getFixedPosition
-//				,CodeShowFieldConfig::getTemplet)
-//			.select(
-//				CodeSrchCondConfig::getFilterType,
-//				CodeSrchCondConfig::getFilterField,
-//				CodeSrchCondConfig::getFilterValue)
->>>>>>> Stashed changes
 			.selectCollection(CodeShowFieldConfig.class, CodeReferConfig::getCodeShowFieldConfigs)
 			.selectCollection(CodeSrchCondConfig.class, CodeReferConfig::getCodeSrchCondConfigs)
 			.leftJoin(CodeShowFieldConfig.class, CodeShowFieldConfig::getReferConfigOid,CodeReferConfig::getOid)
@@ -306,13 +197,8 @@
 		if (!resUpdateReferConfig) {
 			return R.fail("鍙傜収閰嶇疆淇敼澶辫触锛�");
 		}
-<<<<<<< Updated upstream
 		this.ICodeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
 		this.ICodeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
-=======
-		this.codeShowFieldConfigService.updateBatch(codeReferConfigVO.getCodeShowFieldConfigVOS());
-		this.codeSrchCondConfigService.updateBatch(codeReferConfigVO.getCodeSrchCondConfigVOS());
->>>>>>> Stashed changes
         return R.data(codeReferConfigVO);
     }
 
@@ -336,13 +222,8 @@
 		if (!resDeleteReferConfig) {
 			return R.fail("鍙傜収閰嶇疆鍒犻櫎澶辫触锛�");
 		}
-<<<<<<< Updated upstream
 		this.ICodeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
 		this.ICodeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
-=======
-		this.codeShowFieldConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
-		this.codeSrchCondConfigService.deleteByReferConfigOid(codeReferConfigDTO.getOid());
->>>>>>> Stashed changes
         return  R.status(resDeleteReferConfig);
     }
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index a990d5f..386b7e8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -17,10 +17,13 @@
 package com.vci.ubcs.code.service.impl;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
 import com.vci.ubcs.code.dto.CodeBasicSecDTO;
 import com.vci.ubcs.code.dto.CodeRuleDTO;
@@ -40,10 +43,14 @@
 import com.vci.ubcs.starter.exception.VciBaseException;
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.KeyValue;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.starter.web.util.WebUtil;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
@@ -96,15 +103,17 @@
 	@Resource
 	private RevisionModelUtil revisionModelUtil;
 
+	/**
+	 * 鍒嗛〉鏌ヨ
+	 * @param query
+	 * @param conidtionMap
+	 * @return
+	 */
 	@Override
-	public IPage<CodeRuleVO> gridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) {
-		//瀵圭敓鍛藉懆鏈熺殑鏋氫妇杩涜杞崲
-		if(!StringUtils.isEmpty(codeRule.getLcStatusText())){
-			codeRule.setLcStatus(CodeRuleLC.getValueByText(codeRule.getLcStatusText()));
-		}
-		List<CodeRule> codeRulePage = codeRuleMapper.selectCodeRulePage(page, codeRule);
+	public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
+		IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
 		//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
-		return page.setRecords(CodeRuleWrapper.build().listVO(codeRulePage));
+		return CodeRuleWrapper.build().pageVO(codeRuleIPage);
 	}
 
 	/**
@@ -278,7 +287,7 @@
 	 */
 	@Override
 	public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
-		List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().eq("codeRuleOid", oid));
+		List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
 		return CodeClassifyWrapper.build().listVO(codeClassifies);
 	}
 
@@ -332,14 +341,13 @@
 	/**
 	 * 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
 	 *
-	 * @param codeRule 鏌ヨ鏉′欢
-	 * @param page   鍒嗛〉鍜屾帓搴�
+	 * @param bladeQueryObject 鏌ヨ鏉′欢
 	 * @return 涓绘暟鎹紪鐮佽鍒欐樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
 	 * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
 	 */
 	@Override
-	public IPage<CodeRuleVO> refDataGridCodeRule(IPage<CodeRuleVO> page, CodeRuleVO codeRule) throws VciBaseException {
-		return gridCodeRule(page, codeRule);
+	public IPage<CodeRuleVO> refDataGridCodeRule(BladeQueryObject bladeQueryObject) throws VciBaseException {
+		return gridCodeRule(bladeQueryObject.getQuery(), bladeQueryObject.getConditionMap());
 	}
 
 	/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
index f779e61..577f289 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
@@ -1,29 +1,14 @@
 package com.vci.ubcs.code.service.impl;
 
-<<<<<<< Updated upstream
-=======
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
->>>>>>> Stashed changes
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.vci.ubcs.code.entity.CodeShowFieldConfig;
 import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
-<<<<<<< Updated upstream
 import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
 import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
 import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
 import org.springframework.stereotype.Service;
-=======
-import com.vci.ubcs.code.service.CodeShowFieldConfigService;
-import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
-import com.vci.ubcs.code.wrapper.CodeShowFieldConfigWraper;
-import org.springblade.core.mp.support.Query;
-import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
->>>>>>> Stashed changes
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -36,30 +21,12 @@
  * @since 2023-05-19 17:58:56
  */
 @Service("CodeShowFieldConfigService")
-<<<<<<< Updated upstream
 public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements ICodeShowFieldConfigService {
-=======
-public class CodeShowFieldConfigServiceImpl extends ServiceImpl<CodeShowFieldConfigMapper,CodeShowFieldConfig> implements CodeShowFieldConfigService {
->>>>>>> Stashed changes
 
     @Resource
     private CodeShowFieldConfigMapper codeShowFieldConfigMapper;
 
     /**
-<<<<<<< Updated upstream
-=======
-     * 閫氳繃ID鏌ヨ鍗曟潯鏁版嵁
-     *
-     * @param oid 涓婚敭
-     * @return 瀹炰緥瀵硅薄
-     */
-    @Override
-    public CodeShowFieldConfig queryById(String oid) {
-        return this.codeShowFieldConfigMapper.queryById(oid);
-    }
-
-    /**
->>>>>>> Stashed changes
      * 鏂板鏁版嵁
      *
      * @param codeShowFieldConfig 瀹炰緥瀵硅薄
@@ -72,31 +39,11 @@
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-<<<<<<< Updated upstream
 	public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS, String oid) {
 		List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS,oid);
 		boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
 		return b;
 	}
-=======
-	public boolean insertBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
-		List<CodeShowFieldConfig> codeShowFieldConfigs = CodeShowFieldConfigWraper.build().listDO(codeShowFieldConfigVOS);
-		boolean b = this.saveOrUpdateBatch(codeShowFieldConfigs);
-		return b;
-	}
-
-	/**
-     * 淇敼鏁版嵁
-     *
-     * @param codeShowFieldConfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-    @Override
-	@Transactional(rollbackFor = Exception.class)
-    public boolean update(CodeShowFieldConfig codeShowFieldConfig) {
-        return this.codeShowFieldConfigMapper.update(codeShowFieldConfig)>0;
-    }
->>>>>>> Stashed changes
 
 	@Override
 	public boolean updateBatch(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
index 274b050..31082d8 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
@@ -1,42 +1,18 @@
 package com.vci.ubcs.code.service.impl;
 
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-=======
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.CodeShowFieldConfig;
->>>>>>> Stashed changes
 import com.vci.ubcs.code.entity.CodeSrchCondConfig;
-import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
 import com.vci.ubcs.code.mapper.CodeSrchCondConfigMapper;
-<<<<<<< Updated upstream
 import com.vci.ubcs.code.service.ICodeSrchCondConfigService;
 import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
 import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-=======
-import com.vci.ubcs.code.service.CodeSrchCondConfigService;
-import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-import com.vci.ubcs.code.wrapper.CodeSrchCondConfigWraper;
-import org.apache.cxf.endpoint.ServerImpl;
->>>>>>> Stashed changes
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-<<<<<<< Updated upstream
 import java.util.List;
-=======
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
->>>>>>> Stashed changes
 
 /**
  * 寮曠敤鐮佹锛屽弬鐓ч厤缃晫闈紝鏌ヨ鏉′欢閰嶇疆琛�(CodeSrchCondConfigService)琛ㄦ湇鍔″疄鐜扮被
@@ -45,11 +21,7 @@
  * @since 2023-05-19 17:58:56
  */
 @Service("CodeSrchCondConfigService")
-<<<<<<< Updated upstream
 public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements ICodeSrchCondConfigService {
-=======
-public class CodeSrchCondConfigServiceImpl extends ServiceImpl<CodeSrchCondConfigMapper, CodeSrchCondConfig> implements CodeSrchCondConfigService {
->>>>>>> Stashed changes
 
     @Resource
     private CodeSrchCondConfigMapper codeSrchcondconfigMapper;
@@ -66,29 +38,11 @@
     }
 
 	@Override
-<<<<<<< Updated upstream
 	@Transactional(rollbackFor = Exception.class)
 	public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS, String oid) {
 		List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS,oid);
 		return this.saveOrUpdateBatch(codeSrchCondConfigs);
 	}
-=======
-	public boolean insertBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
-		List<CodeSrchCondConfig> codeSrchCondConfigs = CodeSrchCondConfigWraper.build().listDO(codeSrchCondConfigVOS);
-		return this.saveOrUpdateBatch(codeSrchCondConfigs);
-	}
-
-	/**
-     * 淇敼鏁版嵁
-     *
-     * @param codeSrchcondconfig 瀹炰緥瀵硅薄
-     * @return 瀹炰緥瀵硅薄
-     */
-    @Override
-    public boolean update(CodeSrchCondConfig codeSrchcondconfig) {
-        return this.codeSrchcondconfigMapper.update(codeSrchcondconfig)>0;
-    }
->>>>>>> Stashed changes
 
 	@Override
 	public boolean updateBatch(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 81ab0ca..3837b3e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -50,7 +50,6 @@
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringPool;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -781,11 +780,6 @@
 			data.put(CODE_TEMPLATE_OID_FIELD,templateVO.getOid());
 			data.put(CODE_FULL_PATH_FILED,fullPath);
 			cbo.setData(data);
-			cbo.setOid(VciBaseUtil.getPk());
-			cbo.setCreateTime(new Date());
-			cbo.setLastModifyTime(new Date());
-			cbo.setCreator(AuthUtil.getUser().getUserName());
-			cbo.setLastModifier(AuthUtil.getUser().getUserName());
 //			cbo.setCodeclsfid(classifyFullInfo.getCurrentClassifyVO().getOid());
 //			cbo.setTemplateOid(templateVO.getOid());
 //			cbo.setCodeclsfpath(fullPath);
@@ -807,7 +801,7 @@
 			}
 
 			int secret = VciBaseUtil.getInt(String.valueOf(cbo.getSecretGrade()));
-			//鍚庣画鐪嬪瘑绾ф湇鍔℃槸鍚﹀彲鐢�
+			//鎻掍釜鐐癸紝鍚庣画鐪嬪瘑绾ф湇鍔℃槸鍚﹀彲鐢�
 //			if (secret == 0 || !secretService.checkDataSecret(secret)) {
 			if (secret == 0 ) {
 				Integer userSecret = VciBaseUtil.getCurrentUserSecret();
@@ -834,14 +828,12 @@
 			btmName = btmName.trim().toLowerCase();
 		}
 		try {
-			String keyPrefix = BTM_INIT_CACHE.concat(StringPool.COLON).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
-//			String finalBtmName = btmName;
-			Cache.ValueWrapper valueWrapper = CacheUtil.getCache(keyPrefix).get(keyPrefix.concat(String.valueOf(btmName)));
-			if(valueWrapper == null){
-				CacheUtil.getCache(keyPrefix).put(keyPrefix.concat(String.valueOf(btmName)), createBaseModel(btmName));
-				valueWrapper = CacheUtil.getCache(keyPrefix).get(keyPrefix.concat(String.valueOf(btmName)));
-			}
-			return (BaseModel) valueWrapper.get();
+			String keyPrefix = BTM_NAME.concat(StringPool.DASH).concat(AuthUtil.getTenantId()).concat(StringPool.COLON);
+			String finalBtmName = btmName;
+			return CacheUtil.get(BTM_INIT_CACHE, keyPrefix, btmName, () -> {
+				BaseModel baseModel = createBaseModel(finalBtmName);
+				return baseModel;
+			});
 		} catch (Exception e) {
 			logger.error("鍒涘缓涓氬姟绫诲瀷瀵硅薄",e);
 			throw new VciBaseException("initBtmError",new String[]{btmName});
@@ -1569,11 +1561,8 @@
 					referVO.setTextField("name");
 				}
 				//琛ㄩ渶瑕佹敼
-				//浣跨敤浼犲叆鐨勪笟鍔$被鍨嬫煡璇㈣〃
-				R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referVO.getReferType()));
 //				String referTable = VciBaseUtil.getTableName(referVO.getReferType());
-				String referTable = listR.getData().get(0).getTableName();
-//				String referTable = "pl_code_classify";
+				String referTable = "pl_code_wupin";
 				String referTableNick = attrVO.getId() + "0";
 				String left = " left join " + referTable + " " + referTableNick + " on " + referTableNick + "." + referVO.getValueField() + " =  t." + attrVO.getId();
 				joinTableList.put(attrVO.getId(), left);
@@ -1664,10 +1653,7 @@
 		}
 		//瑕佹敼锛岃〃鏄庤幏鍙栨湁闂
 //		String tableName = VciBaseUtil.getTableName(btmType);
-//		String tableName = "pl_code_wupin";
-		R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(btmType));
-//				String referTable = VciBaseUtil.getTableName(referVO.getReferType());
-		String tableName = listR.getData().get(0).getTableName();
+		String tableName = "pl_code_wupin";
 		String sql = "select " + selectFieldList.stream().map(s -> (s.contains(".") ? s : ("t." + s))).collect(Collectors.joining(","))
 			+ " from " + tableName + SPACE + "t" + SPACE
 			+ joinTableList.values().stream().collect(Collectors.joining(SPACE))
@@ -2875,11 +2861,11 @@
 		uiInfoVO.setLeaf(classifyService.countChildrenByClassifyOid(codeClassifyOid) == 0);
 		if (StringUtils.isNotBlank(functionId) && !"~".equalsIgnoreCase(functionId)) {
 			//鍔熻兘鎸夐挳鏈嶅姟杩樻湭瀹炵幇锛岀瓑瀹炵幇浜嗭紝鍦ㄨ繘琛岃皟鐢�
-//			List<SmOperationVO> operationVOS = operationService.listButtonByFunctionId(functionId);
+			//List<SmOperationVO> operationVOS = operationService.listButtonByFunctionId(functionId);
 //			if (operationVOS == null) {
 //				operationVOS = new ArrayList<>();
 //			}
-//			//鏌ヨ鎵╁睍鎸夐挳
+			//鏌ヨ鎵╁睍鎸夐挳
 //			List<CodeButtonVO> buttonVOS = listButtonInToolbarByClassifyOid(codeClassifyOid);
 //			if (!CollectionUtils.isEmpty(buttonVOS)) {
 //				for (int i = 0; i < buttonVOS.size(); i++) {
@@ -2889,8 +2875,8 @@
 //					operationVO.setUniqueFlag(buttonVO.getId());
 //					operationVO.setName(buttonVO.getName());
 //					operationVO.setAlias(operationVO.getName());
-//					operationVO.setExecuteJs(buttonVO.getExecuteJs());
-//					operationVO.setIconCls(buttonVO.getIconCls());
+//					operationVO.setExecuteJs(buttonVO.getExecutejs());
+//					operationVO.setIconCls(buttonVO.getIconcls());
 //					operationVOS.add(operationVO);
 //				}
 //			}
@@ -3027,7 +3013,7 @@
 		R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(boName));
 		String userName = AuthUtil.getUser().getUserName();
 		BaseModel bo = new BaseModel();
-//		bo.setOid(VciBaseUtil.getPk());
+		bo.setOid(VciBaseUtil.getPk());
 //		bo.setRevisionid(VciBaseUtil.getPk());
 //		bo.setNameoid(VciBaseUtil.getPk());
 		bo.setBtmname(boName);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 526c013..689147f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -21,7 +21,6 @@
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
 import com.vci.ubcs.starter.web.pagemodel.DataGrid;
 import com.vci.ubcs.starter.web.pagemodel.KeyValue;
-import com.vci.ubcs.starter.web.util.LangBaseUtil;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.starter.web.util.VciDateUtil;
 import lombok.AllArgsConstructor;
@@ -38,7 +37,6 @@
 
 import javax.annotation.Resource;
 import java.io.File;
-import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -257,60 +255,15 @@
 		String redisUUid=batchImportCodes(orderDTO,templateVO,dataSet,errorMap,true);
 		CodeImProtRusultVO codeImProtRusultVO = new CodeImProtRusultVO();
 		List<String> needRowIndexList = new ArrayList<>();
-		String filePath = returnErrorToExcel(dataSet.getRowData(), errorMap, needRowIndexList, dataSet.getColName());
-		if(StringUtils.isNotBlank(filePath)) {
-			codeImProtRusultVO.setFilePath(filePath);
-		}
-		if(StringUtils.isNotBlank(redisUUid)){
-			codeImProtRusultVO.setRedisUuid(redisUUid);
-		}
-//		return null;
-		return codeImProtRusultVO;
-	}
-
-	/**
-	 * 閿欒淇℃伅杩斿洖excel
-	 * @param rowDataList 鎵�鏈夌殑瀵煎叆鏁版嵁
-	 * @param errorMap 閿欒鐨勪俊鎭�
-	 * @param needRowIndexList 闇�瑕佸啓鍏ョ殑鏁版嵁鐨勮鍙�
-	 * @param titleRowData 鏍囬琛�
-	 *
-	 * @return 閿欒鐨別xcel鏂囦欢锛屾病鏈夐敊璇細杩斿洖绌�
-	 */
-	private String returnErrorToExcel(Collection<SheetRowData> rowDataList,
-									  Map<String,String> errorMap,
-									  List<String> needRowIndexList,List<String> titleRowData){
-		if(CollectionUtils.isEmpty(errorMap)){
-			return "";
-		}
-		Map<String, SheetRowData> rowIndexDataMap = rowDataList.stream().filter(s -> !needRowIndexList.contains(s.getRowIndex())).collect(Collectors.toMap(s -> s.getRowIndex(), t -> t));
-		List<WriteExcelData> errorDataList = new ArrayList<>();
-		errorDataList.add(new WriteExcelData(0,0,"閿欒淇℃伅"));
-		for (int i = 0; i < titleRowData.size(); i++) {
-			//閿欒淇℃伅鍦ㄦ渶鍚�
-			errorDataList.add(new WriteExcelData(0,i+1,titleRowData.get(i)));
-		}
-		Integer[] newRowIndex = new Integer[]{1};
-		errorMap.forEach((index,error)->{
-			//閿欒淇℃伅鍏ㄩ儴缁勫悎鍒颁竴璧�
-			SheetRowData rowData = rowIndexDataMap.getOrDefault(index, null);
-			if(rowData!=null){
-				errorDataList.add(new WriteExcelData(newRowIndex[0],0,error));
-				rowData.getData().forEach((colIndex,value)->{
-					errorDataList.add(new WriteExcelData(newRowIndex[0],colIndex+1,value));
-				});
-				newRowIndex[0]++;
-			}
-		});
-		String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + "閿欒淇℃伅.xls";
-		WriteExcelOption eo = new WriteExcelOption(errorDataList);
-		try {
-			new File(excelFileName).createNewFile();
-		} catch (IOException e) {
-			throw new VciBaseException(LangBaseUtil.getErrorMsg(e));
-		}
-		ExcelUtil.writeDataToFile(excelFileName,eo);
-		return excelFileName;
+//		String filePath = returnErrorToExcel(dataSet.getRowData(), errorMap, needRowIndexList, dataSet.getColName());
+//		if(StringUtils.isNotBlank(filePath)) {
+//			codeImProtRusultVO.setFilePath(filePath);
+//		}
+//		if(StringUtils.isNotBlank(redisUUid)){
+//			codeImProtRusultVO.setRedisUuid(redisUUid);
+//		}
+		return null;
+//		return codeImProtRusultVO;
 	}
 
 	/**
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
index 2e28e85..71efccf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeReferConfigWraper.java
@@ -1,17 +1,11 @@
 package com.vci.ubcs.code.wrapper;
 
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.vci.ubcs.code.entity.CodeReferConfig;
 import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.enums.EnumEnum;
-=======
-import com.vci.ubcs.code.entity.CodeReferConfig;
-import com.vci.ubcs.code.enumpack.CodeReferConfigTypeEnum;
-import com.vci.ubcs.code.vo.CodeReferConfigVO;
->>>>>>> Stashed changes
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -35,13 +29,9 @@
 	@Override
 	public CodeReferConfigVO entityVO(CodeReferConfig codeReferConfig) {
 		CodeReferConfigVO codeReferConfigVO = Objects.requireNonNull(BeanUtil.copy(codeReferConfig, CodeReferConfigVO.class));
-<<<<<<< Updated upstream
 		if(StringUtils.isNotBlank(codeReferConfig.getType())){
 			codeReferConfigVO.setTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_TYPE,codeReferConfig.getType()));
 		}
-=======
-		codeReferConfigVO.setTypeText(CodeReferConfigTypeEnum.getTextByValue(codeReferConfig.getType()));
->>>>>>> Stashed changes
 		if(Func.isNotEmpty(codeReferConfig.getCodeSrchCondConfigs())){
 			codeReferConfigVO.setCodeSrchCondConfigVOS(CodeSrchCondConfigWraper.build().listVO(codeReferConfig.getCodeSrchCondConfigs()));
 		}
@@ -53,7 +43,6 @@
 		return codeReferConfigVO;
 	}
 
-<<<<<<< Updated upstream
 	public CodeReferConfig entityDO(CodeReferConfigVO codeReferConfigVO) {
 		CodeReferConfig codeReferConfig = Objects.requireNonNull(BeanUtil.copy(codeReferConfigVO, CodeReferConfig.class));
 		//codeReferConfig.setType(CodeReferConfigTypeEnum.getValueByText(codeReferConfigVO.getTypeText()));
@@ -68,6 +57,4 @@
 		return codeReferConfig;
 	}
 
-=======
->>>>>>> Stashed changes
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
index 5889ca9..5ecbcf5 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeShowFieldConfigWraper.java
@@ -1,9 +1,6 @@
 package com.vci.ubcs.code.wrapper;
 
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-=======
->>>>>>> Stashed changes
 import com.vci.ubcs.code.entity.CodeShowFieldConfig;
 import com.vci.ubcs.code.entity.CodeSrchCondConfig;
 import com.vci.ubcs.code.enumpack.CodeReferConfigFieldTypeEnum;
@@ -11,11 +8,8 @@
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
 import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-<<<<<<< Updated upstream
 import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.enums.EnumEnum;
-=======
->>>>>>> Stashed changes
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
@@ -36,7 +30,6 @@
 	@Override
 	public CodeShowFieldConfigVO entityVO(CodeShowFieldConfig codeShowFieldConfig) {
 		CodeShowFieldConfigVO codeShowFieldConfigVO = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfig, CodeShowFieldConfigVO.class));
-<<<<<<< Updated upstream
 		if(StringUtils.isNotBlank(codeShowFieldConfig.getFixedPosition())){
 			codeShowFieldConfigVO.setFixedPositionText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FIXED,codeShowFieldConfig.getFixedPosition()));
 		}
@@ -50,17 +43,10 @@
 		CodeShowFieldConfig codeShowFieldConfig = entityDO(codeShowFieldConfigVO);
 		codeShowFieldConfig.setReferConfigOid(oid);
 		return codeShowFieldConfig;
-=======
-		codeShowFieldConfigVO.setFieldTypeText(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfig.getField()));
-		codeShowFieldConfigVO.setFixedPositionText(CodeReferConfigFixedEnum.getTextByValue(codeShowFieldConfig.getFixedPosition()));
-
-		return codeShowFieldConfigVO;
->>>>>>> Stashed changes
 	}
 
 	public CodeShowFieldConfig entityDO(CodeShowFieldConfigVO codeShowFieldConfigVO) {
 		CodeShowFieldConfig codeShowFieldConfig = Objects.requireNonNull(BeanUtil.copy(codeShowFieldConfigVO, CodeShowFieldConfig.class));
-<<<<<<< Updated upstream
 		if(StringUtils.isNotBlank(codeShowFieldConfigVO.getFieldTypeText())){
 			codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
 		}
@@ -77,13 +63,6 @@
 		return (List)codeShowFieldConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
 	}
 
-=======
-		codeShowFieldConfig.setFieldType(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFieldTypeText()));
-		codeShowFieldConfig.setFixedPosition(CodeReferConfigFieldTypeEnum.getTextByValue(codeShowFieldConfigVO.getFixedPositionText()));
-		return codeShowFieldConfig;
-	}
-
->>>>>>> Stashed changes
 	public List<CodeShowFieldConfig> listDO(List<CodeShowFieldConfigVO> codeShowFieldConfigVOS) {
 		return (List)codeShowFieldConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
 	}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
index 01e36ad..1ab477f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/CodeSrchCondConfigWraper.java
@@ -1,9 +1,6 @@
 package com.vci.ubcs.code.wrapper;
 
-<<<<<<< Updated upstream
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-=======
->>>>>>> Stashed changes
 import com.vci.ubcs.code.entity.CodeReferConfig;
 import com.vci.ubcs.code.entity.CodeShowFieldConfig;
 import com.vci.ubcs.code.entity.CodeSrchCondConfig;
@@ -12,11 +9,8 @@
 import com.vci.ubcs.code.vo.CodeReferConfigVO;
 import com.vci.ubcs.code.vo.CodeShowFieldConfigVO;
 import com.vci.ubcs.code.vo.CodeSrchCondConfigVO;
-<<<<<<< Updated upstream
 import com.vci.ubcs.omd.cache.EnumCache;
 import com.vci.ubcs.omd.enums.EnumEnum;
-=======
->>>>>>> Stashed changes
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
@@ -37,7 +31,6 @@
 	@Override
 	public CodeSrchCondConfigVO entityVO(CodeSrchCondConfig codeSrchCondConfig) {
 		CodeSrchCondConfigVO codeSrchCondConfigVO = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfig, CodeSrchCondConfigVO.class));
-<<<<<<< Updated upstream
 		if(StringUtils.isNotBlank(codeSrchCondConfigVO.getFilterType())){
 			codeSrchCondConfigVO.setFilterTypeText(EnumCache.getValue(EnumEnum.CODE_REFER_CONFIG_FILTER_TYPE,codeSrchCondConfig.getFilterType()));
 		}
@@ -56,15 +49,6 @@
 			codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
 		}
 		codeSrchCondConfig.setReferConfigOid(codeSrchCondConfigVO.getOid());
-=======
-		codeSrchCondConfigVO.setFilterTypeText(CodeReferConfigFilterTypeEnum.getTextByValue(codeSrchCondConfig.getFilterType()));
-		return codeSrchCondConfigVO;
-	}
-
-	public CodeSrchCondConfig entityDO(CodeSrchCondConfigVO codeSrchCondConfigVO) {
-		CodeSrchCondConfig codeSrchCondConfig = Objects.requireNonNull(BeanUtil.copy(codeSrchCondConfigVO, CodeSrchCondConfig.class));
-		codeSrchCondConfig.setFilterType(CodeReferConfigFieldTypeEnum.getTextByValue(codeSrchCondConfigVO.getFilterTypeText()));
->>>>>>> Stashed changes
 		return codeSrchCondConfig;
 	}
 
@@ -72,11 +56,8 @@
 		return (List)codeSrchCondConfigVOS.stream().map(this::entityDO).collect(Collectors.toList());
 	}
 
-<<<<<<< Updated upstream
 	public List<CodeSrchCondConfig> listDO(List<CodeSrchCondConfigVO> codeSrchCondConfigVOS,String oid) {
 		return (List)codeSrchCondConfigVOS.stream().map(item->entityDOsetReferConfigOid(item,oid)).collect(Collectors.toList());
 	}
 
-=======
->>>>>>> Stashed changes
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 67e62cf..7ea9a51 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -13,6 +13,7 @@
   configuration:
     map-underscore-to-camel-case: false
 
+
 ######搴旂敤鍩烘湰閰嶇疆
 #app:
 #  name: web
@@ -73,5 +74,4 @@
 #  system_attrmap: {RLM: D:\RLM.xml,PDM: D:\pdm.xml,DMS: D:\DMS.xml}
 #  #MPM鏋氫妇鍊煎睘鎬ф槧灏�
 #  mpmEnumMap: {partType: [{enumValue: 1,enumText: 浜у搧},{enumValue: 2,enumText: 浜у搧},{'enumValue': 3,enumText: 鏍囧噯浠秨,{'enumValue': 7,enumText: 鏉愭枡}]}
-
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index a9c5005..815a649 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -199,47 +199,4 @@
             connect by prior PARENTCODECLASSIFYOID = oid
     </select>
 
-    <select id="selectCodeClassifyDOByTree" resultMap="plCodeClassifyResultMap">
-        select codeclassify0.OWNER                 as owner,
-        codeclassify0.BTMTYPEID             as btmtypeid,
-        codeclassify0.CREATOR               as creator,
-        codeclassify0.CREATETIME            as createtime,
-        codeclassify0.LASTMODIFIER          as lastmodifier,
-        codeclassify0.DESCRIPTION           as description,
-        codeclassify0.ORDERNUM              as ordernum,
-        codeclassify0.CODERULEOID           as coderuleoid,
-        codeclassify0.OID                   as oid,
-        codeclassify0.BTMNAME               as btmname,
-        codeclassify0.BTMTYPENAME           as btmtypename,
-        codeclassify0.CODEKEYATTRREPEATOID  as codekeyattrrepeatoid,
-        codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
-        codeclassify0.NAME                  as name,
-        codeclassify0.LASTMODIFYTIME        as lastmodifytime,
-        codeclassify0.ID                    as id,
-        codeclassify0.CODERESEMBLERULEOID   as coderesembleruleoid,
-        codeclassify0.LCSTATUS              as lcstatus,
-        codeclassify0.TS                    as ts,
-        coderuleoid.name                    as codeRuleOidName,
-        codekeyattrrepeatoid.name           as codeKeyAttrRepeatOidName,
-        coderesembleruleoid.name            as codeResembleRuleOidName
-        from pl_code_classify codeclassify0
-        left join pl_code_rule coderuleoid
-        on codeclassify0.codeRuleOid = coderuleoid.oid
-        left join pl_code_keyattrrepeat codekeyattrrepeatoid
-        on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
-        left join pl_code_resemblerule coderesembleruleoid
-        on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
-        where codeclassify0.lcstatus = #{lcstatus}
---         and codeclassify0.parentcodeclassifyoid is null
---         and codeclassify0.id = 'wupin'
-        <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
-            codeclassify0.parentcodeclassifyoid = '${parentcodeclassifyoid}'
-        </if>
-        <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
-            and codeclassify0.parentcodeclassifyoid is null
-            and codeclassify0.id = #{id}
-        </if>
-        order by id asc
-    </select>
-
 </mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
index abccd66..676ea36 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeReferConfigMapper.xml
@@ -115,24 +115,18 @@
     <!--鏌ヨ鎸囧畾琛屾暟鎹�-->
     <select id="selectJoinPage" resultMap="CodeReferconfigMap">
         SELECT
-            PCR.*
+        PCR.*
         FROM PL_CODE_REFERCONFIG PCR
         <where>
             <if test="codeReferConfig.tenantId != null and codeReferConfig.tenantId != ''">
                 PCR.TENANTID = #{codeReferConfig.tenantId}
             </if>
-<<<<<<< Updated upstream
             <if test="codeReferConfig.isOpenGlobal != null and codeReferConfig.isOpenGlobal != ''">
                 OR PCR.ISOPENGLOBAL = #{codeReferConfig.isOpenGlobal}
             </if>
             <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
                 and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
             </if>
-=======
-            <if test="codeReferConfig.name != null and codeReferConfig.name != ''">
-                and NAME like CONCAT(CONCAT('%', #{codeReferConfig.name}), '%')
-            </if>
->>>>>>> Stashed changes
             <if test="codeReferConfig.id != null and codeReferConfig.id != ''">
                 and ID like CONCAT(CONCAT('%', #{codeReferConfig.id}), '%')
             </if>
@@ -141,37 +135,33 @@
 
     <select id="selectShowFieldByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeShowFieldConfig">
         SELECT temp.* FROM (
-            SELECT
-                PCS.REFERCONFIGOID,
-                PCS.FIELD,
-                PCS.TITLE,
-                PCS.FIELDTYPE,
-                PCS.SORT,
-                PCS.ATTRSORTFIELD,
-                PCS.WIDTH,
-                PCS.FIXEDPOSITION,
-<<<<<<< Updated upstream
-                PCS.TEMPLET,
-                PCS.ISQUERY
-=======
-                PCS.TEMPLET
->>>>>>> Stashed changes
-            FROM PL_CODE_REFERCONFIG PCR
-                LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
-            temp WHERE temp.REFERCONFIGOID = #{oid}
+                               SELECT
+                                   PCS.REFERCONFIGOID,
+                                   PCS.FIELD,
+                                   PCS.TITLE,
+                                   PCS.FIELDTYPE,
+                                   PCS.SORT,
+                                   PCS.ATTRSORTFIELD,
+                                   PCS.WIDTH,
+                                   PCS.FIXEDPOSITION,
+                                   PCS.TEMPLET,
+                                   PCS.ISQUERY
+                               FROM PL_CODE_REFERCONFIG PCR
+                                        LEFT JOIN PL_CODE_SHOWFIELDCONFIG PCS ON PCS.REFERCONFIGOID = PCR.OID)
+                               temp WHERE temp.REFERCONFIGOID = #{oid}
     </select>
 
     <select id="selectSrchCondByReferConfigOid" resultType="com.vci.ubcs.code.entity.CodeSrchCondConfig">
         SELECT temp.*
-            FROM
+        FROM
             (SELECT
-                PCSR.FILTERFIELD,
-                PCSR.FILTERTYPE,
-                PCSR.FILTERVALUE,
-                PCSR.REFERCONFIGOID
-            FROM PL_CODE_REFERCONFIG PCR
-                     LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
-            temp WHERE temp.REFERCONFIGOID = #{oid}
+                 PCSR.FILTERFIELD,
+                 PCSR.FILTERTYPE,
+                 PCSR.FILTERVALUE,
+                 PCSR.REFERCONFIGOID
+             FROM PL_CODE_REFERCONFIG PCR
+                      LEFT JOIN PL_CODE_SRCHCONDCONFIG PCSR ON PCSR.REFERCONFIGOID = PCR.OID)
+                temp WHERE temp.REFERCONFIGOID = #{oid}
     </select>
 
 </mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
index 4b7a621..c5f1306 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/AttributeServiceImpl.java
@@ -19,7 +19,6 @@
 import com.vci.ubcs.omd.wrapper.AttributeWrapper;
 import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
 import com.vci.ubcs.starter.web.constant.OmdRegExpConstant;
 import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
index 9741d8a..6bd5b0d 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/RevisionRuleServiceImpl.java
@@ -18,8 +18,8 @@
 import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
 import com.vci.ubcs.omd.wrapper.RevisionRuleWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
 import com.vci.ubcs.starter.util.MybatisParameterUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
 import com.vci.ubcs.starter.web.constant.RegExpConstant;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
@@ -382,7 +382,7 @@
 		//妫�鏌ヤ笟鍔$被鍨�
 		Collection<Collection<String>> oidCollections = VciBaseUtil.switchCollectionForOracleIn(oidCollection);
 		for(Collection<String> oids : oidCollections) {
-			MPJLambdaWrapper<BtmType> join = Map2MPJLambdaUtil.getMPJLambdaWrapper(new BtmType())
+			MPJLambdaWrapper<BtmType> join = UBCSCondition.getMPJLambdaWrapper(new BtmType())
 				.join("join", RevisionRule.class, RevisionRule::getId, BtmType::getRevisionRuleId)
 				.in(RevisionRule::getOid, oids);
 			Long count = btmTypeMapper.selectCount(join);
@@ -404,7 +404,7 @@
 	public List<BtmTypeVO> listRevisionRuleUsedInfo(String pkRevisionRule) throws VciBaseException {
 		VciBaseUtil.alertNotNull(pkRevisionRule,"鐗堟湰瑙勫垯瀵硅薄鐨勪富閿�");
 		List<BtmType> result = btmTypeMapper.selectList(
-			Map2MPJLambdaUtil.getMPJLambdaWrapper(new BtmType())
+			UBCSCondition.getMPJLambdaWrapper(new BtmType())
 				.join("join", RevisionRule.class, RevisionRule::getId, BtmType::getRevisionRuleId)
 				.eq(RevisionRule::getOid, pkRevisionRule));
 		return BtmTypeWrapper.build().listEntityVO(result);
diff --git a/Source/data/applogs/xxl-job/xxl-job-admin.log b/Source/data/applogs/xxl-job/xxl-job-admin.log
index 100b632..9e14f1c 100644
--- a/Source/data/applogs/xxl-job/xxl-job-admin.log
+++ b/Source/data/applogs/xxl-job/xxl-job-admin.log
@@ -1,4 +1,6 @@
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 20:59:45,632 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final
 2023-06-02 20:59:47,348 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
 2023-06-02 20:59:47,349 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
@@ -29,6 +31,10 @@
 2023-06-02 20:59:58,137 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 20:59:58,153 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:25,108 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final
 2023-05-25 14:48:26,335 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
 2023-05-25 14:48:26,336 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
@@ -58,6 +64,12 @@
 2023-05-25 14:48:38,907 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:38,908 INFO [xxl-job, admin JobLogReportHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:38,935 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -110,6 +122,8 @@
 	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 20:59:58,153 ERROR [xxl-job, admin JobLogReportHelper] c.v.u.x.j.a.c.t.JobLogReportHelper [JobLogReportHelper.java : 92] >>>>>>>>>>> xxl-job, job log report thread error:{}
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
@@ -167,6 +181,12 @@
 =======
 2023-05-25 14:48:38,935 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:48:38,935 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:38,935 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -219,6 +239,8 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 20:59:58,200 INFO [xxl-job, admin JobLogReportHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 20:59:59,159 INFO [main] o.s.b.a.w.s.WelcomePageHandlerMapping [WelcomePageHandlerMapping.java : 57] Adding welcome page template: index
 2023-06-02 20:59:59,165 INFO [main] c.a.c.s.SentinelWebMvcConfigurer [SentinelWebMvcConfigurer.java : 52] [Sentinel Starter] register SentinelWebInterceptor with urlPatterns: [/**].
@@ -268,6 +290,10 @@
 2023-06-02 21:00:03,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:03,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:38,935 ERROR [xxl-job, admin JobLogReportHelper] c.v.u.x.j.a.c.t.JobLogReportHelper [JobLogReportHelper.java : 92] >>>>>>>>>>> xxl-job, job log report thread error:{}
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -368,6 +394,12 @@
 2023-05-25 14:48:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 51] >>>>>>>>> init xxl-job admin scheduler success.
 2023-05-25 14:48:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:43,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -378,9 +410,19 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:03,232 INFO [main] o.s.b.f.a.AutowiredAnnotationBeanPostProcessor [AutowiredAnnotationBeanPostProcessor.java : 367] Inconsistent constructor declaration on bean with name 'org.springblade.core.launch.server.ServerInfo': single autowire-marked constructor flagged as optional - this constructor is effectively required since there is no default constructor to fall back to: public org.springblade.core.launch.server.ServerInfo(org.springframework.boot.autoconfigure.web.ServerProperties)
 2023-06-02 21:00:04,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:04,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -394,10 +436,22 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:04,379 WARN [main] o.s.c.l.c.LoadBalancerCacheAutoConfiguration$LoadBalancerCaffeineWarnLogger [LoadBalancerCacheAutoConfiguration.java : 82] Spring Cloud LoadBalancer is currently working with the default cache. While this cache implementation is useful for development and tests, it's recommended to use Caffeine cache in production.You can switch to using Caffeine cache, by adding it and org.springframework.cache.caffeine.CaffeineCacheManager to the classpath.
 2023-06-02 21:00:04,437 INFO [main] o.s.b.a.e.web.EndpointLinksResolver [EndpointLinksResolver.java : 58] Exposing 20 endpoint(s) beneath base path '/actuator'
 2023-06-02 21:00:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:44,480 INFO [main] o.s.b.f.a.AutowiredAnnotationBeanPostProcessor [AutowiredAnnotationBeanPostProcessor.java : 367] Inconsistent constructor declaration on bean with name 'org.springblade.core.launch.server.ServerInfo': single autowire-marked constructor flagged as optional - this constructor is effectively required since there is no default constructor to fall back to: public org.springblade.core.launch.server.ServerInfo(org.springframework.boot.autoconfigure.web.ServerProperties)
+2023-05-25 14:48:45,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:45,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:44,480 INFO [main] o.s.b.f.a.AutowiredAnnotationBeanPostProcessor [AutowiredAnnotationBeanPostProcessor.java : 367] Inconsistent constructor declaration on bean with name 'org.springblade.core.launch.server.ServerInfo': single autowire-marked constructor flagged as optional - this constructor is effectively required since there is no default constructor to fall back to: public org.springblade.core.launch.server.ServerInfo(org.springframework.boot.autoconfigure.web.ServerProperties)
+2023-05-25 14:48:45,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:45,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:44,480 INFO [main] o.s.b.f.a.AutowiredAnnotationBeanPostProcessor [AutowiredAnnotationBeanPostProcessor.java : 367] Inconsistent constructor declaration on bean with name 'org.springblade.core.launch.server.ServerInfo': single autowire-marked constructor flagged as optional - this constructor is effectively required since there is no default constructor to fall back to: public org.springblade.core.launch.server.ServerInfo(org.springframework.boot.autoconfigure.web.ServerProperties)
 2023-05-25 14:48:45,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
@@ -412,6 +466,8 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:05,055 INFO [main] io.undertow.servlet [ServletContextImpl.java : 382] Initializing Spring DispatcherServlet 'dispatcherServlet'
 2023-06-02 21:00:05,055 INFO [main] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 525] Initializing Servlet 'dispatcherServlet'
 2023-06-02 21:00:05,060 INFO [main] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 547] Completed initialization in 4 ms
@@ -424,10 +480,20 @@
 2023-06-02 21:00:06,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:06,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:45,773 WARN [main] o.s.c.l.c.LoadBalancerCacheAutoConfiguration$LoadBalancerCaffeineWarnLogger [LoadBalancerCacheAutoConfiguration.java : 82] Spring Cloud LoadBalancer is currently working with the default cache. While this cache implementation is useful for development and tests, it's recommended to use Caffeine cache in production.You can switch to using Caffeine cache, by adding it and org.springframework.cache.caffeine.CaffeineCacheManager to the classpath.
 2023-05-25 14:48:45,801 INFO [main] o.s.b.a.e.web.EndpointLinksResolver [EndpointLinksResolver.java : 58] Exposing 20 endpoint(s) beneath base path '/actuator'
 2023-05-25 14:48:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -437,6 +503,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:00:06,003 INFO [main] o.s.core.launch.StartEventListener [StartEventListener.java : 45] ---[UBCS-XXLJOB-ADMIN]---鍚姩瀹屾垚锛屽綋鍓嶄娇鐢ㄧ殑绔彛:[36013]锛岀幆澧冨彉閲�:[dev]---
 2023-06-02 21:00:06,028 INFO [main] c.v.u.x.j.admin.JobAdminApplication [StartupInfoLogger.java : 61] Started JobAdminApplication in 22.221 seconds (JVM running for 25.306)
@@ -448,6 +516,10 @@
 2023-06-02 21:00:07,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:07,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:46,313 INFO [main] io.undertow.servlet [ServletContextImpl.java : 382] Initializing Spring DispatcherServlet 'dispatcherServlet'
 2023-05-25 14:48:46,313 INFO [main] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 525] Initializing Servlet 'dispatcherServlet'
 2023-05-25 14:48:46,317 INFO [main] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 547] Completed initialization in 4 ms
@@ -459,6 +531,12 @@
 2023-05-25 14:48:46,729 INFO [main] c.a.c.n.r.NacosServiceRegistry [NacosServiceRegistry.java : 75] nacos registry, DEFAULT_GROUP ubcs-xxljob-admin 192.168.237.1:36013 register finished
 2023-05-25 14:48:47,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:47,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -469,9 +547,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:07,568 INFO [RMI TCP Connection(13)-192.168.3.7] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:07,572 WARN [RMI TCP Connection(13)-192.168.3.7] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:47,437 INFO [main] o.s.core.launch.StartEventListener [StartEventListener.java : 45] ---[UBCS-XXLJOB-ADMIN]---鍚姩瀹屾垚锛屽綋鍓嶄娇鐢ㄧ殑绔彛:[36013]锛岀幆澧冨彉閲�:[dev]---
 2023-05-25 14:48:47,473 INFO [main] c.v.u.x.j.admin.JobAdminApplication [StartupInfoLogger.java : 61] Started JobAdminApplication in 24.723 seconds (JVM running for 26.712)
 2023-05-25 14:48:47,488 INFO [main] c.a.c.n.r.NacosContextRefresher [NacosContextRefresher.java : 105] listening config: dataId=ubcs-xxljob-admin, group=DEFAULT_GROUP
@@ -481,6 +565,12 @@
 2023-05-25 14:48:47,497 INFO [main] c.a.c.n.r.NacosContextRefresher [NacosContextRefresher.java : 105] listening config: dataId=ubcs.yaml, group=DEFAULT_GROUP
 2023-05-25 14:48:47,699 INFO [RMI TCP Connection(7)-192.168.1.46] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:47,701 WARN [RMI TCP Connection(7)-192.168.1.46] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -524,7 +614,17 @@
 	at javax.management.remote.rmi.RMIConnectionImpl.doPrivilegedOperation(RMIConnectionImpl.java:1401)
 	at javax.management.remote.rmi.RMIConnectionImpl.invoke(RMIConnectionImpl.java:829)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor95.invoke(Unknown Source)
+=======
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
@@ -545,8 +645,18 @@
 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:08,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:08,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:48,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:48,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:48,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -560,8 +670,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:08,155 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:08,156 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:48:48,941 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:48,943 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:48,941 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:48,943 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:48,941 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:48,943 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -618,8 +738,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:09,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:09,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:49,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:49,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:49,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -633,8 +763,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:10,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:10,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -648,8 +788,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:11,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:11,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:51,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:51,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:51,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:51,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:51,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:51,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -663,8 +813,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:12,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:12,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -678,8 +838,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:13,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:13,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -693,8 +863,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:14,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:14,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -708,8 +888,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:15,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:15,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -723,8 +913,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:16,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:16,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -738,8 +938,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:17,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:17,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -753,8 +963,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:18,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:18,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:58,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:58,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:58,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:58,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:58,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:58,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -768,8 +988,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:18,156 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:18,157 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:48:58,946 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:58,948 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:58,946 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:58,948 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:58,946 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:58,948 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -826,8 +1056,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:19,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:19,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:48:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:48:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:48:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:48:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:48:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -841,8 +1081,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:20,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:20,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -856,8 +1106,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:21,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:21,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:01,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:01,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:01,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:01,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:01,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:01,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -871,8 +1131,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:22,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:22,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:02,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:02,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:02,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:02,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:02,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:02,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -886,8 +1156,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:23,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:23,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:03,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:03,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:03,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:03,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:03,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:03,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -901,8 +1181,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:24,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:24,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:04,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:04,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:04,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:04,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:04,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:04,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -916,8 +1206,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:25,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:25,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -931,8 +1231,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:06,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:06,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:06,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:06,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:06,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:06,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -946,8 +1256,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:27,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:27,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:07,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:07,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:07,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -961,8 +1281,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:28,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:28,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:08,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -976,8 +1306,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:28,155 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:28,155 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+=======
+2023-05-25 14:49:08,938 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,940 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:08,938 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,940 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:08,938 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:08,940 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
@@ -1034,8 +1374,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:28,166 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:28,167 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:49:08,948 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,949 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:08,948 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:08,949 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:08,948 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:08,949 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -1092,8 +1442,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:29,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:29,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1106,6 +1466,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:00:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1150,6 +1512,14 @@
 2023-06-02 21:00:33,971 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:33,973 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+=======
+2023-05-25 14:49:09,972 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:09,975 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:09,972 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:09,975 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:09,972 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:09,975 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
@@ -1257,7 +1627,17 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:34,178 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:10,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:10,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:10,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:10,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:10,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:10,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1271,8 +1651,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:35,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:35,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:11,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:11,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:11,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1286,8 +1676,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:36,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:36,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:12,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:12,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:12,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:12,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:12,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:12,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1301,8 +1701,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:37,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:37,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:13,036 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:13,037 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:13,036 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:13,037 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:13,036 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:13,037 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1316,8 +1726,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:38,033 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:38,034 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:14,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:14,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:14,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:14,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:14,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:14,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1331,9 +1751,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:38,178 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:38,180 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:49:15,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:15,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -1376,6 +1802,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:49:18,950 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:18,951 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -1429,8 +1861,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:39,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:39,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:19,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:19,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:19,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:19,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:19,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:19,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1444,8 +1886,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:40,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:40,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:20,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:20,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:20,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:20,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:20,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:20,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1459,8 +1911,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:41,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:41,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:21,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:21,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:21,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:21,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:21,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:21,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1474,8 +1936,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:42,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:42,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:22,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:22,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:22,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:22,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:22,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:22,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1489,8 +1961,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:43,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:43,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:23,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:23,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:23,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:23,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:23,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:23,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1504,8 +1986,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:44,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:44,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:24,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:24,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:24,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:24,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:24,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:24,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1519,8 +2011,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:25,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:25,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:25,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:25,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:25,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:25,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1533,6 +2035,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:00:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1619,6 +2123,14 @@
 	... 14 common frames omitted
 2023-06-02 21:00:48,519 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:48,521 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+=======
+2023-05-25 14:49:25,632 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:25,634 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:25,632 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:25,634 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:25,632 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:25,634 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
@@ -1726,8 +2238,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1741,9 +2263,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:49:27,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:27,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -1819,6 +2347,12 @@
 	... 14 common frames omitted
 2023-05-25 14:49:29,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:29,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -1829,8 +2363,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:51,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:51,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1844,8 +2388,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:52,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:31,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:31,014 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:31,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:31,014 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:31,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:31,014 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1859,8 +2413,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:53,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:53,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1874,8 +2438,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:54,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:54,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:33,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:33,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:33,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:33,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:33,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:33,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1889,8 +2463,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1904,8 +2488,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:56,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:56,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:35,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:35,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:35,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:35,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:35,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:35,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1919,8 +2513,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:36,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:36,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:36,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:36,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:36,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:36,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1934,8 +2538,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:37,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:37,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:37,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:37,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:37,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:37,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -1949,9 +2563,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:58,157 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:58,158 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:49:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -1964,6 +2584,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:49:38,941 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:38,942 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -2017,8 +2643,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:58,183 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:58,184 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:49:38,954 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:38,955 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:38,954 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:38,955 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:38,954 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:38,955 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -2075,8 +2711,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:59,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:00:59,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:39,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:39,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:39,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:39,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:39,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:39,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2090,8 +2736,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2105,8 +2761,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:01,006 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:01,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2120,8 +2786,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:02,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:02,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2135,8 +2811,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:03,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:03,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:43,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:43,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:43,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:43,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:43,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:43,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2150,8 +2836,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:04,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:04,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2165,8 +2861,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:45,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:45,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:45,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:45,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:45,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:45,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2179,6 +2885,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:01:06,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:06,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2265,6 +2973,14 @@
 	... 14 common frames omitted
 2023-06-02 21:01:08,501 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:08,503 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+=======
+2023-05-25 14:49:45,628 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:45,630 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:45,628 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:45,630 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:45,628 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:45,630 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
@@ -2372,8 +3088,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2387,8 +3113,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:10,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:10,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:47,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:47,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:47,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:47,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:47,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:47,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2402,8 +3138,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:11,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:48,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:48,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:48,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:48,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2416,6 +3162,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:01:12,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:12,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2493,6 +3241,14 @@
 2023-05-25 14:49:48,969 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:48,970 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:49:48,969 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:48,970 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:48,969 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:48,970 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -2545,8 +3301,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:19,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:19,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:49,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:49,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:49,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:49,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:49,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:49,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2560,8 +3326,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:20,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:20,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:50,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:50,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:50,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:50,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:50,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:50,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2575,8 +3351,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:21,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:21,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:51,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:51,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:51,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:51,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:51,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:51,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2590,8 +3376,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:22,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:22,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:52,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:52,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:52,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:52,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:52,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:52,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2605,8 +3401,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:23,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:23,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2620,8 +3426,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:24,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:24,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2635,8 +3451,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:25,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:25,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2650,8 +3476,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:26,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:56,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:56,006 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:56,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:56,006 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:56,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:56,006 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2665,8 +3501,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:27,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:27,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2680,8 +3526,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:28,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:28,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:49:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:49:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -2695,9 +3551,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:28,160 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:28,162 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:49:58,972 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:49:58,973 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
@@ -2957,6 +3819,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:50:08,955 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:08,956 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -3010,8 +3878,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:28,205 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:28,206 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:50:08,986 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:08,987 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:08,986 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:08,987 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:08,986 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:08,987 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -3049,7 +3927,13 @@
 	... 8 common frames omitted
 Caused by: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
 	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
 	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
@@ -3071,6 +3955,8 @@
 	... 14 common frames omitted
 2023-05-25 14:50:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 >>>>>>> Stashed changes
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -3084,6 +3970,10 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:50:10,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:10,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
 	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
@@ -3092,6 +3982,25 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
+=======
+>>>>>>> Stashed changes
+2023-05-25 14:50:10,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:10,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
+	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
+	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
+	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
+	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
+	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:50:11,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:11,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -3211,6 +4120,12 @@
 	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
 	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 	at org.springframework.jdbc.datasource.DataSourceUtils.fetchConnection(DataSourceUtils.java:159)
 	at org.springframework.jdbc.datasource.DataSourceUtils.doGetConnection(DataSourceUtils.java:117)
@@ -3227,9 +4142,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 14 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:28,566 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:28,568 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:50:19,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:19,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -3302,6 +4223,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:50:25,601 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:25,603 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -3406,8 +4333,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:29,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:29,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:26,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:26,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:26,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:26,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:26,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:26,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3421,8 +4358,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:27,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:27,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:27,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:27,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:27,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:27,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3436,8 +4383,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:31,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:31,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3450,6 +4407,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:01:32,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:32,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3527,6 +4486,14 @@
 2023-05-25 14:50:28,989 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:28,991 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:50:28,989 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:28,991 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:28,989 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:28,991 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -3553,8 +4520,16 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -3589,6 +4564,12 @@
 	... 13 common frames omitted
 2023-05-25 14:50:29,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:29,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -3599,8 +4580,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:40,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:40,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3614,8 +4605,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:41,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:41,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:31,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:31,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:31,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:31,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:31,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:31,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3629,8 +4630,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:32,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:32,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3644,8 +4655,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:43,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:43,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:33,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:33,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:33,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:33,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:33,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:33,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3659,8 +4680,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:44,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:44,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:34,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:34,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:34,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:34,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:34,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:34,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3674,8 +4705,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:45,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:35,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:35,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:35,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:35,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:35,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:35,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3689,8 +4730,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3704,8 +4755,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:47,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:47,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:37,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:37,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:37,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:37,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:37,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:37,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3719,8 +4780,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:48,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:48,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -3733,6 +4804,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:01:48,220 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:48,221 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -3997,6 +5070,14 @@
 2023-05-25 14:50:38,956 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:38,957 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:50:38,956 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,957 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:38,956 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,957 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobGroupMapper.xml]
@@ -4023,7 +5104,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -4052,8 +5141,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:58,221 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:58,223 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 14:50:38,997 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,999 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:38,997 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:38,999 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:38,997 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:38,999 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -4084,7 +5183,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -4113,8 +5220,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:01:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:39,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:39,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:39,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:39,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:39,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:39,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4128,8 +5245,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4143,8 +5270,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:01,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:01,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:41,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:41,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4158,8 +5295,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:02,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:02,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:42,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:42,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:42,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:42,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:42,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:42,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4173,8 +5320,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:03,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:03,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:43,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:43,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:43,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:43,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:43,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:43,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4188,8 +5345,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:04,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:04,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:44,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:44,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:44,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:44,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:44,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:44,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4203,8 +5370,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:05,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:05,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4217,6 +5394,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:02:06,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:06,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4302,6 +5481,14 @@
 	... 13 common frames omitted
 2023-06-02 21:02:08,514 INFO [XNIO-1 task-1] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:08,515 WARN [XNIO-1 task-1] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+=======
+2023-05-25 14:50:45,601 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:45,602 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:45,601 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:45,602 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:45,601 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:45,602 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
@@ -4409,8 +5596,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:09,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:09,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:46,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4424,8 +5621,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:10,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:10,014 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:47,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:47,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:47,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:47,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:47,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:47,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4439,8 +5646,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:11,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4454,8 +5671,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:12,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:12,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4468,6 +5695,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:02:13,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:13,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4535,6 +5764,14 @@
 2023-05-25 14:50:49,010 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:49,011 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:50:49,010 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:49,011 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:49,010 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:49,011 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -4561,7 +5798,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -4590,8 +5835,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:19,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:19,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4605,8 +5860,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:20,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:20,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:51,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:51,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:51,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:51,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:51,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:51,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4620,8 +5885,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:21,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:21,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4635,8 +5910,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:22,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:22,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:53,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:53,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4650,8 +5935,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:23,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:23,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4665,8 +5960,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:24,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:24,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:55,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:55,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:55,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:55,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:55,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:55,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4680,8 +5985,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:25,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:25,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:56,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:56,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:56,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:56,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:56,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:56,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4695,8 +6010,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:26,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:26,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:57,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:57,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4710,8 +6035,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:27,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:27,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:58,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:58,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:58,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:58,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:58,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:58,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4725,8 +6060,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:50:59,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:59,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:59,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:50:59,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:59,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:59,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -4740,9 +6085,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:28,165 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:28,167 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:50:59,012 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:50:59,013 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
@@ -4991,6 +6342,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:51:08,970 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:08,972 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -5018,7 +6375,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -5046,6 +6411,8 @@
 	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:02:28,234 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:28,236 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -5153,6 +6520,14 @@
 =======
 2023-05-25 14:51:10,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:10,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:09,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:09,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:09,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:09,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
 	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
@@ -5161,6 +6536,77 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
+=======
+>>>>>>> Stashed changes
+2023-05-25 14:51:09,018 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:09,019 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
+### The error may involve com.vci.ubcs.xxl.job.admin.dao.XxlJobLogDao.findFailJobLogIds
+### The error occurred while executing a query
+### Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at org.mybatis.spring.MyBatisExceptionTranslator.translateExceptionIfPossible(MyBatisExceptionTranslator.java:77)
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:446)
+	at com.sun.proxy.$Proxy119.selectList(Unknown Source)
+	at org.mybatis.spring.SqlSessionTemplate.selectList(SqlSessionTemplate.java:230)
+	at org.apache.ibatis.binding.MapperMethod.executeForMany(MapperMethod.java:139)
+	at org.apache.ibatis.binding.MapperMethod.execute(MapperMethod.java:76)
+	at org.apache.ibatis.binding.MapperProxy.invoke(MapperProxy.java:59)
+	at com.sun.proxy.$Proxy122.findFailJobLogIds(Unknown Source)
+	at com.vci.ubcs.xxl.job.admin.core.thread.JobFailMonitorHelper$1.run(JobFailMonitorHelper.java:49)
+	at java.lang.Thread.run(Thread.java:748)
+Caused by: org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
+### The error may involve com.vci.ubcs.xxl.job.admin.dao.XxlJobLogDao.findFailJobLogIds
+### The error occurred while executing a query
+### Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at org.apache.ibatis.exceptions.ExceptionFactory.wrapException(ExceptionFactory.java:30)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:433)
+	... 8 common frames omitted
+Caused by: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
+	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
+	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
+	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
+	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+	at org.springframework.jdbc.datasource.DataSourceUtils.fetchConnection(DataSourceUtils.java:159)
+	at org.springframework.jdbc.datasource.DataSourceUtils.doGetConnection(DataSourceUtils.java:117)
+	at org.springframework.jdbc.datasource.DataSourceUtils.getConnection(DataSourceUtils.java:80)
+	at org.mybatis.spring.transaction.SpringManagedTransaction.openConnection(SpringManagedTransaction.java:82)
+	at org.mybatis.spring.transaction.SpringManagedTransaction.getConnection(SpringManagedTransaction.java:68)
+	at org.apache.ibatis.executor.BaseExecutor.getConnection(BaseExecutor.java:338)
+	at org.apache.ibatis.executor.SimpleExecutor.prepareStatement(SimpleExecutor.java:84)
+	at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:62)
+	at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:326)
+	at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156)
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:109)
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
+	... 13 common frames omitted
+2023-05-25 14:51:10,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:10,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
+	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
+	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
+	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
+	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
+	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:51:11,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:11,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -5365,6 +6811,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:51:25,638 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:25,641 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -5469,8 +6921,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:29,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:29,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:26,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:26,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:26,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:26,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:26,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:26,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5484,8 +6946,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:30,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:30,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:27,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:27,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:27,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:27,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:27,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:27,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5499,8 +6971,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:31,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:31,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:28,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:28,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5514,8 +6996,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:29,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:29,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:29,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:29,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:29,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:29,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5528,6 +7020,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:02:33,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:33,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5595,6 +7089,14 @@
 2023-05-25 14:51:29,023 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:29,026 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:51:29,023 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:29,026 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:29,023 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:29,026 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -5621,7 +7123,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -5650,8 +7160,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:39,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:39,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5665,8 +7185,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:40,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:40,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:31,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:31,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:31,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:31,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:31,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:31,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5680,8 +7210,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:41,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:41,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5695,8 +7235,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:33,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:33,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:33,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:33,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:33,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:33,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5710,8 +7260,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:43,014 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:43,014 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:34,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:34,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5725,8 +7285,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:44,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:44,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:35,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:35,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:35,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:35,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:35,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:35,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5740,8 +7310,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:45,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:45,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:36,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5755,8 +7335,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:37,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:37,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:37,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:37,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:37,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:37,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5770,8 +7360,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:47,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:47,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:38,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:38,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -5784,6 +7384,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:02:48,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:48,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6057,6 +7659,14 @@
 2023-05-25 14:51:38,982 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:38,985 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:51:38,982 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:38,985 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:38,982 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:38,985 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobGroupMapper.xml]
@@ -6083,7 +7693,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -6112,9 +7730,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:58,245 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:58,247 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:51:39,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:39,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -6127,6 +7751,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:51:39,027 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:39,028 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -6154,7 +7784,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -6183,8 +7821,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:59,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:02:59,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:40,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:40,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:40,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:40,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:40,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:40,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6198,8 +7846,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:41,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:41,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:41,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:41,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:41,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:41,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6213,8 +7871,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:01,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:01,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:42,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:42,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:42,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:42,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:42,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:42,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6228,8 +7896,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:02,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:02,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:43,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:43,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:43,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6243,8 +7921,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:03,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:03,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6258,8 +7946,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:04,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:04,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:45,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:45,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6272,6 +7970,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:03:05,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:05,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6367,6 +8067,14 @@
 	... 13 common frames omitted
 2023-06-02 21:03:08,515 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:08,518 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+=======
+2023-05-25 14:51:45,610 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:45,611 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:45,610 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:45,611 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:45,610 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:45,611 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
@@ -6474,8 +8182,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:09,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:09,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:46,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:46,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6489,8 +8207,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:10,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:10,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:47,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:47,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:47,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:47,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:47,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:47,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6504,8 +8232,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:11,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:11,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:48,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:48,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6519,8 +8257,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:12,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:12,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:49,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:49,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6533,6 +8281,8 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:03:13,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:13,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6600,6 +8350,14 @@
 2023-05-25 14:51:49,030 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:49,032 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 >>>>>>> Stashed changes
+=======
+2023-05-25 14:51:49,030 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:49,032 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:49,030 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:49,032 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 ### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
@@ -6626,7 +8384,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -6655,8 +8421,18 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:19,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:19,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:50,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:50,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6670,8 +8446,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:20,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:20,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:51,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:51,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:51,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:51,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:51,005 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:51,005 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6685,8 +8471,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:21,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:21,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:52,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:52,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6700,8 +8496,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:22,013 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:22,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:53,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:53,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:53,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:53,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:53,011 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:53,011 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6715,8 +8521,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:23,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:23,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:54,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:54,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6730,8 +8546,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:24,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:24,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:55,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:55,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:55,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:55,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:55,010 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:55,010 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6745,8 +8571,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:25,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:25,013 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:56,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:56,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:56,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:56,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6760,8 +8596,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:26,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:26,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:57,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:57,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:57,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:57,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:57,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:57,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6775,8 +8621,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:27,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:27,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:58,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6790,8 +8646,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:28,009 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:28,009 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:51:59,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:59,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:59,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:51:59,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:59,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:59,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -6805,9 +8671,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:28,182 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:28,184 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:51:59,032 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:51:59,033 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
@@ -7056,6 +8928,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:52:08,987 INFO [xxl-job, admin JobRegistryMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:08,989 ERROR [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 81] >>>>>>>>>>> xxl-job, job registry monitor thread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
 ### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -7083,7 +8961,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -7111,6 +8997,8 @@
 	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:03:28,267 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:28,269 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -7218,6 +9106,14 @@
 =======
 2023-05-25 14:52:10,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:10,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:52:09,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:09,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:52:09,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:09,002 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
 	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
@@ -7226,6 +9122,77 @@
 	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
+=======
+>>>>>>> Stashed changes
+2023-05-25 14:52:09,034 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:09,035 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+org.mybatis.spring.MyBatisSystemException: nested exception is org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
+### The error may involve com.vci.ubcs.xxl.job.admin.dao.XxlJobLogDao.findFailJobLogIds
+### The error occurred while executing a query
+### Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at org.mybatis.spring.MyBatisExceptionTranslator.translateExceptionIfPossible(MyBatisExceptionTranslator.java:77)
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:446)
+	at com.sun.proxy.$Proxy119.selectList(Unknown Source)
+	at org.mybatis.spring.SqlSessionTemplate.selectList(SqlSessionTemplate.java:230)
+	at org.apache.ibatis.binding.MapperMethod.executeForMany(MapperMethod.java:139)
+	at org.apache.ibatis.binding.MapperMethod.execute(MapperMethod.java:76)
+	at org.apache.ibatis.binding.MapperProxy.invoke(MapperProxy.java:59)
+	at com.sun.proxy.$Proxy122.findFailJobLogIds(Unknown Source)
+	at com.vci.ubcs.xxl.job.admin.core.thread.JobFailMonitorHelper$1.run(JobFailMonitorHelper.java:49)
+	at java.lang.Thread.run(Thread.java:748)
+Caused by: org.apache.ibatis.exceptions.PersistenceException: 
+### Error querying database.  Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+### The error may exist in file [C:\java_workspace\GIT-VCI-UBCS\ubcs\Source\UBCS\ubcs-ops\ubcs-xxljob-admin\target\classes\mybatis-mapper\XxlJobLogMapper.xml]
+### The error may involve com.vci.ubcs.xxl.job.admin.dao.XxlJobLogDao.findFailJobLogIds
+### The error occurred while executing a query
+### Cause: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at org.apache.ibatis.exceptions.ExceptionFactory.wrapException(ExceptionFactory.java:30)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.lang.reflect.Method.invoke(Method.java:498)
+	at org.mybatis.spring.SqlSessionTemplate$SqlSessionInterceptor.invoke(SqlSessionTemplate.java:433)
+	... 8 common frames omitted
+Caused by: java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
+	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
+	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
+	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
+	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+	at org.springframework.jdbc.datasource.DataSourceUtils.fetchConnection(DataSourceUtils.java:159)
+	at org.springframework.jdbc.datasource.DataSourceUtils.doGetConnection(DataSourceUtils.java:117)
+	at org.springframework.jdbc.datasource.DataSourceUtils.getConnection(DataSourceUtils.java:80)
+	at org.mybatis.spring.transaction.SpringManagedTransaction.openConnection(SpringManagedTransaction.java:82)
+	at org.mybatis.spring.transaction.SpringManagedTransaction.getConnection(SpringManagedTransaction.java:68)
+	at org.apache.ibatis.executor.BaseExecutor.getConnection(BaseExecutor.java:338)
+	at org.apache.ibatis.executor.SimpleExecutor.prepareStatement(SimpleExecutor.java:84)
+	at org.apache.ibatis.executor.SimpleExecutor.doQuery(SimpleExecutor.java:62)
+	at org.apache.ibatis.executor.BaseExecutor.queryFromDatabase(BaseExecutor.java:326)
+	at org.apache.ibatis.executor.BaseExecutor.query(BaseExecutor.java:156)
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:109)
+	at org.apache.ibatis.executor.CachingExecutor.query(CachingExecutor.java:83)
+	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
+	... 13 common frames omitted
+2023-05-25 14:52:10,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:10,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
+	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
+	at com.zaxxer.hikari.pool.PoolBase.initializeDataSource(PoolBase.java:331)
+	at com.zaxxer.hikari.pool.PoolBase.<init>(PoolBase.java:114)
+	at com.zaxxer.hikari.pool.HikariPool.<init>(HikariPool.java:108)
+	at com.zaxxer.hikari.HikariDataSource.getConnection(HikariDataSource.java:112)
+	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
+	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:52:11,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:11,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -7430,6 +9397,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 14:52:25,595 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:25,596 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -7534,8 +9507,18 @@
 	at org.xnio.XnioWorker$WorkerThreadFactory$1$1.run(XnioWorker.java:1282)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:29,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:29,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 14:52:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:52:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 14:52:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:52:26,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:26,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -7549,9 +9532,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:52:27,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 14:52:27,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -22653,6 +24642,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 15:03:51,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:51,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -22663,8 +24658,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:31,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:31,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:52,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:52,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:52,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:52,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:52,012 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:52,012 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22678,8 +24683,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:53,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:53,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22693,8 +24708,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:33,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:33,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:54,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:54,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22708,8 +24733,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:34,004 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:34,004 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:55,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:55,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22723,8 +24758,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:35,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:35,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:56,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:56,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:56,003 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:56,003 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22738,8 +24783,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:36,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:36,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:57,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:57,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22753,8 +24808,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:37,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:37,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:58,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:58,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:58,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:58,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22768,8 +24833,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:38,008 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:38,008 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:03:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:59,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:59,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -22783,8 +24858,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:38,271 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:38,273 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+=======
+2023-05-25 15:03:59,560 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:59,565 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:03:59,560 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:03:59,565 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:03:59,560 INFO [xxl-job, admin JobFailMonitorHelper] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:03:59,565 ERROR [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 90] >>>>>>>>>>> xxl-job, job fail monitor thread error:{}
@@ -22815,7 +24900,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:150)
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:141)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 	at sun.reflect.GeneratedMethodAccessor124.invoke(Unknown Source)
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
+=======
+	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
+>>>>>>> Stashed changes
 =======
 	at sun.reflect.GeneratedMethodAccessor123.invoke(Unknown Source)
 >>>>>>> Stashed changes
@@ -22844,9 +24937,15 @@
 	at org.apache.ibatis.session.defaults.DefaultSqlSession.selectList(DefaultSqlSession.java:148)
 	... 13 common frames omitted
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:39,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:39,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:04:00,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:00,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -22899,6 +24998,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 15:04:05,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:05,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -22909,9 +25014,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:40,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:40,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:04:05,620 INFO [XNIO-1 task-2] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:05,627 WARN [XNIO-1 task-2] o.s.b.a.j.DataSourceHealthIndicator [AbstractHealthIndicator.java : 94] DataSource health check failed
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -23016,6 +25127,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 15:04:06,007 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:06,007 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -23026,8 +25143,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:41,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:41,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:04:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:07,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:04:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:07,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:04:07,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:07,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -23041,8 +25168,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:42,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:42,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:04:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:08,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:04:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:08,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:04:08,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:08,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -23056,9 +25193,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:43,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:43,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:04:09,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:09,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -23489,6 +25632,12 @@
 	at java.lang.Thread.run(Thread.java:748)
 2023-05-25 15:04:26,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:26,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -23499,9 +25648,15 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:44,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:44,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:04:27,015 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:27,015 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -23586,6 +25741,12 @@
 	... 13 common frames omitted
 2023-05-25 15:04:30,001 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:30,001 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
 	at com.zaxxer.hikari.util.DriverDataSource.<init>(DriverDataSource.java:110)
@@ -23596,8 +25757,18 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:45,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-06-02 21:03:45,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+=======
+2023-05-25 15:04:31,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:31,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:04:31,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
+2023-05-25 15:04:31,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
+>>>>>>> Stashed changes
 =======
 2023-05-25 15:04:31,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:31,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
@@ -23611,6 +25782,8 @@
 	at com.vci.ubcs.xxl.job.admin.core.thread.JobScheduleHelper$1.run(JobScheduleHelper.java:68)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:45,002 WARN [Thread-13] c.a.nacos.common.notify.NotifyCenter [NotifyCenter.java : 136] [NotifyCenter] Start destroying Publisher
 2023-06-02 21:03:45,002 WARN [Thread-13] c.a.nacos.common.notify.NotifyCenter [NotifyCenter.java : 153] [NotifyCenter] Destruction of the end
 2023-06-02 21:03:45,002 WARN [Thread-6] c.a.n.c.http.HttpClientBeanHolder [HttpClientBeanHolder.java : 108] [HttpClientBeanHolder] Start destroying common HttpClient
@@ -23619,6 +25792,10 @@
 2023-06-02 21:03:45,037 INFO [SpringApplicationShutdownHook] io.undertow.servlet [ServletContextImpl.java : 382] Destroying Spring FrameworkServlet 'dispatcherServlet'
 2023-06-02 21:03:45,042 ERROR [SpringApplicationShutdownHook] c.a.cloud.nacos.discovery.NacosWatch [NacosWatch.java : 180] namingService unsubscribe failed, properties:NacosDiscoveryProperties{serverAddr='127.0.0.1:8848', username='', password='', endpoint='', namespace='', watchDelay=30000, logName='', service='ubcs-xxljob-admin', weight=1.0, clusterName='DEFAULT', group='DEFAULT_GROUP', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD, management.context-path=/xxl-job-admin/actuator}, registerEnabled=true, ip='192.168.237.1', networkInterface='', port=36013, secure=false, accessKey='', secretKey='', heartBeatInterval=null, heartBeatTimeout=null, ipDeleteTimeout=null, instanceEnabled=true, ephemeral=true, failureToleranceEnabled=false}, ipDeleteTimeout=null, failFast=true}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:04:32,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] com.zaxxer.hikari.HikariDataSource [HikariDataSource.java : 110] HikariPool-1 - Starting...
 2023-05-25 15:04:32,000 ERROR [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 146] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}
 java.lang.RuntimeException: Driver oracle.jdbc.OracleDriver claims to not accept jdbcUrl, ${blade.datasource.job.dev.url}
@@ -33652,6 +35829,12 @@
 2023-05-25 15:12:07,101 INFO [SpringApplicationShutdownHook] io.undertow [Undertow.java : 259] stopping server: Undertow - 2.2.18.Final
 2023-05-25 15:12:07,129 INFO [SpringApplicationShutdownHook] io.undertow.servlet [ServletContextImpl.java : 382] Destroying Spring FrameworkServlet 'dispatcherServlet'
 2023-05-25 15:12:07,139 ERROR [SpringApplicationShutdownHook] c.a.cloud.nacos.discovery.NacosWatch [NacosWatch.java : 180] namingService unsubscribe failed, properties:NacosDiscoveryProperties{serverAddr='localhost:8848', username='', password='', endpoint='', namespace='', watchDelay=30000, logName='', service='ubcs-xxljob-admin', weight=1.0, clusterName='DEFAULT', group='DEFAULT_GROUP', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD, management.context-path=/xxl-job-admin/actuator}, registerEnabled=true, ip='192.168.237.1', networkInterface='', port=36013, secure=false, accessKey='', secretKey='', heartBeatInterval=null, heartBeatTimeout=null, ipDeleteTimeout=null, instanceEnabled=true, ephemeral=true, failureToleranceEnabled=false}, ipDeleteTimeout=null, failFast=true}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.IllegalStateException: UT015023: This Context has been already destroyed
 	at io.undertow.servlet.spec.ServletContextImpl.getDeploymentInfo(ServletContextImpl.java:211)
@@ -33677,6 +35860,8 @@
 	at org.springframework.boot.SpringApplicationShutdownHook.run(SpringApplicationShutdownHook.java:114)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:45,298 INFO [SpringApplicationShutdownHook] c.a.c.n.r.NacosServiceRegistry [NacosServiceRegistry.java : 94] De-registering from Nacos Server now...
 2023-06-02 21:03:45,299 WARN [SpringApplicationShutdownHook] o.s.c.a.CommonAnnotationBeanPostProcessor [InitDestroyAnnotationBeanPostProcessor.java : 185] Destroy method on bean with name 'nacosAutoServiceRegistration' threw an exception: java.lang.IllegalStateException: UT015023: This Context has been already destroyed
 2023-06-02 21:03:46,000 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 203] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread stop
@@ -33686,8 +35871,18 @@
 2023-06-02 21:03:47,642 INFO [xxl-job, admin JobFailMonitorHelper] c.v.u.x.j.a.c.t.JobFailMonitorHelper [JobFailMonitorHelper.java : 104] >>>>>>>>>>> xxl-job, job fail monitor thread stop
 2023-06-02 21:03:47,642 INFO [xxl-job, admin JobRegistryMonitorHelper] c.v.u.x.j.a.c.t.JobRegistryMonitorHelper [JobRegistryMonitorHelper.java : 92] >>>>>>>>>>> xxl-job, job registry monitor thread stop
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 15:12:07,363 INFO [SpringApplicationShutdownHook] c.a.c.n.r.NacosServiceRegistry [NacosServiceRegistry.java : 94] De-registering from Nacos Server now...
 2023-05-25 15:12:07,371 WARN [SpringApplicationShutdownHook] o.s.c.a.CommonAnnotationBeanPostProcessor [InitDestroyAnnotationBeanPostProcessor.java : 185] Destroy method on bean with name 'nacosAutoServiceRegistration' threw an exception: java.lang.IllegalStateException: UT015023: This Context has been already destroyed
 2023-05-25 15:12:08,002 INFO [xxl-job, admin JobScheduleHelper#scheduleThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 203] >>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread stop
 2023-05-25 15:12:09,000 INFO [xxl-job, admin JobScheduleHelper#ringThread] c.v.u.x.j.a.c.t.JobScheduleHelper [JobScheduleHelper.java : 264] >>>>>>>>>>> xxl-job, JobScheduleHelper#ringThread stop
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
diff --git a/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log b/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log
index e340147..24c0c05 100644
--- a/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log
+++ b/Source/data/applogs/xxl-job/xxl-job-executor-sample-springboot.log
@@ -1,4 +1,6 @@
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 20:59:58,404 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final
 2023-06-02 20:59:59,739 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
 2023-06-02 20:59:59,740 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
@@ -93,6 +95,10 @@
 2023-06-02 21:00:16,354 INFO [RMI TCP Connection(13)-192.168.3.7] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 547] Completed initialization in 3 ms
 2023-06-02 21:00:17,232 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:48:40,905 INFO [background-preinit] o.h.validator.internal.util.Version [Version.java : 21] HV000001: Hibernate Validator 6.2.3.Final
 2023-05-25 14:48:42,225 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.impl.NacosClientAuthServiceImpl success.
 2023-05-25 14:48:42,226 INFO [main] c.a.n.p.a.s.c.ClientAuthPluginManager [ClientAuthPluginManager.java : 56] [ClientAuthPluginManager] Load ClientAuthService com.alibaba.nacos.client.auth.ram.RamClientAuthServiceImpl success.
@@ -186,6 +192,12 @@
 2023-05-25 14:49:00,901 INFO [RMI TCP Connection(8)-192.168.1.46] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 525] Initializing Servlet 'dispatcherServlet'
 2023-05-25 14:49:00,906 INFO [RMI TCP Connection(8)-192.168.1.46] o.s.web.servlet.DispatcherServlet [FrameworkServlet.java : 547] Completed initialization in 5 ms
 2023-05-25 14:49:01,410 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.net.ConnectException: Connection refused: connect
 	at java.net.DualStackPlainSocketImpl.waitForConnect(Native Method)
@@ -211,8 +223,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:17,234 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:00:49,283 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:49:01,411 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:49:33,459 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:01,411 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:49:33,459 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:01,411 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:49:33,459 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -241,8 +263,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:00:49,283 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:01:21,322 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:49:33,459 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:50:05,495 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:49:33,459 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:50:05,495 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:49:33,459 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:50:05,495 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -271,8 +303,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:21,323 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:01:53,372 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:50:05,495 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:50:37,519 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:05,495 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:50:37,519 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:05,495 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:50:37,519 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -301,8 +343,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:01:53,372 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:02:25,393 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:50:37,520 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:51:09,568 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:50:37,520 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:51:09,568 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:50:37,520 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:51:09,568 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -331,8 +383,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:25,394 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:02:57,429 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:51:09,568 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:51:41,617 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:09,568 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:51:41,617 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:09,568 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:51:41,617 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -361,8 +423,18 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:02:57,430 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:03:29,473 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+=======
+2023-05-25 14:51:41,617 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:52:13,650 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
+=======
+2023-05-25 14:51:41,617 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
+2023-05-25 14:52:13,650 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
+>>>>>>> Stashed changes
 =======
 2023-05-25 14:51:41,617 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:52:13,650 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -391,6 +463,8 @@
 	at com.xxl.job.core.thread.ExecutorRegistryThread$1.run(ExecutorRegistryThread.java:48)
 	at java.lang.Thread.run(Thread.java:748)
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 2023-06-02 21:03:29,474 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-06-02 21:03:45,054 WARN [Thread-12] c.a.nacos.common.notify.NotifyCenter [NotifyCenter.java : 136] [NotifyCenter] Start destroying Publisher
 2023-06-02 21:03:45,055 WARN [Thread-5] c.a.n.c.http.HttpClientBeanHolder [HttpClientBeanHolder.java : 108] [HttpClientBeanHolder] Start destroying common HttpClient
@@ -400,6 +474,10 @@
 2023-06-02 21:03:45,109 INFO [SpringApplicationShutdownHook] io.undertow.servlet [ServletContextImpl.java : 382] Destroying Spring FrameworkServlet 'dispatcherServlet'
 2023-06-02 21:03:45,115 ERROR [SpringApplicationShutdownHook] c.a.cloud.nacos.discovery.NacosWatch [NacosWatch.java : 180] namingService unsubscribe failed, properties:NacosDiscoveryProperties{serverAddr='127.0.0.1:8848', username='', password='', endpoint='', namespace='', watchDelay=30000, logName='', service='ubcs-xxljob', weight=1.0, clusterName='DEFAULT', group='DEFAULT_GROUP', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD}, registerEnabled=true, ip='192.168.237.1', networkInterface='', port=36009, secure=false, accessKey='', secretKey='', heartBeatInterval=null, heartBeatTimeout=null, ipDeleteTimeout=null, instanceEnabled=true, ephemeral=true, failureToleranceEnabled=false}, ipDeleteTimeout=null, failFast=true}
 =======
+=======
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 2023-05-25 14:52:13,651 INFO [xxl-job, executor ExecutorRegistryThread] c.x.j.c.t.ExecutorRegistryThread [ExecutorRegistryThread.java : 54] >>>>>>>>>>> xxl-job registry fail, registryParam:RegistryParam{registryGroup='EXECUTOR', registryKey='blade-xxljob', registryValue='127.0.0.1:7018'}, registryResult:ReturnT [code=500, msg=xxl-rpc remoting error(Connection refused: connect), for url : http://127.0.0.1:37012/xxl-job-admin/api/registry, content=null]
 2023-05-25 14:52:45,678 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
 java.net.ConnectException: Connection refused: connect
@@ -1333,6 +1411,12 @@
 2023-05-25 15:12:07,228 INFO [SpringApplicationShutdownHook] io.undertow [Undertow.java : 259] stopping server: Undertow - 2.2.18.Final
 2023-05-25 15:12:07,263 INFO [SpringApplicationShutdownHook] io.undertow.servlet [ServletContextImpl.java : 382] Destroying Spring FrameworkServlet 'dispatcherServlet'
 2023-05-25 15:12:07,271 ERROR [SpringApplicationShutdownHook] c.a.cloud.nacos.discovery.NacosWatch [NacosWatch.java : 180] namingService unsubscribe failed, properties:NacosDiscoveryProperties{serverAddr='localhost:8848', username='', password='', endpoint='', namespace='', watchDelay=30000, logName='', service='ubcs-xxljob', weight=1.0, clusterName='DEFAULT', group='DEFAULT_GROUP', namingLoadCacheAtStart='false', metadata={preserved.register.source=SPRING_CLOUD}, registerEnabled=true, ip='192.168.237.1', networkInterface='', port=36009, secure=false, accessKey='', secretKey='', heartBeatInterval=null, heartBeatTimeout=null, ipDeleteTimeout=null, instanceEnabled=true, ephemeral=true, failureToleranceEnabled=false}, ipDeleteTimeout=null, failFast=true}
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
 java.lang.IllegalStateException: UT015023: This Context has been already destroyed
 	at io.undertow.servlet.spec.ServletContextImpl.getDeploymentInfo(ServletContextImpl.java:211)
@@ -1357,6 +1441,8 @@
 	at java.lang.Iterable.forEach(Iterable.java:75)
 	at org.springframework.boot.SpringApplicationShutdownHook.run(SpringApplicationShutdownHook.java:114)
 	at java.lang.Thread.run(Thread.java:748)
+<<<<<<< Updated upstream
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
 2023-06-02 21:03:45,118 INFO [Thread-47] com.xxl.rpc.remoting.net.Server [NettyHttpServer.java : 74] >>>>>>>>>>> xxl-rpc remoting server stop.
 2023-06-02 21:03:47,157 ERROR [xxl-job, executor ExecutorRegistryThread] c.x.job.core.util.XxlJobRemotingUtil [XxlJobRemotingUtil.java : 146] Connection refused: connect
@@ -1419,3 +1505,9 @@
 =======
 2023-05-25 15:12:07,276 INFO [Thread-58] com.xxl.rpc.remoting.net.Server [NettyHttpServer.java : 74] >>>>>>>>>>> xxl-rpc remoting server stop.
 >>>>>>> Stashed changes
+=======
+2023-05-25 15:12:07,276 INFO [Thread-58] com.xxl.rpc.remoting.net.Server [NettyHttpServer.java : 74] >>>>>>>>>>> xxl-rpc remoting server stop.
+>>>>>>> Stashed changes
+=======
+2023-05-25 15:12:07,276 INFO [Thread-58] com.xxl.rpc.remoting.net.Server [NettyHttpServer.java : 74] >>>>>>>>>>> xxl-rpc remoting server stop.
+>>>>>>> Stashed changes

--
Gitblit v1.9.3