From 87f45787a8e765bc53916f239c1fbfc4419d0e01 Mon Sep 17 00:00:00 2001
From: "StarsL.cn" <starsliao@163.com>
Date: Wed, 23 Feb 2022 02:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8SID=E4=BD=BF=E7=94=A8/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 flask-consul/units/blackbox_manager.py      | 2 ++
 flask-consul/units/consul_manager.py        | 4 +++-
 vue-consul/src/layout/components/Navbar.vue | 2 +-
 vue-consul/src/router/index.js              | 5 +++++
 vue-consul/src/views/blackbox/index.vue     | 7 +++++--
 vue-consul/src/views/consul/instances.vue   | 5 +++--
 vue-consul/src/views/consul/services.vue    | 1 +
 vue-consul/src/views/login/index.vue        | 2 +-
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/flask-consul/units/blackbox_manager.py b/flask-consul/units/blackbox_manager.py
index e660edd..0ce4673 100644
--- a/flask-consul/units/blackbox_manager.py
+++ b/flask-consul/units/blackbox_manager.py
@@ -40,6 +40,8 @@ def get_service():
 
 def add_service(module,company,project,env,name,instance):
     sid = f"{module}/{company}/{project}/{env}@{name}"
+    if '//' in sid or sid.startswith('/') or sid.endswith('/'):
+        return {"code": 50000, "data": f"服务ID【{sid}】首尾不能包含'/'，并且不能包含两个连续的'/'"}
     data = {
             "id": sid,
             "name": 'blackbox_exporter',
diff --git a/flask-consul/units/consul_manager.py b/flask-consul/units/consul_manager.py
index 9b0988e..a69c067 100644
--- a/flask-consul/units/consul_manager.py
+++ b/flask-consul/units/consul_manager.py
@@ -77,6 +77,9 @@ def del_instance(service_id):
         return {"code": 50000, "data": f"{reg.status_code}【{service_id}】{reg.text}"}
 
 def add_instance(instance_dict):
+    sid = instance_dict['ID']
+    if '//' in sid or sid.startswith('/') or sid.endswith('/'):
+        return {"code": 50000, "data": f"服务ID【{sid}】首尾不能包含'/'，并且不能包含两个连续的'/'"}
     isMeta = instance_dict['metaInfo']['isMeta']
     isCheck = instance_dict['checkInfo']['isCheck']
     address = instance_dict['address']
@@ -112,7 +115,6 @@ def add_instance(instance_dict):
     print(instance_dict)
 
     reg = requests.put(f'{consul_url}/agent/service/register', headers=headers, data=json.dumps(instance_dict))
-    sid = instance_dict['ID']
     if reg.status_code == 200:
         return {"code": 20000, "data": f"【{sid}】增加成功！"}
     else:
diff --git a/vue-consul/src/layout/components/Navbar.vue b/vue-consul/src/layout/components/Navbar.vue
index 4f07d14..4e99188 100644
--- a/vue-consul/src/layout/components/Navbar.vue
+++ b/vue-consul/src/layout/components/Navbar.vue
@@ -16,7 +16,7 @@
               首页
             </el-dropdown-item>
           </router-link>
-          <a target="_blank" href="https://github.com/starsliao/Prometheus">
+          <a target="_blank" href="https://github.com/starsliao/ConsulManager">
             <el-dropdown-item>GitHub</el-dropdown-item>
           </a>
           <el-dropdown-item divided @click.native="logout">
diff --git a/vue-consul/src/router/index.js b/vue-consul/src/router/index.js
index 1b12312..7221e86 100644
--- a/vue-consul/src/router/index.js
+++ b/vue-consul/src/router/index.js
@@ -112,7 +112,12 @@ export const constantRoutes = [
       {
         path: 'https://starsl.cn/static/img/qr.png',
         meta: { title: '我的公众号', icon: 'el-icon-chat-dot-round' }
+      },
+      {
+        path: 'https://element.eleme.cn',
+        meta: { title: 'Element', icon: 'el-icon-eleme' }
       }
+
     ]
   },
 
