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

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

@@ -5,6 +5,7 @@ import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
import com.yihu.admin.server.model.MicroService;
import com.yihu.admin.server.model.Server;
import com.yihu.admin.server.util.DateUtil;
import com.yihu.admin.server.util.HttpClientUtil;
import com.yihu.admin.server.util.MD5;
import net.sf.json.JSONObject;
@@ -84,10 +85,14 @@ public class ServerHeart implements Runnable {
                            JSONObject jsonObject = JSONObject.fromObject(httpGet(server));
                            String status = jsonObject.getString("status");
                            server.setStatus(status);
                            server.setLastUpdatedTimestamp(new Date().getTime());
                            Long time=new Date().getTime();
                            server.setLastUpdatedTimestamp(time);
                            server.setLastUpdatedTimestampStr((DateUtil.dateToStr(new Date(time), DateUtil.YYYY_MM_DD_HH_MM_SS_SSS)));
                        } catch (Exception e) {
                            server.setStatus("OUT_OF_SERVICE");
                            server.setLastUpdatedTimestamp(new Date().getTime());
                            Long time=new Date().getTime();
                            server.setLastUpdatedTimestamp(time);
                            server.setLastUpdatedTimestampStr((DateUtil.dateToStr(new Date(time), DateUtil.YYYY_MM_DD_HH_MM_SS_SSS)));
                        }
                    }
                }

admin/admin-server-starter/src/main/java/com/yihu/admin/server/model/Server.java

@@ -41,6 +41,7 @@ public class Server {
    private Boolean isCoordinatingDiscoveryServer = Boolean.FALSE;
    private Map<String, String> metadata = new ConcurrentHashMap<String, String>();
    private Long lastUpdatedTimestamp = System.currentTimeMillis();
    private String lastUpdatedTimestampStr ;
    private Long lastDirtyTimestamp = System.currentTimeMillis();
    private String asgName;
    private String version = "unknown";
@@ -322,4 +323,12 @@ public class Server {
    public void setUuid(String uuid) {
        this.uuid = uuid;
    }
    public String getLastUpdatedTimestampStr() {
        return lastUpdatedTimestampStr;
    }
    public void setLastUpdatedTimestampStr(String lastUpdatedTimestampStr) {
        this.lastUpdatedTimestampStr = lastUpdatedTimestampStr;
    }
}

admin/admin-server-ui-starter/src/main/resources/admin/server/html/serverMessage.html

@@ -58,7 +58,7 @@
                        </div>
                        <div class="form-group">
                            <label class="col-sm-6 control-label">最后更新时间：</label>
                            <label class="control-label">{{data.lastUpdatedTimestamp}}</label>
                            <label class="control-label">{{data.lastUpdatedTimestampStr}}</label>
                        </div>
                        <div class="form-group">
                            <label class="col-sm-6 control-label">服务器状态：</label>