Merge branch 'master' of http://git.yoho.cn/ops/monitor-ui into master_dev

# Conflicts:
#	monitor-ui-web/src/main/webapp/jsp/bigdata/dashboardinfo.jsp

@@ -264,6 +264,11 @@ public class HttpUriContants {
     public static final String INTERNAL_DOMAIN_HISTORY = "/internalDns/getHistory";
 
     /**
+     * bigdata监控
+     */
+    public static final String BIGDATA_GETACCESSURL = "/bigdata/getAccessUrl";
+
+    /**
      * 配置管理
      * 恶意请求ip
      * 获取

 package com.ui.ctrl;
 
 import com.ui.contants.HttpUriContants;
+import com.ui.http.HttpRestClient;
 import com.ui.model.BaseResponse;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,9 +17,14 @@ import org.springframework.web.servlet.ModelAndView;
 @RequestMapping("/bigdata")
 public class BigDataCtrl {
 
+    @Autowired
+    private HttpRestClient httpRestClient;
+
     @RequestMapping("/toDashboardinfo")
     @ResponseBody
     public ModelAndView toDashboardinfo(Model model) {
+        String url=httpRestClient.defaultPost(HttpUriContants.BIGDATA_GETACCESSURL,null,String.class);
+        model.addAttribute("accessUrl",url);
         return new ModelAndView("bigdata/dashboardinfo");
     }
 

@@ -66,7 +66,7 @@
 </div>
 <!-- 右侧具体内容 -->
 <div id="content">
-    <iframe src="http://localhost:7777/dashboard/index"  id="iframepage" frameborder="0" scrolling="auto" width="100%" height="800px">
+    <iframe src="${accessUrl}/dashboard/index"  id="iframepage" frameborder="0" scrolling="auto" width="100%" height="800px">
     </iframe>
 </div>