From 837c4b7e651534dec456e5b275dbcd63d9607364 Mon Sep 17 00:00:00 2001 From: zhourui Date: Mon, 9 Nov 2020 14:19:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0web.json=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/build/CreateConfigSample.java | 3 +- .../x/base/core/project/config/Config.java | 8 ++-- .../com/x/base/core/project/config/Web.java | 43 ------------------- .../console/server/web/WebServerTools.java | 6 ++- 4 files changed, 9 insertions(+), 51 deletions(-) delete mode 100644 o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java index 6e299825c4..714f80d7ad 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/build/CreateConfigSample.java @@ -40,7 +40,6 @@ import com.x.base.core.project.config.Qiyeweixin; import com.x.base.core.project.config.Query; import com.x.base.core.project.config.Token; import com.x.base.core.project.config.Vfs; -import com.x.base.core.project.config.Web; import com.x.base.core.project.config.WorkTime; import com.x.base.core.project.config.ZhengwuDingding; import com.x.base.core.project.gson.XGsonBuilder; @@ -81,7 +80,7 @@ public class CreateConfigSample { classes.add(WorkTime.class); classes.add(ZhengwuDingding.class); classes.add(Cache.class); - classes.add(Web.class); + //classes.add(Web.class); Collections.sort(classes, new Comparator>() { public int compare(Class c1, Class c2) { diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java index 4fd66e7540..2825f64748 100644 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java +++ b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Config.java @@ -1166,13 +1166,13 @@ public class Config { return instance().components; } - public Web web; + public JsonObject web; - public static synchronized Web web() throws Exception { + public static synchronized JsonObject web() throws Exception { if (null == instance().web) { - Web obj = BaseTools.readConfigObject(PATH_CONFIG_WEB, Web.class); + JsonObject obj = BaseTools.readConfigObject(PATH_CONFIG_WEB, JsonObject.class); if (null == obj) { - obj = Web.defaultInstance(); + obj = new JsonObject(); } instance().web = obj; } diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java deleted file mode 100644 index 61dfe2d368..0000000000 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Web.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.x.base.core.project.config; - -import java.util.TreeMap; - -import com.x.base.core.project.annotation.FieldDescribe; - -public class Web extends ConfigObject { - - private static final long serialVersionUID = -1549522764856326338L; - - public static Web defaultInstance() { - return new Web(); - } - - public Web() { - - } - - @FieldDescribe("使用Post模拟Put,Get模拟Delete的模块.") - private Mock mock = new Mock(); - - public static class Mock extends TreeMap { - - } - - public Mock getMock() { - return mock; - } - - public void setMock(Mock mock) { - this.mock = mock; - } - - public static class MockItem { - private MockItemObject put; - private MockItemObject delete; - } - - public static class MockItemObject { - private String to; - private String append; - } -} diff --git a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java index 8965ccb264..4fb472631a 100644 --- a/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java +++ b/o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java @@ -4,7 +4,6 @@ import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; @@ -33,6 +32,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import com.alibaba.druid.support.http.StatViewServlet; import com.alibaba.druid.support.http.WebStatFilter; import com.google.gson.Gson; +import com.google.gson.JsonElement; import com.x.base.core.project.x_program_center; import com.x.base.core.project.config.Config; import com.x.base.core.project.config.WebServer; @@ -252,7 +252,9 @@ public class WebServerTools extends JettySeverTools { publicKey = new String(Base64.encodeBase64(publicKeyB)); map.put("publicKey", publicKey); } - map.put("mock", Config.web().getMock()); + for (Entry en : Config.web().entrySet()) { + map.put(en.getKey(), en.getValue()); + } FileUtils.writeStringToFile(file, gson.toJson(map), DefaultCharset.charset); } } -- GitLab