Home Explore Help
Register Sign In
huangzhiyong
/
eip_manage
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改IP获取方式

Airhead 8 years ago
parent
832ec0afe5
commit
c131d164b5
9 changed files with 32 additions and 26 deletions
Split View Show Diff Stats
  1. 27 7
      hos-admin/hos-admin.iml
  2. 0 2
      hos-arbiter/hos-arbiter.iml
  3. 1 3
      hos-broker/hos-broker.iml
  4. 2 2
      hos-broker/src/main/java/com/yihu/hos/services/BrokerServerService.java
  5. 0 3
      hos-core-dependencies/hos-core-dependencies.iml
  6. 0 3
      hos-core/hos-core.iml
  7. 2 2
      hos-core/src/main/java/com/yihu/hos/core/net/IPChoiceUtils.java
  8. 0 2
      hos-web-framework-dependencies/hos-web-framework-dependencies.iml
  9. 0 2
      hos-web-framework/hos-web-framework.iml

+ 27 - 7
hos-admin/hos-admin.iml
View File 

@ -24,9 +24,13 @@
 
    </content>
 
    <orderEntry type="inheritedJdk" />
 
    <orderEntry type="sourceFolder" forTests="false" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-jasper:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.eclipse.jdt.core.compiler:ecj:4.5.1" level="project" />
 
    <orderEntry type="library" name="Maven: net.sourceforge.jexcelapi:jxl:2.6.10" level="project" />
 
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
 
    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:jstl:1.2" level="project" />
 
    <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
 
    <orderEntry type="module" module-name="hos-web-framework" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.9.Final" level="project" />
 
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
 
@ -51,13 +55,9 @@
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
 
    <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
 
@ -86,6 +86,7 @@
 
    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.2.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.mongodb:bson:3.2.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.9.2.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.2.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring-boot:2.17.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.camel:camel-spring:2.17.1" level="project" />
 
@ -190,16 +191,35 @@
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.13.4" level="project" />
 
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.9" level="project" />
 
    <orderEntry type="library" name="Maven: com.yihu.core:html2image:0.9" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-jsp:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-servlet:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-extras:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-core:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-api:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-api:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet-wildcard:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-servlet:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-mustache:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: com.github.spullara.mustache.java:compiler:0.8.4" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-jsp:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-servlet:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-template:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-autotag-core-runtime:1.1.0" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-jsp:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-freemarker:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-freemarker:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.25-incubating" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-velocity:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity-tools:2.0" level="project" />
 
    <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-request-velocity:1.0.6" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-el:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-mvel:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: org.mvel:mvel2:2.0.11" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-ognl:3.0.5" level="project" />
 
    <orderEntry type="library" name="Maven: ognl:ognl:2.7.3" level="project" />
 
    <orderEntry type="library" name="Maven: jboss:javassist:3.7.ga" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tiles:tiles-compat:3.0.5" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />

+ 0 - 2
hos-arbiter/hos-arbiter.iml
View File 

@ -24,9 +24,7 @@
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />

+ 1 - 3
hos-broker/hos-broker.iml
View File 

@ -35,9 +35,7 @@
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />
 
@ -139,7 +137,6 @@
 
    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.2" level="project" />
 
    <orderEntry type="library" name="Maven: com.belerweb:pinyin4j:2.5.0" level="project" />
 
    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
 
    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.4.0" level="project" />
 
    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.6" level="project" />
 
@ -175,6 +172,7 @@
 
    <orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.13.4" level="project" />
 
    <orderEntry type="library" name="Maven: com.yihu.core:ehr-dbhelper:1.1.9" level="project" />
 
    <orderEntry type="library" name="Maven: com.yihu.core:html2image:0.9" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.4.0.RELEASE" level="project" />

+ 2 - 2
hos-broker/src/main/java/com/yihu/hos/services/BrokerServerService.java
View File 

@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
import com.fasterxml.jackson.databind.node.ObjectNode;
 
import com.yihu.hos.common.configuration.ApplicationConfiguration;
 
import com.yihu.hos.common.configuration.ArbiterConfiguration;
 
import com.yihu.hos.core.net.IPChoiceUtils;
 
import org.apache.camel.util.InetAddressUtil;
 
import org.apache.http.Consts;
 
import org.apache.http.NameValuePair;
 
@ -20,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.stereotype.Component;
 
import java.io.IOException;
 
import java.net.InetAddress;
 
import java.net.URI;
 
import java.net.URISyntaxException;
 
import java.util.ArrayList;
 
@ -42,7 +42,7 @@ public class BrokerServerService implements DisposableBean {
 
    public void brokerServerOnline() {
 
        try {
 
            hostName = InetAddressUtil.getLocalHostName();
 
            hostAddress = InetAddress.getLocalHost().getHostAddress();
 
            hostAddress = IPChoiceUtils.getSourceIP();
 
            port = applicationConfiguration.getPort();
 
            ObjectMapper objectMapper = new ObjectMapper();
 
            ObjectNode objectNode = objectMapper.createObjectNode();

+ 0 - 3
hos-core-dependencies/hos-core-dependencies.iml
View File 

@ -50,8 +50,5 @@
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
  </component>
 
</module>

+ 0 - 3
hos-core/hos-core.iml
View File 

@ -51,8 +51,5 @@
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.4.1" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
  </component>
 
</module>

+ 2 - 2
hos-core/src/main/java/com/yihu/hos/core/net/IPChoiceUtils.java
View File 

@ -36,7 +36,7 @@ public class IPChoiceUtils {
 
     *
 
     * @return
 
     */
 
    public static String getSourceIp() {
 
    public static String getSourceIP() {
 
        Enumeration<NetworkInterface> interfaces = null;
 
        try {
 
            interfaces = NetworkInterface.getNetworkInterfaces();
 
@ -46,7 +46,7 @@ public class IPChoiceUtils {
 
        }
 
        // 首先拿到本机可用的IPV4地址。
 
        List<String> allIPs = new ArrayList<String>();
 
        List<String> allIPs = new ArrayList<>();
 
        while (interfaces.hasMoreElements()) {
 
            NetworkInterface networkInterface = interfaces.nextElement();

+ 0 - 2
hos-web-framework-dependencies/hos-web-framework-dependencies.iml
View File 

@ -21,9 +21,7 @@
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />

+ 0 - 2
hos-web-framework/hos-web-framework.iml
View File 

@ -33,9 +33,7 @@
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.21" level="project" />
 
    <orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
 
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.4.0.RELEASE" level="project" />
 
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.4" level="project" />