From 40866b3e12eb4fe0db3787606853e73cb3441feb Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Thu, 17 Sep 2020 14:04:33 +0800 Subject: [PATCH] =?UTF-8?q?collect=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9B=B4=E6=96=B0=E5=BD=93=E5=89=8D=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../center/jaxrs/collect/ActionRegist.java | 2 +- .../jaxrs/collect/ActionResetPassword.java | 5 ++++- .../center/jaxrs/collect/ActionUpdate.java | 2 +- .../center/jaxrs/collect/ActionUpdateUnit.java | 2 +- .../program/center/jaxrs/collect/BaseAction.java | 16 ++++++++++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionRegist.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionRegist.java index 243b2a7e91..89cf333a07 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionRegist.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionRegist.java @@ -50,7 +50,7 @@ class ActionRegist extends BaseAction { Config.collect().setName(name); Config.collect().setPassword(password); Config.collect().save(); - Config.flush(); + this.configFlush(effectivePerson); /* 人员和应用市场同步 */ ThisApplication.context().scheduleLocal(CollectPerson.class); ThisApplication.context().scheduleLocal(CollectMarket.class); diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionResetPassword.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionResetPassword.java index 6101559aca..ba50a1d768 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionResetPassword.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionResetPassword.java @@ -1,5 +1,8 @@ package com.x.program.center.jaxrs.collect; +import com.x.program.center.ThisApplication; +import com.x.program.center.schedule.CollectMarket; +import com.x.program.center.schedule.CollectPerson; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -42,7 +45,7 @@ class ActionResetPassword extends BaseAction { if (BooleanUtils.isTrue(wo.getValue())) { Config.collect().setPassword(password); Config.collect().save(); - Config.flush(); + this.configFlush(effectivePerson); } result.setData(wo); return result; diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdate.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdate.java index 4904434871..5e5a6179a3 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdate.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdate.java @@ -32,7 +32,7 @@ class ActionUpdate extends BaseAction { Config.collect().setName(wrapIn.getName()); Config.collect().setPassword(wrapIn.getPassword()); Config.collect().save(); - Config.flush(); + this.configFlush(effectivePerson); Wo wo = new Wo(); wo.setValue(true); result.setData(wo); diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdateUnit.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdateUnit.java index 03e106ce77..f6476cf753 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdateUnit.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionUpdateUnit.java @@ -48,7 +48,7 @@ class ActionUpdateUnit extends BaseAction { Config.collect().setKey(wi.getKey()); Config.collect().setSecret(wi.getSecret()); Config.collect().save(); - Config.flush(); + this.configFlush(effectivePerson); } result.setData(wo); return result; diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/BaseAction.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/BaseAction.java index de1efc0a30..b0a774c745 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/BaseAction.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/BaseAction.java @@ -11,12 +11,15 @@ import com.x.base.core.project.bean.WrapCopierFactory; import com.x.base.core.project.config.Collect; import com.x.base.core.project.config.Config; import com.x.base.core.project.connection.ActionResponse; +import com.x.base.core.project.connection.CipherConnectionAction; import com.x.base.core.project.connection.ConnectionAction; import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult.Type; +import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.StandardJaxrsAction; import com.x.base.core.project.jaxrs.WrapBoolean; import com.x.base.core.project.tools.DefaultCharset; +import com.x.program.center.ThisApplication; class BaseAction extends StandardJaxrsAction { @@ -124,6 +127,19 @@ class BaseAction extends StandardJaxrsAction { return resp.getData(ReturnWoBoolean.class).getValue(); } + public void configFlush(EffectivePerson effectivePerson) throws Exception { + Config.flush(); + ThisApplication.context().applications().values().forEach(o -> { + o.stream().forEach(app -> { + try { + CipherConnectionAction.get(effectivePerson.getDebugger(), app, "cache", "config", "flush"); + } catch (Exception e) { + e.printStackTrace(); + } + }); + }); + } + private static class ReturnWoBoolean extends WrapBoolean { } -- GitLab