diff --git a/o2server/configSample/mq.json b/o2server/configSample/mq.json index 9e6803243d21fcfe7c9c67f7c4260937b01c5187..89694d2007ce84a4166c40d02ed72a4e2cf37ffe 100755 --- a/o2server/configSample/mq.json +++ b/o2server/configSample/mq.json @@ -1,5 +1,5 @@ { - "enable": true, + "enable": false, "mq":"kafka", "kafka":{ "bootstrap_servers": "localhost:9092", @@ -28,4 +28,4 @@ }, "###enable": "是否启用.###", "###mq": "消息服务类型.###" -} \ No newline at end of file +} 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 da33a1f2b38c00c4e337749b0556422861f85a85..28aeef2b4657579dbdab2685d131d1921242bc63 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 @@ -33,7 +33,6 @@ public class CreateConfigSample { List> classes = new ArrayList>(); classes.add(AppStyle.class); classes.add(CenterServer.class); - classes.add(ClientInit.class); classes.add(Collect.class); classes.add(Communicate.class); classes.add(Components.class); diff --git a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ClientInit.java b/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ClientInit.java deleted file mode 100644 index 680448348c60a09ecaeed91141ee851a0234a528..0000000000000000000000000000000000000000 --- a/o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/ClientInit.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.x.base.core.project.config; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.BooleanUtils; - -import com.x.base.core.project.annotation.FieldDescribe; - -public class ClientInit extends ConfigObject { - - @FieldDescribe("是否启用.") - private Boolean enable; - - @FieldDescribe("center节点信息.") - private List center; - - @FieldDescribe("网页底部说明.") - private String footer = ""; - - @FieldDescribe("网页头部说明.") - private String title = ""; - - @FieldDescribe("APP使用协议,auto,http,https.") - private String app_protocol = "auto"; - - @FieldDescribe("登录页面配置.") - private LoginPage loginPage; - - @FieldDescribe("是否启用webSocket") - private Boolean webSocketEnable; - - public ClientInit() { - this.enable = DEFAULT_ENABLE; - this.center = new ArrayList<>(); - this.loginPage = new LoginPage(); - } - - public static ClientInit defaultInstance() { - return new ClientInit(); - } - - public static final Boolean DEFAULT_ENABLE = false; - - public static class LoginPage extends ConfigObject { - - public static LoginPage defaultInstance() { - return new LoginPage(); - } - - @FieldDescribe("是否启用定制的登录页面.") - private Boolean enable; - @FieldDescribe("登录的门户.") - private String portal; - @FieldDescribe("登录页面.") - private String page; - - public Boolean getEnable() { - return enable; - } - - public void setEnable(Boolean enable) { - this.enable = enable; - } - - public String getPortal() { - return portal; - } - - public void setPortal(String portal) { - this.portal = portal; - } - - public String getPage() { - return page; - } - - public void setPage(String page) { - this.page = page; - } - } - - public static class CenterAddress extends ConfigObject { - - - public static CenterAddress defaultInstance() { - return new CenterAddress(); - } - - private String port; - - private String host; - - public String getPort() { - return port; - } - - public void setPort(String port) { - this.port = port; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - } - - public Boolean getEnable() { - return BooleanUtils.isTrue(this.enable); - } - - public void setEnable(Boolean enable) { - this.enable = enable; - } - - public List getCenter() { - return center; - } - - public void setCenter(List center) { - this.center = center; - } - - public String getFooter() { - return footer; - } - - public void setFooter(String footer) { - this.footer = footer; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getApp_protocol() { - return app_protocol; - } - - public void setApp_protocol(String app_protocol) { - this.app_protocol = app_protocol; - } - - public LoginPage getLoginPage() { - return loginPage; - } - - public void setLoginPage(LoginPage loginPage) { - this.loginPage = loginPage; - } - - public Boolean getWebSocketEnable() { - return webSocketEnable; - } - - public void setWebSocketEnable(Boolean webSocketEnable) { - this.webSocketEnable = webSocketEnable; - } - -} \ No newline at end of file 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 aa272b2f5e9c5bc81d28232ae09fd15cf09b74f2..7778759ee06a03531f52cd4446173141646892de 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 @@ -1050,19 +1050,6 @@ public class Config { return instance().logLevel; } - private ClientInit clientInit; - - public static synchronized ClientInit clientInit() throws Exception { - if (null == instance().clientInit) { - ClientInit obj = BaseTools.readConfigObject(PATH_CONFIG_CLIENTINIT, ClientInit.class); - if (null == obj) { - obj = ClientInit.defaultInstance(); - } - instance().clientInit = obj; - } - return instance().clientInit; - } - private byte[] bindLogo; public static synchronized byte[] bindLogo() throws Exception { 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 4fb472631ac07d4372069fde3dc87a249516f1bb..9fb440a2e923a15f851e87fb5e7d8db28726b610 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 @@ -178,85 +178,82 @@ public class WebServerTools extends JettySeverTools { File file = new File(dir, "config.json"); Gson gson = XGsonBuilder.instance(); - if (Config.clientInit().getEnable()) { - FileUtils.write(file, gson.toJson(Config.clientInit()), DefaultCharset.charset); - } else { - LinkedHashMap map = new LinkedHashMap<>(); - /** 覆盖掉配置的参数 */ - com.x.base.core.project.config.CenterServer centerServerConfig = Config.nodes().centerServers().first() - .getValue(); - map.putAll(centerServerConfig.getConfig()); - List> centers = new ArrayList<>(); - map.put("center", centers); - /** 写入center地址 */ - Map center = new HashMap(); + + LinkedHashMap map = new LinkedHashMap<>(); + /** 覆盖掉配置的参数 */ + com.x.base.core.project.config.CenterServer centerServerConfig = Config.nodes().centerServers().first() + .getValue(); + map.putAll(centerServerConfig.getConfig()); + List> centers = new ArrayList<>(); + map.put("center", centers); + /** 写入center地址 */ + Map center = new HashMap(); + center = new HashMap(); + center.put("host", ""); + center.put("port", centerServerConfig.getPort().toString()); + centers.add(center); + if (!Objects.equals(centerServerConfig.getProxyPort(), centerServerConfig.getPort())) { center = new HashMap(); center.put("host", ""); + center.put("port", centerServerConfig.getProxyPort().toString()); + centers.add(center); + } + String host = Config.nodes().primaryCenterNode(); + if (!Host.isRollback(host)) { + center = new HashMap(); + center.put("host", host); center.put("port", centerServerConfig.getPort().toString()); centers.add(center); - if (!Objects.equals(centerServerConfig.getProxyPort(), centerServerConfig.getPort())) { - center = new HashMap(); - center.put("host", ""); - center.put("port", centerServerConfig.getProxyPort().toString()); - centers.add(center); - } - String host = Config.nodes().primaryCenterNode(); - if (!Host.isRollback(host)) { - center = new HashMap(); - center.put("host", host); - center.put("port", centerServerConfig.getPort().toString()); - centers.add(center); - } - /** 写入proxy地址 */ - if (StringUtils.isNotEmpty(centerServerConfig.getProxyHost())) { - center = new HashMap(); - center.put("host", centerServerConfig.getProxyHost()); - center.put("port", centerServerConfig.getProxyPort().toString()); - centers.add(center); - } + } + /** 写入proxy地址 */ + if (StringUtils.isNotEmpty(centerServerConfig.getProxyHost())) { + center = new HashMap(); + center.put("host", centerServerConfig.getProxyHost()); + center.put("port", centerServerConfig.getProxyPort().toString()); + centers.add(center); + } - /** 写入systemName */ - map.put("footer", Config.collect().getFooter()); - map.put("title", Config.collect().getTitle()); - map.put("appUrl", Config.collect().getAppUrl()); - /***/ - if (centerServerConfig.getSslEnable()) { - map.put("app_protocol", "https:"); - } else { - map.put("app_protocol", "http:"); - } - /* 上面的无效 */ - map.put("app_protocol", "auto"); - if ((null != Config.portal().getLoginPage()) - && (BooleanUtils.isTrue(Config.portal().getLoginPage().getEnable()))) { - map.put(MAP_LOGINPAGE, Config.portal().getLoginPage()); - } else if ((null != Config.person().getLoginPage()) - && (BooleanUtils.isTrue(Config.person().getLoginPage().getEnable()))) { - map.put(MAP_LOGINPAGE, Config.person().getLoginPage()); - } else { - map.put(MAP_LOGINPAGE, Config.portal().getLoginPage()); - } - map.put("indexPage", Config.portal().getIndexPage()); - map.put("webSocketEnable", Config.communicate().wsEnable()); - map.put("urlMapping", Config.portal().getUrlMapping()); - - /* 密码规则 */ - map.put("passwordRegex", Config.person().getPasswordRegex()); - map.put("passwordRegexHint", Config.person().getPasswordRegexHint()); - - /* RSA */ - File publicKeyFile = new File(Config.base(), "config/public.key"); - if (publicKeyFile.exists() && publicKeyFile.isFile()) { - String publicKey = FileUtils.readFileToString(publicKeyFile, "utf-8"); - byte[] publicKeyB = Base64.decodeBase64(publicKey); - publicKey = new String(Base64.encodeBase64(publicKeyB)); - map.put("publicKey", publicKey); - } - for (Entry en : Config.web().entrySet()) { - map.put(en.getKey(), en.getValue()); - } - FileUtils.writeStringToFile(file, gson.toJson(map), DefaultCharset.charset); + /** 写入systemName */ + map.put("footer", Config.collect().getFooter()); + map.put("title", Config.collect().getTitle()); + map.put("appUrl", Config.collect().getAppUrl()); + /***/ + if (centerServerConfig.getSslEnable()) { + map.put("app_protocol", "https:"); + } else { + map.put("app_protocol", "http:"); + } + /* 上面的无效 */ + map.put("app_protocol", "auto"); + if ((null != Config.portal().getLoginPage()) + && (BooleanUtils.isTrue(Config.portal().getLoginPage().getEnable()))) { + map.put(MAP_LOGINPAGE, Config.portal().getLoginPage()); + } else if ((null != Config.person().getLoginPage()) + && (BooleanUtils.isTrue(Config.person().getLoginPage().getEnable()))) { + map.put(MAP_LOGINPAGE, Config.person().getLoginPage()); + } else { + map.put(MAP_LOGINPAGE, Config.portal().getLoginPage()); + } + map.put("indexPage", Config.portal().getIndexPage()); + map.put("webSocketEnable", Config.communicate().wsEnable()); + map.put("urlMapping", Config.portal().getUrlMapping()); + + /* 密码规则 */ + map.put("passwordRegex", Config.person().getPasswordRegex()); + map.put("passwordRegexHint", Config.person().getPasswordRegexHint()); + + /* RSA */ + File publicKeyFile = new File(Config.base(), "config/public.key"); + if (publicKeyFile.exists() && publicKeyFile.isFile()) { + String publicKey = FileUtils.readFileToString(publicKeyFile, "utf-8"); + byte[] publicKeyB = Base64.decodeBase64(publicKey); + publicKey = new String(Base64.encodeBase64(publicKeyB)); + map.put("publicKey", publicKey); + } + for (Entry en : Config.web().entrySet()) { + map.put(en.getKey(), en.getValue()); } + FileUtils.writeStringToFile(file, gson.toJson(map), DefaultCharset.charset); } private static void createIndexPage() throws Exception { @@ -300,4 +297,4 @@ public class WebServerTools extends JettySeverTools { FileUtils.copyDirectory(p.toFile(), Config.path_servers_webServer(true).toFile()); } } -} \ No newline at end of file +} diff --git a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidateDirect.java b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidateDirect.java index 0cde2753eb898266e747f4f5724cd24fd88e34b7..71d93e28f44e6d84e50ad27994544c701b315273 100644 --- a/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidateDirect.java +++ b/o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/collect/ActionValidateDirect.java @@ -16,6 +16,9 @@ class ActionValidateDirect extends BaseAction { ActionResult execute(JsonElement jsonElement) throws Exception { ActionResult result = new ActionResult<>(); + if (!Config.nodes().centerServers().first().getValue().getConfigApiEnable()) { + throw new ExceptionModifyConfig(); + } Wi wi = this.convertToWrapIn(jsonElement, Wi.class); Wo wo = new Wo(); wo.setValue(true);