diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java index 465386e5773f0d40c51e1fb93bd17cbb3a4bf8ae..f7f16baf8db27b193600918618ec9c68ed669aa7 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionInstallOrUpdate.java @@ -10,21 +10,20 @@ import com.x.base.core.project.annotation.FieldDescribe; import com.x.base.core.project.bean.NameValuePair; import com.x.base.core.project.config.Collect; import com.x.base.core.project.config.Config; +import com.x.base.core.project.config.Nodes; import com.x.base.core.project.connection.CipherConnectionAction; import com.x.base.core.project.connection.ConnectionAction; import com.x.base.core.project.exception.ExceptionAccessDenied; import com.x.base.core.project.exception.ExceptionEntityNotExist; import com.x.base.core.project.gson.GsonPropertyObject; +import com.x.base.core.project.gson.XGsonBuilder; import com.x.base.core.project.http.ActionResult; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.WoId; import com.x.base.core.project.jaxrs.WrapBoolean; import com.x.base.core.project.logger.Logger; import com.x.base.core.project.logger.LoggerFactory; -import com.x.base.core.project.tools.DefaultCharset; -import com.x.base.core.project.tools.FileTools; -import com.x.base.core.project.tools.JarTools; -import com.x.base.core.project.tools.ListTools; +import com.x.base.core.project.tools.*; import com.x.cms.core.entity.element.wrap.WrapCms; import com.x.portal.core.entity.wrap.WrapPortal; import com.x.processplatform.core.entity.element.wrap.WrapProcessPlatform; @@ -41,11 +40,12 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import java.io.ByteArrayInputStream; +import java.io.DataInputStream; +import java.io.DataOutputStream; import java.io.File; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.net.Socket; +import java.util.*; class ActionInstallOrUpdate extends BaseAction { @@ -71,8 +71,8 @@ class ActionInstallOrUpdate extends BaseAction { byte[] bytes = ConnectionAction.getFile(Config.collect().url(Collect.ADDRESS_COLLECT_APPLICATION_DOWN + "/" + id), ListTools.toList(new NameValuePair(Collect.COLLECT_TOKEN, token))); if(bytes!=null){ - WrapModule module = this.install(id, bytes); - if(module!=null) { + InstallData installData = this.install(id, bytes); + if(installData!=null) { wo.setValue(true); emc.beginTransaction(InstallLog.class); InstallLog installLog = emc.find(id, InstallLog.class); @@ -86,7 +86,7 @@ class ActionInstallOrUpdate extends BaseAction { installLog.setVersion(app.getVersion()); installLog.setCategory(app.getCategory()); installLog.setStatus(CommonStatus.VALID.getValue()); - installLog.setData(gson.toJson(module)); + installLog.setData(gson.toJson(installData)); installLog.setInstallPerson(effectivePerson.getDistinguishedName()); installLog.setInstallTime(new Date()); installLog.setUnInstallPerson(null); @@ -105,8 +105,8 @@ class ActionInstallOrUpdate extends BaseAction { } } - private WrapModule install(String id, byte[] bytes) throws Exception{ - WrapModule module = null; + private InstallData install(String id, byte[] bytes) throws Exception{ + InstallData installData = new InstallData(); File tempFile = new File(Config.base(), "local/temp/install"); FileTools.forceMkdir(tempFile); FileUtils.cleanDirectory(tempFile); @@ -123,21 +123,30 @@ class ActionInstallOrUpdate extends BaseAction { String json = FileUtils.readFileToString(file, DefaultCharset.charset); Gson gson = new Gson(); JsonElement jsonElement = gson.fromJson(json, JsonElement.class); - module = this.convertToWrapIn(jsonElement, WrapModule.class); + WrapModule module = this.convertToWrapIn(jsonElement, WrapModule.class); this.installModule(module); + installData.setWrapModule(module); + } if(file.getName().toLowerCase().endsWith(".zip")){ logger.print("开始安装静态资源"); try { Business.dispatch(false, file.getName(), "", FileUtils.readFileToByteArray(file)); + installData.setStaticResource(file.getName()); } catch (Exception e) { logger.print("模块安装成功但静态资源安装失败:{}",e.getMessage()); } } + if(file.getName().toLowerCase().endsWith(".war")){ + logger.print("开始安装自定义应用：{}", file.getName()); + this.installCustomApp(file.getName(), FileUtils.readFileToByteArray(file)); + installData.setCustomApp(file.getName()); + logger.print("完成自定义应用安装：{}", file.getName()); + } } } FileUtils.cleanDirectory(tempFile); - return module; + return installData; } private InstallWo installModule(WrapModule module) throws Exception{ @@ -225,6 +234,40 @@ class ActionInstallOrUpdate extends BaseAction { return wo; } + private void installCustomApp(String fileName, byte[] bytes) throws Exception{ + Nodes nodes = Config.nodes(); + for (String node : nodes.keySet()){ + if(nodes.get(node).getApplication().getEnable()) { + logger.print("socket deploy custom app{} to {}:{}",fileName, node, nodes.get(node).nodeAgentPort()); + try (Socket socket = new Socket(node, nodes.get(node).nodeAgentPort())) { + socket.setKeepAlive(true); + socket.setSoTimeout(10000); + try (DataOutputStream dos = new DataOutputStream(socket.getOutputStream()); + DataInputStream dis = new DataInputStream(socket.getInputStream())) { + Map commandObject = new HashMap<>(); + commandObject.put("command", "redeploy:customWar"); + commandObject.put("credential", Crypto.rsaEncrypt("o2@", Config.publicKey())); + + dos.writeUTF(XGsonBuilder.toJson(commandObject)); + dos.flush(); + dos.writeUTF(fileName); + dos.flush(); + + try (ByteArrayInputStream bis = new ByteArrayInputStream(bytes)) { + byte[] onceBytes = new byte[1024]; + int length = 0; + while ((length = bis.read(onceBytes, 0, onceBytes.length)) != -1) { + dos.write(onceBytes, 0, length); + dos.flush(); + } + } + } + + } + } + } + } + public static class Wo extends WrapBoolean { } diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListPaging.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListPaging.java index 57ee23398af8a359174089897deafc5f45eaf6f1..aaeb10290da4699cd2818a77f6486cbde22e4f81 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListPaging.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionListPaging.java @@ -46,7 +46,7 @@ class ActionListPaging extends BaseAction { } List wos = new ArrayList<>(); if(BooleanUtils.isTrue(wi.getAsc())){ - emc.fetchAscPaging(Application.class, Wo.copier, p, page, size, orderBy); + wos = emc.fetchAscPaging(Application.class, Wo.copier, p, page, size, orderBy); }else { wos = emc.fetchDescPaging(Application.class, Wo.copier, p, page, size, orderBy); } diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionUninstall.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionUninstall.java index effb106b903a36e8763337d421f085ad90e9e885..05bbdf76429aa29cb2cf28855d956b480bb291bc 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionUninstall.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/ActionUninstall.java @@ -47,13 +47,17 @@ class ActionUninstall extends BaseAction { } logger.print("{}发起卸载应用：{}", effectivePerson.getDistinguishedName(), app.getName()); Wo wo = new Wo(); - WrapModule module = gson.fromJson(installLog.getData(), WrapModule.class); - this.uninstall(module); - emc.beginTransaction(InstallLog.class); - installLog.setStatus(CommonStatus.INVALID.getValue()); - installLog.setUnInstallPerson(effectivePerson.getDistinguishedName()); - installLog.setUnInstallTime(new Date()); - emc.commit(); + InstallData installData = gson.fromJson(installLog.getData(), InstallData.class); + WrapModule module = installData.getWrapModule(); + if(module!=null) { + this.uninstall(module); + + emc.beginTransaction(InstallLog.class); + installLog.setStatus(CommonStatus.INVALID.getValue()); + installLog.setUnInstallPerson(effectivePerson.getDistinguishedName()); + installLog.setUnInstallTime(new Date()); + emc.commit(); + } wo.setValue(true); result.setData(wo); return result; diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/BaseAction.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/BaseAction.java index 0eab54e40de28e1f2372830246742113b9b407f4..1200e879c477d95c6534548b0a07501bfa692ee1 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/BaseAction.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/market/BaseAction.java @@ -1,7 +1,9 @@ package com.x.program.center.jaxrs.market; +import com.x.base.core.project.gson.GsonPropertyObject; import com.x.base.core.project.http.EffectivePerson; import com.x.base.core.project.jaxrs.StandardJaxrsAction; +import com.x.program.center.WrapModule; abstract class BaseAction extends StandardJaxrsAction { @@ -15,4 +17,36 @@ abstract class BaseAction extends StandardJaxrsAction { return false; } + public static class InstallData extends GsonPropertyObject { + private WrapModule WrapModule; + + private String staticResource; + + private String customApp; + + public com.x.program.center.WrapModule getWrapModule() { + return WrapModule; + } + + public void setWrapModule(com.x.program.center.WrapModule wrapModule) { + WrapModule = wrapModule; + } + + public String getStaticResource() { + return staticResource; + } + + public void setStaticResource(String staticResource) { + this.staticResource = staticResource; + } + + public String getCustomApp() { + return customApp; + } + + public void setCustomApp(String customApp) { + this.customApp = customApp; + } + } + }