diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java
index da2b280c..ce18eaed 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/dao/CoreDictDao.java
@@ -27,7 +27,7 @@ public interface CoreDictDao extends BaseMapper<CoreDict> {
     List<CoreDict> findAllList(String type);
 
     //根据表名、字段名查询 主键名和注释 和 字段名和注释
-//    @Cacheable(value = "core.coreDict:findPkAndValue", key = "#tableName+#columnName")
+    @Cacheable(value = "core.coreDict.findPkAndValue", key = "#tableName+#columnName")
     List<Map<String,Object>> findPkAndValue (String tableName, String columnNames);
 
     //根据表名、字段名查询 注释
diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java
index 631c2837..febd6ae5 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreDictService.java
@@ -52,7 +52,7 @@ public class CoreDictService extends CoreBaseService<CoreDict> {
      * 根据表和行名获取字典集合 表名.存中文的那一行.参数 参数按照 参数名 条件,参数名 条件...的格式 采用英文逗号
      * @return List
      */
-    //@Cacheable(value = CorePlatformService.DICT_CACHE_TYPE)
+    @Cacheable(value = CorePlatformService.DICT_CACHE_TYPE, key="#type")
     public List<CoreDict> findAllByTable(String type) {
         String str[] = type.split("\\.");
         String tableName = null,filedName = null,params = null;
@@ -97,6 +97,7 @@ public class CoreDictService extends CoreBaseService<CoreDict> {
         }
     }
 
+    @Cacheable(value = "core.coreDict:.findCoreDictByTable", key="#type+\"_\"+#value")
     public CoreDict findCoreDictByTable(String type,String value) {
         List<CoreDict> list = findAllByTable(type);
         if(list==null) {
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
index b1f78333..7c17cdc5 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java
@@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
 import lombok.EqualsAndHashCode;
-import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.AutoID;
 import org.beetl.sql.annotation.entity.InsertIgnore;
 import org.beetl.sql.annotation.entity.UpdateIgnore;
 import org.beetl.sql.fetch.annotation.Fetch;
@@ -23,8 +23,8 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity {
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
-    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo")
-
+//    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo")
+    @AutoID
     private Long teacherOpenCourseMergeCourseInfoId ;
 	
     //开课ID
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoTree.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoTree.java
index a4ceb0b6..4ff1a7a9 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoTree.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfoTree.java
@@ -1,5 +1,6 @@
 package com.ibeetl.jlw.entity;
 
+import com.ibeetl.admin.core.annotation.Dict;
 import lombok.Data;
 import org.beetl.sql.annotation.entity.AutoID;
 import org.beetl.sql.annotation.entity.InsertIgnore;
@@ -45,6 +46,7 @@ public class TeacherOpenCourseMergeCourseInfoTree {
     private String courseInfoThumbnail ;
 
     //课程标签ID
+    @Dict
     private Long courseLabelId ;
 
     @UpdateIgnore
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
index 3babb5bf..4a388722 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java
@@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
-import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.AutoID;
 
 import javax.validation.constraints.NotNull;
 
@@ -16,8 +16,8 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
-    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
-
+//    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo")
+    @AutoID
     private Long teacherOpenCourseMergeResourcesInfoId ;
 	
     //开课课程ID
diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
index ab9c6309..e09c9208 100644
--- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
+++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java
@@ -3,7 +3,7 @@ package com.ibeetl.jlw.entity;
 import com.ibeetl.admin.core.annotation.Dict;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.util.ValidateConfig;
-import org.beetl.sql.annotation.entity.AssignID;
+import org.beetl.sql.annotation.entity.AutoID;
 
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -17,8 +17,8 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity{
     //ID
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
-    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
-
+//    @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesQuestion")
+    @AutoID
     private Long teacherOpenCourseMergeResourcesQuestionId ;
 	
     //开课ID
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index d5d760ba..550b3a40 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -34,7 +34,6 @@ import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -116,17 +115,16 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
      *
      * @param key
      */
-    @Async
     @SneakyThrows
-     public void refreshCourseInfoTreeLocalCache(Long key) {
+     public void invalidateCourseInfoTreeLocalCache(Long key) {
         treeLocalCache.refresh(key);
     }
     /**
      * 清理刷新缓存
      */
     @SneakyThrows
-     public void cleanUpCourseInfoTreeLocalCache() {
-        treeLocalCache.cleanUp();
+     public void invalidateAllCleanUpCourseInfoTreeLocalCache() {
+        treeLocalCache.invalidateAll();
     }
 
     public void deleteByList(List list){
@@ -138,18 +136,14 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         if(StringUtils.isNotBlank(ids)){
             teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids);
 
-            for (String id : ids.split(",")) {
-                teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(Long.valueOf(id));
-            }
+            teacherOpenCourseMergeCourseInfoService.invalidateAllCleanUpCourseInfoTreeLocalCache();
         }
     }
 
     public void deleteTeacherOpenCourseMergeCourseInfo(@NotBlank(message = "ID不能为空！") String ids){
         try {
             teacherOpenCourseMergeCourseInfoDao.deleteTeacherOpenCourseMergeCourseInfoByIds(ids);
-            for (String id : ids.split(",")) {
-                teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(Long.valueOf(id));
-            }
+            teacherOpenCourseMergeCourseInfoService.invalidateAllCleanUpCourseInfoTreeLocalCache();
         } catch (Exception e) {
             throw new PlatformException("批量删除开课课程拉取失败", e);
         }
@@ -176,7 +170,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
 
             // 循环刷新缓存
             for (TeacherOpenCourseMergeCourseInfo openCourseMergeCourseInfo : teacherOpenCourseMergeCourseInfoList) {
-                teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(openCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());
+                teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(openCourseMergeCourseInfo.getTeacherOpenCourseId());
             }
         }
         return msg;
@@ -185,9 +179,10 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
     public JsonResult add(TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery){
         String msg = "";
         TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo();
+        teacherOpenCourseMergeCourseInfo.setCourseInfoStatus(1);
         teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo);
 
-        teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());
+        teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());
         teacherOpenCourseMergeCourseInfoQuery.setTeacherOpenCourseMergeCourseInfoId(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());//自增的ID丢进去
@@ -200,7 +195,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         String msg = "";
         TeacherOpenCourseMergeCourseInfo teacherOpenCourseMergeCourseInfo = teacherOpenCourseMergeCourseInfoQuery.pojo();
         teacherOpenCourseMergeCourseInfoDao.updateTemplateById(teacherOpenCourseMergeCourseInfo);
-        teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseMergeCourseInfoId());
+        teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());
 
         return msg;
     }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
index fcea2710..768ed673 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
@@ -118,7 +118,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
         jsonResult.setMsg(msg);
 
         // 刷新缓存
-        teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
+        teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
         return jsonResult;
     }
 
@@ -128,7 +128,7 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
         teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(teacherOpenCourseMergeResourcesInfo);
 
         // 刷新缓存
-        teacherOpenCourseMergeCourseInfoService.refreshCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
+        teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeCourseInfoId());
         return msg;
     }