diff --git a/vue-consul/src/views/blackbox/index.vue b/vue-consul/src/views/blackbox/index.vue
index b58f7ca..0c40023 100644
--- a/vue-consul/src/views/blackbox/index.vue
+++ b/vue-consul/src/views/blackbox/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div class="app-container">
+    <el-alert type="success" center close-text="知道了">
+      <el-link icon="el-icon-warning" type="success" href="https://github.com/starsliao/ConsulManager#%E5%BA%94%E7%94%A8%E5%9C%BA%E6%99%AF%E5%A6%82%E4%BD%95%E4%BC%98%E9%9B%85%E7%9A%84%E4%BD%BF%E7%94%A8consul%E7%AE%A1%E7%90%86blackbox%E7%AB%99%E7%82%B9%E7%9B%91%E6%8E%A7" target="_blank">应用场景：如何优雅的使用Consul管理Blackbox站点监控</el-link>
+    </el-alert>
     <div class="filter-container">
       <el-select v-model="listQuery.module" placeholder="监控类型" clearable collapse-tags style="width: 150px" class="filter-item">
         <el-option v-for="item in module_list" :key="item" :label="item" :value="item" />
@@ -156,7 +159,7 @@ export default {
   data() {
     const validateInput = (rule, value, callback) => {
       if (!this.checkSpecialKey(value)) {
-        callback(new Error('不能含有空格或 [ ]`~!#$^&*=|"{}\':;/?'))
+        callback(new Error('不能含有空格或 [ ]`~!#$^&*=|"{}\':;?'))
       } else {
         callback()
       }
@@ -264,7 +267,7 @@ export default {
       this.multipleSelection = val
     },
     checkSpecialKey(str) {
-      const specialKey = '[]`~!#$^&*=|{}\'":;/? '
+      const specialKey = '[]`~!#$^&*=|{}\'":;? '
       for (let i = 0; i < str.length; i++) {
         if (specialKey.indexOf(str.substr(i, 1)) !== -1) {
           return false
diff --git a/vue-consul/src/views/consul/instances.vue b/vue-consul/src/views/consul/instances.vue
index 7710474..a7a56f8 100644
--- a/vue-consul/src/views/consul/instances.vue
+++ b/vue-consul/src/views/consul/instances.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-alert v-if="services_name === 'blackbox_exporter'" title="如需管理【blackbox_exporter】的监控实例，建议使用左侧菜单【Blackbox 站点监控】来维护，更加方便直观。" type="success" center close-text="知道了" />
     <el-select v-model="services_name" placeholder="请选择 Services" filterable collapse-tags style="width: 250px" class="filter-item" @change="fetchData(services_name)">
       <el-option v-for="item in services_name_list" :key="item" :label="item" :value="item" />
     </el-select>
@@ -194,7 +195,7 @@ export default {
   data() {
     const validateInput = (rule, value, callback) => {
       if (!this.checkSpecialKey(value)) {
-        callback(new Error('不能含有空格或 [ ]`~!#$^&*=|"{}\':;/?'))
+        callback(new Error('不能含有空格或 [ ]`~!#$^&*=|"{}\':;?'))
       } else {
         callback()
       }
@@ -295,7 +296,7 @@ export default {
       this.inputValue = ''
     },
     checkSpecialKey(str) {
-      const specialKey = '[]`~!#$^&*=|{}\'":;/? '
+      const specialKey = '[]`~!#$^&*=|{}\'":;? '
       for (let i = 0; i < str.length; i++) {
         if (specialKey.indexOf(str.substr(i, 1)) !== -1) {
           return false
diff --git a/vue-consul/src/views/consul/services.vue b/vue-consul/src/views/consul/services.vue
index e24cdda..f8b8d04 100644
--- a/vue-consul/src/views/consul/services.vue
+++ b/vue-consul/src/views/consul/services.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <el-alert title="如需管理【blackbox_exporter】的监控实例，建议使用左侧菜单【Blackbox 站点监控】来维护，更加方便直观。" type="success" center close-text="知道了" />
     <el-table
       v-loading="listLoading"
       :data="services"
diff --git a/vue-consul/src/views/login/index.vue b/vue-consul/src/views/login/index.vue
index 60a42ff..c621c8c 100644
--- a/vue-consul/src/views/login/index.vue
+++ b/vue-consul/src/views/login/index.vue
@@ -45,7 +45,7 @@
 
     </el-form>
     <div align="center" class="title-container">
-      <span style="font-size:10px" class="title">v0.3.0</span>
+      <span style="font-size:10px" class="title">v0.3.1</span>
     </div>
   </div>
 </template>