Merge branch 'dev' of chenweida/jkzl-starter into dev

admin/admin-client-starter/pom.xml

@@ -5,11 +5,11 @@
    <parent>
        <groupId>com.yihu</groupId>
        <artifactId>admin-parent</artifactId>
        <version>1.2.0</version>
        <version>${verion.yihu.admin}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <version>${verion.yihu.admin}</version>
    <version>${parent.version}</version>
    <artifactId>admin-client-starter</artifactId>
    <dependencies>

admin/admin-server-starter/pom.xml

@@ -5,14 +5,14 @@
    <parent>
        <groupId>com.yihu</groupId>
        <artifactId>admin-parent</artifactId>
        <version>1.2.0</version>
        <version>${verion.yihu.admin}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>admin-server-starter</artifactId>
    <version>${verion.yihu.admin}</version>
    <version>${parent.version}</version>
    <dependencies>
        <dependency>

admin/admin-server-starter/src/main/java/com/yihu/admin/server/eureka/DiscoveryController.java

@@ -88,19 +88,19 @@ public class DiscoveryController {
            }
            if ("down".equals(server.getStatus().toLowerCase())) {
                downNum++;
                downList.add(server.getInstanceId());
                downList.add(server.getAppName()+"("+server.getInstanceId()+")");
            }
            if ("starting".equals(server.getStatus().toLowerCase())) {
                startingNum++;
                startingList.add(server.getInstanceId());
                startingList.add(server.getAppName()+"("+server.getInstanceId()+")");
            }
            if ("out_of_service".equals(server.getStatus().toLowerCase())) {
                outNum++;
                outList.add(server.getInstanceId());
                outList.add(server.getAppName()+"("+server.getInstanceId()+")");
            }
            if ("unknown".equals(server.getStatus().toLowerCase())) {
                unknowNum++;
                unknowList.add(server.getInstanceId());
                unknowList.add(server.getAppName()+"("+server.getInstanceId()+")");
            }
        }

admin/admin-server-starter/src/main/java/com/yihu/admin/server/manage/ServerHeart.java

@@ -43,24 +43,28 @@ public class ServerHeart implements Runnable {
            try {
                //先去eureka获取数据
                for (Application application : eurekaClient.getApplications().getRegisteredApplications()) {
                    MicroService microService = new MicroService(application.getName());
                    List<InstanceInfo> instanceInfos = application.getInstancesAsIsFromEureka();
                    for (InstanceInfo instanceInfo : instanceInfos) {
                        Server server = new Server();
                        BeanUtils.copyProperties(instanceInfo, server);
                        server.setStatus(instanceInfo.getStatus().toString());
                        server.setIp(instanceInfo.getIPAddr());
                        server.setUuid(MD5.GetMD5Code(microService.getName() + "-" + instanceInfo.getInstanceId()));
                        logger.debug(server.toString());
                        microService.getServers().add(server);
                    String key = eureka_pre + application.getName();
                    MicroService microService = null;
                    if (microServices.containsKey(key)) {
                        microService = microServices.get(key);
                    } else {
                        microService = new MicroService(application.getName());
                        List<InstanceInfo> instanceInfos = application.getInstancesAsIsFromEureka();
                        for (InstanceInfo instanceInfo : instanceInfos) {
                            Server server = new Server();
                            BeanUtils.copyProperties(instanceInfo, server);
                            server.setStatus(instanceInfo.getStatus().toString());
                            server.setIp(instanceInfo.getIPAddr());
                            server.setUuid(MD5.GetMD5Code(microService.getName() + "-" + instanceInfo.getInstanceId()));
                            logger.debug(server.toString());
                            microService.getServers().add(server);
                        }
                    }
                    microServices.put(eureka_pre + microService.getName(), microService);
                    microServices.put(key, microService);
                }
                //如果不是从eureka获取的自己在手动去更新状态
                for (Map.Entry<String, MicroService> one : microServices.entrySet()) {
                    if (one.getKey().startsWith(eureka_pre)) {
                        continue;
                    }
                    for (Server server : one.getValue().getServers()) {
                        try {
                            JSONObject jsonObject = JSONObject.fromObject(httpGet(server));

admin/admin-server-ui-starter/pom.xml

@@ -5,13 +5,13 @@
    <parent>
        <groupId>com.yihu</groupId>
        <artifactId>admin-parent</artifactId>
        <version>1.2.0</version>
        <version>${verion.yihu.admin}</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>admin-server-ui-starter</artifactId>
    <version>${verion.yihu.admin}</version>
    <version>${parent.version}</version>
    <dependencies>
        <dependency>
            <groupId>org.springframework.boot</groupId>

admin/pom.xml

@@ -34,6 +34,9 @@
            <url>http://172.19.103.43:8081/nexus/content/repositories/jkzlRepositories/</url>
        </repository>
    </distributionManagement>
    <properties>
        <verion.yihu.admin>1.2.0</verion.yihu.admin>
    </properties>
    <modules>
        <module>/admin-client-starter</module>

pom.xml

@@ -92,8 +92,6 @@
        <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
        <verion.yihu.admin>1.2.0</verion.yihu.admin>
    </properties>
    <!--dependencyManagement作用子配置不写版本默认继承父配置-->
    <dependencyManagement>