merge

base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/controller/ViewController.java

@@ -23,10 +23,16 @@ public class ViewController {
      * 获取通用视图配置
      *
      * @param name
+     * @param refresh 是否强制刷新
      * @return
      */
     @GetMapping("/config")
-    public Result<Object> getViewConfig(@RequestParam String name) {
+    public Result<Object> getViewConfig(@RequestParam String name, Boolean refresh) {
+//        if (null != refresh && refresh) {
+//            viewService.cacheEvict(name);
+//        }
+        viewService.cacheEvict(name);// 暂时强制刷新
         return Result.success(viewService.getDeepConfig(name));
     }
+
 }

base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/controller/co/CoViewController.java

@@ -26,10 +26,18 @@ public class CoViewController {
      * 获取企业视图配置
      *
      * @param name
+     * @param refresh 是否强制刷新
      * @return
      */
     @GetMapping("/config")
-    public Result<Object> getViewConfig(@RequestParam String name) {
+    public Result<Object> getViewConfig(@RequestParam String name, Boolean refresh) {
+//        if (null != refresh && refresh) {
+//            coViewService.cacheEvict(name);
+//            viewService.cacheEvict(name);
+//        }
+        coViewService.cacheEvict(name);// 暂时强制刷新
+        viewService.cacheEvict(name);
+
         Object config = coViewService.getDeepConfig(name);
         if (null == config) {
             // 企业配置不存在则取标准配置

base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/service/ViewService.java

@@ -48,4 +48,8 @@ public class ViewService {
     public void deleteView(String name) {
         viewRepository.deleteByName(name);
     }
+
+    @CacheEvict(value = "viewConfig", key = "#name")
+    public void cacheEvict(String name) {
+    }
 }

base-servers/ui-server/src/main/java/com/usoftchina/saas/ui/service/co/CoViewService.java

@@ -52,4 +52,8 @@ public class CoViewService {
     public void deleteView(String name) {
         viewRepository.deleteByCompanyIdAndName(BaseContextHolder.getCompanyId(), name);
     }
+
+    @CacheEvict(value = "coViewConfig", key = "#name")
+    public void cacheEvict(String name) {
+    }
 }