From 4f617a1341874add13387da8bb22a19ec9827799 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Thu, 17 Sep 2020 14:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=BC=93=E5=AD=98=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../center/jaxrs/jest/ActionClearCache.java   | 24 +++++++++++++++++++
 .../program/center/jaxrs/jest/JestAction.java |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionClearCache.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionClearCache.java
index 4fd1203fb6..0ad1242ad5 100644
--- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionClearCache.java
+++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/ActionClearCache.java
@@ -9,6 +9,8 @@ import com.x.cms.core.entity.element.AppDict;
 import com.x.cms.core.entity.element.AppDictItem;
 import com.x.cms.core.entity.element.Form;
 import com.x.cms.core.entity.element.Script;
+import com.x.organization.core.entity.*;
+import com.x.organization.core.entity.accredit.Empower;
 import com.x.portal.core.entity.Page;
 import com.x.portal.core.entity.Portal;
 import com.x.portal.core.entity.Widget;
@@ -63,6 +65,16 @@ class ActionClearCache extends BaseAction {
 			CacheManager.notify(Agent.class);
 			//invoke
 			CacheManager.notify(Invoke.class);
+			//org
+			CacheManager.notify(Identity.class);
+			CacheManager.notify(Unit.class);
+			CacheManager.notify(UnitAttribute.class);
+			CacheManager.notify(UnitDuty.class);
+			CacheManager.notify(Role.class);
+			CacheManager.notify(Person.class);
+			CacheManager.notify(PersonAttribute.class);
+			CacheManager.notify(Group.class);
+			CacheManager.notify(Empower.class);
 			wo.setValue(true);
 		}else if("cms".equalsIgnoreCase(source)){
 			CacheManager.notify(CategoryInfo.class);
@@ -105,6 +117,18 @@ class ActionClearCache extends BaseAction {
 		}else if("invoke".equalsIgnoreCase(source)){
 			CacheManager.notify(Invoke.class);
 
+			wo.setValue(true);
+		}else if("org".equalsIgnoreCase(source)){
+			CacheManager.notify(Identity.class);
+			CacheManager.notify(Unit.class);
+			CacheManager.notify(UnitAttribute.class);
+			CacheManager.notify(UnitDuty.class);
+			CacheManager.notify(Role.class);
+			CacheManager.notify(Person.class);
+			CacheManager.notify(PersonAttribute.class);
+			CacheManager.notify(Group.class);
+			CacheManager.notify(Empower.class);
+
 			wo.setValue(true);
 		}
 		result.setData(wo);
diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/JestAction.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/JestAction.java
index 7cdb0ca4cd..265d0d774f 100644
--- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/JestAction.java
+++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/jest/JestAction.java
@@ -53,7 +53,7 @@ public class JestAction extends StandardJaxrsAction {
 	@Consumes(MediaType.APPLICATION_JSON)
 	@JaxrsMethodDescribe(value = "清除服务器缓存", action = ActionClearCache.class)
 	public void clearCache(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-						   @JaxrsParameterDescribe("*标识：all(所有)|cms|portal|process|query|agent|invoke") @PathParam("source") String source) {
+						   @JaxrsParameterDescribe("*标识：all(所有)|org|cms|portal|process|query|agent|invoke") @PathParam("source") String source) {
 		ActionResult<ActionClearCache.Wo> result = new ActionResult<>();
 		EffectivePerson effectivePerson = this.effectivePerson(request);
 		try {
-- 
GitLab