修复不存在用户认证时，查询报错

Author: bibinbin

main/search/search.go

@@ -194,8 +194,12 @@ func (se *Search) handleTemplate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	c := elastigo.NewConn()
-  c.Username = u.User.Username()
-  c.Password, _ = u.User.Password()
+	if u.User != nil {
+		c.Username = u.User.Username()
+		if pwd, bool := u.User.Password(); bool {
+			c.Password = pwd
+		}
+	}
 	c.Domain = strings.Split(u.Host, ":")[0]
 	c.Port = strings.Split(u.Host, ":")[1]
 	c.DecayDuration = 0
@@ -316,8 +320,12 @@ func (se *Search) search(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	c := elastigo.NewConn()
-  c.Username = u.User.Username()
-  c.Password, _ = u.User.Password()
+	if u.User != nil {
+		c.Username = u.User.Username()
+		if pwd, bool := u.User.Password(); bool {
+			c.Password = pwd
+		}
+	}
 	c.Domain = strings.Split(u.Host, ":")[0]
 	c.Port = strings.Split(u.Host, ":")[1]
 	c.DecayDuration = 0
@@ -360,20 +368,26 @@ func (se *Search) uploadTemplate(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
+
 	filename := strings.Split(handler.Filename, ".json")[0]
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
 		http.Error(w, err.Error(), 500)
 		return
 	}
+
 	u, err := url.Parse(r.FormValue(`serverhost`))
 	if err != nil {
 		w.Write(jsonEncode(1, map[string]interface{}{"info": err.Error()}))
 		return
 	}
 	c := elastigo.NewConn()
-  c.Username = u.User.Username()
-  c.Password, _ = u.User.Password()
+	if u.User != nil {
+		c.Username = u.User.Username()
+		if pwd, bool := u.User.Password(); bool {
+			c.Password = pwd
+		}
+	}
 	c.Domain = strings.Split(u.Host, ":")[0]
 	c.Port = strings.Split(u.Host, ":")[1]
 	c.DecayDuration = 0
@@ -414,8 +428,12 @@ func (se *Search) indexDelete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	c := elastigo.NewConn()
-  c.Username = u.User.Username()
-  c.Password, _ = u.User.Password()
+	if u.User != nil {
+		c.Username = u.User.Username()
+		if pwd, bool := u.User.Password(); bool {
+			c.Password = pwd
+		}
+	}
 	c.Domain = strings.Split(u.Host, ":")[0]
 	c.Port = strings.Split(u.Host, ":")[1]
 	c.DecayDuration = 0

main/statik/statik.go

@@ -145,10 +145,11 @@ export default {
       this.$store.dispatch('HandleIndexTemplate', tmp)
     },
     fileUploadError (file, error) {
-      this.$message.error(file.name + ' 模板部署失败，请打开开发者模式查看错误信息提示')
+      this.$message.error(error.name + ' 模板部署失败，请打开开发者模式查看错误信息提示')
     },
     fileUploadSuccess (file) {
-      this.$message.success(file.name + '模板部署成功')
+      console.log(file)
+      this.$message.success(file.name + ' 模板部署成功')
     },
     handleChange (file, fileList) {
       this.fileList = fileList.slice(-3)

src/components/mapping.vue

@@ -237,6 +237,12 @@ export default {
         tooltip: {
           trigger: 'item',
           formatter: function (params) {
+            if (params.name === 'CPU') {
+              return 'CPU利用率: ' + charts.cpuused + '%'
+            }
+            if (params.name === 'CPUFree') {
+              return 'CPU剩余利用率: ' + (100 - charts.cpuused) + '%'
+            }
             if (params.name === 'Jvm') {
               return 'JVM已用内存: ' + b2b(params.value)
             }
@@ -268,7 +274,7 @@ export default {
           x: 'center',
           y: 'bottom',
           data: [
-            'Jvm', 'Mem', 'Fs', 'FieldData', 'QueryCache'
+            'Jvm', 'Mem', 'Fs', 'FieldData', 'QueryCache', 'CPU'
           ]
         },
         title: {
@@ -279,7 +285,7 @@ export default {
         series: [
           {
             type: 'pie',
-            center: ['13%', '50%'],
+            center: ['7%', '50%'],
             radius: [40, 55],
             x: '0%',
             itemStyle: labelFromatter,
@@ -290,7 +296,7 @@ export default {
           },
           {
             type: 'pie',
-            center: ['31%', '50%'],
+            center: ['23%', '50%'],
             radius: [40, 55],
             x: '0%',
             itemStyle: labelFromatter,
@@ -301,7 +307,7 @@ export default {
           },
           {
             type: 'pie',
-            center: ['49%', '50%'],
+            center: ['39%', '50%'],
             radius: [40, 55],
             x: '0%',
             itemStyle: labelFromatter,
@@ -312,7 +318,7 @@ export default {
           },
           {
             type: 'pie',
-            center: ['67%', '50%'],
+            center: ['55%', '50%'],
             radius: [40, 55],
             x: '0%',
             itemStyle: labelFromatter,
@@ -323,14 +329,25 @@ export default {
           },
           {
             type: 'pie',
-            center: ['85%', '50%'],
+            center: ['71%', '50%'],
             radius: [40, 55],
             x: '0%',
             itemStyle: labelFromatter,
             data: [
               {name: 'QueryCache-mem', value: charts.memfree, itemStyle: labelBottom},
               {name: 'QueryCache', value: charts.query_cache_memory_size, itemStyle: labelTop}
             ]
+          },
+          {
+            type: 'pie',
+            center: ['87%', '50%'],
+            radius: [40, 55],
+            x: '0%',
+            itemStyle: labelFromatter,
+            data: [
+              {name: 'CPUFree', value: charts.cpufree, itemStyle: labelBottom},
+              {name: 'CPU', value: charts.cpuused, itemStyle: labelTop}
+            ]
           }
         ]
       }

src/components/overview.vue

@@ -38,7 +38,9 @@ const overviewx = {
       fstotal: 0,
       fsfree: 0,
       fielddata_mem_used: 0,
-      query_cache_memory_size: 0
+      query_cache_memory_size: 0,
+      cpufree: 100,
+      cpuused: 0
     },
     templateInfo: {
       count: 0,