diff --git "a/dl-biz/src/main/resources/biz/sql/0.0.2\345\215\207\347\272\247\345\210\2601.0.0_\345\242\236\350\241\245.sql" "b/dl-biz/src/main/resources/biz/sql/0.0.2\345\215\207\347\272\247\345\210\2601.0.0_\345\242\236\350\241\245.sql"
index 0c2dd28..6c8d94d 100644
--- "a/dl-biz/src/main/resources/biz/sql/0.0.2\345\215\207\347\272\247\345\210\2601.0.0_\345\242\236\350\241\245.sql"
+++ "b/dl-biz/src/main/resources/biz/sql/0.0.2\345\215\207\347\272\247\345\210\2601.0.0_\345\242\236\350\241\245.sql"
@@ -125,6 +125,7 @@ ALTER TABLE `t_dl_media_mapping` ADD COLUMN `es_routing` VARCHAR(100) DEFAULT NU
COMMENT 'esRouting字段';
ALTER TABLE `t_dl_media_mapping` ADD COLUMN `es_routing_ignore` VARCHAR(5) DEFAULT NULL
COMMENT '如果routing字段值不存在,写入的数据是否可忽略写入,true:可以忽略,false:不可以忽略';
+ALTER TABLE `t_dl_sys_properties` MODIFY `properties_key` VARCHAR(30);
INSERT INTO t_dl_menu (CODE, NAME, parent_code, type, url, icon, create_time, modify_time) VALUES
diff --git a/dl-biz/src/main/resources/biz/sql/ucar_datalink.sql b/dl-biz/src/main/resources/biz/sql/ucar_datalink.sql
index 077d548..35bc200 100644
--- a/dl-biz/src/main/resources/biz/sql/ucar_datalink.sql
+++ b/dl-biz/src/main/resources/biz/sql/ucar_datalink.sql
@@ -332,7 +332,7 @@ DROP TABLE IF EXISTS `t_dl_sys_properties`;
CREATE TABLE `t_dl_sys_properties` (
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT
COMMENT '主键',
- `properties_key` VARCHAR(20) NOT NULL
+ `properties_key` VARCHAR(30) NOT NULL
COMMENT '参数key',
`properties_value` VARCHAR(50) NOT NULL
COMMENT '参数值',
diff --git a/dl-biz/src/main/resources/biz/sqlmap/mapper-task.xml b/dl-biz/src/main/resources/biz/sqlmap/mapper-task.xml
index 268ce19..5c20162 100644
--- a/dl-biz/src/main/resources/biz/sqlmap/mapper-task.xml
+++ b/dl-biz/src/main/resources/biz/sqlmap/mapper-task.xml
@@ -123,8 +123,7 @@
SELECT
from t_dl_task t
- LEFT JOIN t_dl_media_source m ON t.READER_MEDIA_SOURCE_ID = m.id
- where is_delete='false'
+ where t.is_delete='false'
and t.GROUP_ID = #{groupId}
diff --git a/dl-manager/dl-manager-core/src/main/java/com/ucar/datalink/manager/core/boot/ManagerBootStrap.java b/dl-manager/dl-manager-core/src/main/java/com/ucar/datalink/manager/core/boot/ManagerBootStrap.java
index f518a1a..ed6dd4d 100644
--- a/dl-manager/dl-manager-core/src/main/java/com/ucar/datalink/manager/core/boot/ManagerBootStrap.java
+++ b/dl-manager/dl-manager-core/src/main/java/com/ucar/datalink/manager/core/boot/ManagerBootStrap.java
@@ -1,5 +1,6 @@
package com.ucar.datalink.manager.core.boot;
+import com.alibaba.fastjson.parser.ParserConfig;
import com.ucar.datalink.manager.core.server.ServerContainer;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -18,6 +19,10 @@ public class ManagerBootStrap {
private static final Logger logger = LoggerFactory.getLogger(ManagerBootStrap.class);
private static final String CLASSPATH_URL_PREFIX = "classpath:";
+ static{
+ ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
+ }
+
public static void main(String args[]) {
ManagerBootStrap bootStrap = new ManagerBootStrap();
bootStrap.boot(args);
diff --git a/dl-worker/dl-worker-core/src/main/java/com/ucar/datalink/worker/core/boot/WorkerBootStrap.java b/dl-worker/dl-worker-core/src/main/java/com/ucar/datalink/worker/core/boot/WorkerBootStrap.java
index 3707e32..b312d3f 100644
--- a/dl-worker/dl-worker-core/src/main/java/com/ucar/datalink/worker/core/boot/WorkerBootStrap.java
+++ b/dl-worker/dl-worker-core/src/main/java/com/ucar/datalink/worker/core/boot/WorkerBootStrap.java
@@ -1,5 +1,6 @@
package com.ucar.datalink.worker.core.boot;
+import com.alibaba.fastjson.parser.ParserConfig;
import com.ucar.datalink.biz.service.*;
import com.ucar.datalink.common.utils.IPUtils;
import com.ucar.datalink.domain.worker.WorkerInfo;
@@ -36,6 +37,10 @@ public class WorkerBootStrap {
private static final String CLASSPATH_URL_PREFIX = "classpath:";
+ static{
+ ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
+ }
+
public void boot(String[] args) {
try {
//boot spring