Merge branch 'fix/统一缓存清除' into 'develop'

【平台】统一缓存清除

See merge request o2oa/o2oa!1645

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);

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 {