From c39bee1e21238c8332252693bef0815eacf4b72e Mon Sep 17 00:00:00 2001
From: "StarsL.cn" <starsliao@163.com>
Date: Sun, 30 Oct 2022 14:41:18 +0800
Subject: [PATCH] add rds web

---
 flask-consul/manager.py                       |   3 +-
 flask-consul/units/cloud/alicloud.py          |   4 +-
 flask-consul/units/cloud/huaweicloud.py       |   8 +-
 flask-consul/units/cloud/sync_rds.py          |   1 +
 flask-consul/units/cloud/tencent_cloud.py     |   4 +-
 flask-consul/units/consul_kv.py               |   6 +-
 .../views/.nodes.py.swp                       | Bin 12288 -> 16384 bytes
 flask-consul/views/edit_cloud.py              | 115 ++++++++++++++
 flask-consul/views/jms.py                     |   2 +-
 flask-consul/views/jobs.py                    |  25 ++--
 flask-consul/views/nodes.py                   |  16 +-
 vue-consul/src/api/edit.js                    |  22 +++
 vue-consul/src/api/node-exporter.js           |  11 +-
 vue-consul/src/router/index.js                |  12 +-
 .../src/views/node-exporter/.jobs.vue.swp     | Bin 0 -> 40960 bytes
 vue-consul/src/views/node-exporter/jobs.vue   | 140 ++++++++++++++++--
 vue-consul/src/views/node-exporter/lists.vue  |   8 +-
 vue-consul/src/views/rds/.lists.vue.swp       | Bin 16384 -> 0 bytes
 vue-consul/src/views/rds/lists.vue            | 122 +++++----------
 19 files changed, 354 insertions(+), 145 deletions(-)
 rename vue-consul/src/api/.node-exporter.js.swp => flask-consul/views/.nodes.py.swp (60%)
 create mode 100644 flask-consul/views/edit_cloud.py
 create mode 100644 vue-consul/src/api/edit.js
 create mode 100644 vue-consul/src/views/node-exporter/.jobs.vue.swp
 delete mode 100644 vue-consul/src/views/rds/.lists.vue.swp

diff --git a/flask-consul/manager.py b/flask-consul/manager.py
index b34f2b1..032149c 100755
--- a/flask-consul/manager.py
+++ b/flask-consul/manager.py
@@ -7,7 +7,7 @@ skey_path = 'ConsulManager/assets/secret/skey'
 if consul_kv.get_kv_dict(skey_path) == {}:
     consul_kv.put_kv(skey_path,{'sk':''.join(str(uuid.uuid4()).split('-'))})
 
-from views import login, blackbox, consul, jobs, nodes, selfnode, avd, exp, jms
+from views import login, blackbox, consul, jobs, nodes, selfnode, avd, exp, jms, edit_cloud
 from units.cloud import huaweicloud,alicloud,tencent_cloud
 from units.avd import avd_list
 from units.jms import sync_jms
@@ -25,6 +25,7 @@ app.register_blueprint(selfnode.blueprint)
 app.register_blueprint(avd.blueprint)
 app.register_blueprint(exp.blueprint)
 app.register_blueprint(jms.blueprint)
+app.register_blueprint(edit_cloud.blueprint)
 
 class Config(object):
     JOBS = []
diff --git a/flask-consul/units/cloud/alicloud.py b/flask-consul/units/cloud/alicloud.py
index 85038db..5db4f91 100644
--- a/flask-consul/units/cloud/alicloud.py
+++ b/flask-consul/units/cloud/alicloud.py
@@ -93,7 +93,7 @@ def exp(account,collect_days,notify_days,notify_amount):
 
 def group(account):
     ak,sk = consul_kv.get_aksk('alicloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     config = open_api_models.Config(access_key_id=ak,access_key_secret=sk)
     config.endpoint = f'resourcemanager.aliyuncs.com'
     client = ResourceManager20200331Client(config)
@@ -123,7 +123,7 @@ def group(account):
 
 def ecs(account,region):
     ak,sk = consul_kv.get_aksk('alicloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     group_dict = consul_kv.get_value(f'ConsulManager/assets/alicloud/group/{account}')
 
     config = open_api_models.Config(access_key_id=ak,access_key_secret=sk)
diff --git a/flask-consul/units/cloud/huaweicloud.py b/flask-consul/units/cloud/huaweicloud.py
index ddcb318..12091eb 100644
--- a/flask-consul/units/cloud/huaweicloud.py
+++ b/flask-consul/units/cloud/huaweicloud.py
@@ -93,7 +93,7 @@ def exp(account,collect_days,notify_days,notify_amount):
 
 def group(account):
     ak,sk = consul_kv.get_aksk('huaweicloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     credentials = GlobalCredentials(ak, sk)
     try:
         client = EpsClient.new_builder() \
@@ -128,7 +128,7 @@ def group(account):
 
 def ecs(account,region):
     ak,sk = consul_kv.get_aksk('huaweicloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     group_dict = consul_kv.get_value(f'ConsulManager/assets/huaweicloud/group/{account}')
     credentials = BasicCredentials(ak, sk)
     try:
@@ -173,7 +173,7 @@ def ecs(account,region):
 
 def rds(account,region):
     ak,sk = consul_kv.get_aksk('huaweicloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     group_dict = consul_kv.get_value(f'ConsulManager/assets/huaweicloud/group/{account}')
     credentials = BasicCredentials(ak, sk)
     try:
@@ -198,7 +198,7 @@ def rds(account,region):
                              'cpu':f"{i['cpu']}核",
                              'mem':f"{i['mem']}GB",
                              'disk':f"{i['volume']['size']}GB",
-                             'exp': i['expiration_time']
+                             'exp': '-' if i['expiration_time'] == None else i['expiration_time'].split('T')[0]
                             } for i in info}
         count = len(rds_dict)
         off,on = sync_rds.w2consul('huaweicloud',account,region,rds_dict)
diff --git a/flask-consul/units/cloud/sync_rds.py b/flask-consul/units/cloud/sync_rds.py
index 3850d6e..6b93f93 100644
--- a/flask-consul/units/cloud/sync_rds.py
+++ b/flask-consul/units/cloud/sync_rds.py
@@ -54,6 +54,7 @@ def w2consul(vendor,account,region,rds_dict):
                 'group': v['group'],
                 'instance': instance,
                 'account': account,
+                'itype': v['itype'],
                 'vendor': vendors.get(vendor,'未找到'),
                 'disk': v['disk'],
                 'cpu': v['cpu'],
diff --git a/flask-consul/units/cloud/tencent_cloud.py b/flask-consul/units/cloud/tencent_cloud.py
index f3925a1..451f250 100644
--- a/flask-consul/units/cloud/tencent_cloud.py
+++ b/flask-consul/units/cloud/tencent_cloud.py
@@ -80,7 +80,7 @@ def exp(account,collect_days,notify_days,notify_amount):
 def group(account):
     from tencentcloud.dcdb.v20180411 import dcdb_client, models
     ak,sk = consul_kv.get_aksk('tencent_cloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     try:
         cred = credential.Credential(ak, sk)
         httpProfile = HttpProfile()
@@ -115,7 +115,7 @@ def group(account):
 def ecs(account,region):
     from tencentcloud.cvm.v20170312 import cvm_client, models
     ak,sk = consul_kv.get_aksk('tencent_cloud',account)
-    now = datetime.datetime.now().strftime('%m%d/%H:%M')
+    now = datetime.datetime.now().strftime('%m.%d/%H:%M')
     group_dict = consul_kv.get_value(f'ConsulManager/assets/tencent_cloud/group/{account}')
     try:
         cred = credential.Credential(ak, sk)
diff --git a/flask-consul/units/consul_kv.py b/flask-consul/units/consul_kv.py
index 7cebe00..2441b69 100644
--- a/flask-consul/units/consul_kv.py
+++ b/flask-consul/units/consul_kv.py
@@ -57,7 +57,7 @@ def del_key_all(path):
     else:
         return None
 
-def get_ecs_services(job_id):
+def get_res_services(job_id):
     cloud,account,itype,region = job_id.split('/')
     service = f'{cloud}_{account}_{itype}'
     region = f'and "{region}" in Tags'
@@ -65,8 +65,8 @@ def get_ecs_services(job_id):
     response = requests.get(url, headers=headers)
     if response.status_code == 200:
         info = response.json()
-        ecs_list = [i['Meta'] for i in info.values()]
-        return {'code': 20000,'ecs_list': ecs_list}
+        res_list = [i['Meta'] for i in info.values()]
+        return {'code': 20000,'res_list': res_list}
     else:
         return {'code': 50000, 'data': f'{response.status_code}:{response.text}'}
  
diff --git a/vue-consul/src/api/.node-exporter.js.swp b/flask-consul/views/.nodes.py.swp
similarity index 60%
rename from vue-consul/src/api/.node-exporter.js.swp
rename to flask-consul/views/.nodes.py.swp
index 45b6d44880e90cc309f3e4775138dbeda149b647..fb4d4c626e785ed71a3fe8a52380f913f7af51e3 100644
GIT binary patch
literal 16384
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
M+FN~Pfpe^X0|g4rumAu6

literal 12288
zcmeI2&r1|x7{_0`l%*945fSlL(5~gWYXyN26e^OaX`%!jWSo6>9h;eVoOfm^#3a0Q
z?dUPc=wP=F{tHD#1=b<)5<!Qqfe=XFcXqejWtV2{Bs>G39cK1@-{*Nh?+;k^oz6_&
z80J^HE;C$58MC$q&6CYZwk;X+r401ze_eUQag3BL^C_V+-Sta9&<&=0rK>`F*l>-!
z@Y97*q|E3|TKQ($@T{~evmzz#dD0Jr-!-f1H%Q-*0W#2lfmU|uVs}PYID6(aZ*QAu
zpe_|917v^<kO4A42FL&zAOmDzuNw%wCbo!9>??KTPU+rMbuT^AjSP?hGC&5%02v?y
zWPl8i0Wv@a$N(AGg9eN&W2X)<_N*Dn<NyEi@BdFn7+VLcU>Pg{4@`hjFam}_2RH^8
z_;DC@z<clxyalUZ87u(@OoB0R6O4ch;5hiz%Gh`C0lWdP!7K0-JO%||f*~*f`avH!
z2in2U7RJ7UO|SvhzzTQ>B$x#=;3_x|TENyJlm(x`I#>fM;1MW*IUs=xdO-%Xf$f8c
z1vbG3_yS&nCtwlS;5HZsV_+1V0Q<o=c>V}pfagGaUjcNH0Wv@a$N(8217x7mzyjlZ
zp#vYBdxmc~s)x_>Svf6CHRT$P=;Y>%Fz<>i*Cjc3L@*<>Jv@;YL83Ey75X-w{~WMX
zX;THLZd<BY!WTj4yWAIZp-@3`o)u4E@?7YefhApzrg~M-Z>k|wN!AM9!RHyPnW|+q
zo*7Ps=Azu=XNIGtIV+z;wCYr{Mqp@X==7A9mbJ{F+Lb3uDmbqrD_%OfouaAa&T!Q!
zRg6*XA@W08sCYp!I=6J`qz<!V49Xo>!Y^2+*hSAHr?HbL4M9b?s+3}MTn|yXiP)jX
zOI?iSXX7!8Gdgy(K{<`J5b56OyJC4xH8kzf>DbW`y1Wb#q<U)oM-q8ohF<J626Sn?
z7wjU5tguBOqEHnJ4z0!X&?jt+LY?sCiLaB3zuMymAH^y!N7wDw9|LTt{{5Oc)ZCrp
qr-16$ZLL5h|Hg>&upE7QzPy?9oG%@oxRwqB%U0>q7N3%yO0eJYGh<``

diff --git a/flask-consul/views/edit_cloud.py b/flask-consul/views/edit_cloud.py
new file mode 100644
index 0000000..f5cc7f8
--- /dev/null
+++ b/flask-consul/views/edit_cloud.py
@@ -0,0 +1,115 @@
+from flask import Blueprint
+from flask_restful import reqparse, Resource, Api
+from flask_apscheduler import APScheduler
+from config import vendors,regions
+from units import token_auth,consul_kv
+from .jobs import deljob,addjob,runjob,modjob_interval
+import json
+blueprint = Blueprint('edit_cloud',__name__)
+api = Api(blueprint)
+
+parser = reqparse.RequestParser()
+parser.add_argument('vendor',type=str)
+parser.add_argument('account',type=str)
+parser.add_argument('region',type=str)
+parser.add_argument('editJob',type=dict)
+class Edit(Resource):
+    decorators = [token_auth.auth.login_required]
+    job_list = list(consul_kv.get_kv_dict(f'ConsulManager/jobs').values())
+    def get(self,stype):
+        if stype == 'cloud':
+            cloud_dict = {}
+            for i in self.job_list:
+                vendor,account = i['id'].split('/')[0:2]
+                if vendor in cloud_dict:
+                    if account not in cloud_dict[vendor]:
+                        cloud_dict[vendor].append(account)
+                else:
+                    cloud_dict[vendor] = [account]
+            return {'code': 20000,'cloud_dict': cloud_dict}
+        if stype == 'find':
+            args = parser.parse_args()
+            vendor = args['vendor']
+            account = args['account']
+            region = args['region']
+            restype = ['group']
+            interval = {'proj_interval': 60, 'ecs_interval': 5, 'rds_interval': 5}
+            for i in self.job_list:
+                if f'{vendor}/{account}/group' == i['id']:
+                    interval['proj_interval'] = i['minutes']
+                elif f'{vendor}/{account}/ecs/{region}' == i['id']:
+                    restype.append('ecs')
+                    interval['ecs_interval'] = i['minutes']
+                elif f'{vendor}/{account}/rds/{region}' == i['id']:
+                    restype.append('rds')
+                    interval['rds_interval'] = i['minutes']
+            return {'code': 20000, 'restype': restype, 'interval': interval}
+    def post(self,stype):
+        if stype == 'commit':
+            args = parser.parse_args()
+            editjob_dict = args['editJob']
+            vendor = editjob_dict['vendor']
+            account = editjob_dict['account']
+            region = editjob_dict['region']
+            restype = editjob_dict['restype']
+            proj_interval = int(editjob_dict['proj_interval'])
+            ecs_interval = int(editjob_dict['ecs_interval'])
+            rds_interval = int(editjob_dict['rds_interval'])
+            print(editjob_dict)
+            if editjob_dict['akskswitch']:
+                ak = editjob_dict['ak']
+                sk = editjob_dict['sk']
+                consul_kv.put_aksk(editjob_dict['vendor'],editjob_dict['account'],ak,sk)
+
+            jobgroup = [x for x in self.job_list if x['id'] == f'{vendor}/{account}/group'][0]
+            if proj_interval != jobgroup['minutes']:
+                jobgroup['minutes'] = proj_interval
+                jobid = f'{vendor}/{account}/group'
+                consul_kv.put_kv(f'ConsulManager/jobs/{jobid}',jobgroup)
+                modjob_interval(jobid,proj_interval)
+
+            ecs_jobid = f'{vendor}/{account}/ecs/{region}'
+            rds_jobid = f'{vendor}/{account}/rds/{region}'
+            if 'ecs' in restype:
+                isecs = [x for x in self.job_list if x['id'] == f'{vendor}/{account}/ecs/{region}']
+                if len(isecs) == 1:
+                    if ecs_interval != isecs[0]['minutes']:
+                        consul_kv.put_kv(f'ConsulManager/jobs/{ecs_jobid}',isecs[0])
+                        modjob_interval(ecs_jobid,ecs_interval)
+                else:
+                    job_func = f"__main__:{vendor}.ecs"
+                    job_args = [account,region]
+                    job_interval = ecs_interval
+                    addjob(ecs_jobid, job_func, job_args, job_interval)      
+                    job_dict = {'id':ecs_jobid,'func':job_func,'args':job_args,'minutes':job_interval,
+                                "trigger": "interval","replace_existing": True}
+                    consul_kv.put_kv(f'ConsulManager/jobs/{ecs_jobid}',job_dict)
+            else:
+                try:
+                    consul_kv.del_key(f'ConsulManager/jobs/{ecs_jobid}')
+                    deljob(ecs_jobid)
+                except:
+                    pass        
+
+            if 'rds' in restype:
+                isrds = [x for x in self.job_list if x['id'] == f'{vendor}/{account}/rds/{region}']
+                if len(isrds) == 1:
+                    if rds_interval != isrds[0]['minutes']:
+                        consul_kv.put_kv(f'ConsulManager/jobs/{rds_jobid}',isrds[0])
+                        modjob_interval(rds_jobid,rds_interval)
+                else:
+                    job_func = f"__main__:{vendor}.rds"
+                    job_args = [account,region]
+                    job_interval = rds_interval
+                    addjob(rds_jobid, job_func, job_args, job_interval)
+                    job_dict = {'id':rds_jobid,'func':job_func,'args':job_args,'minutes':job_interval,
+                                "trigger": "interval","replace_existing": True}
+                    consul_kv.put_kv(f'ConsulManager/jobs/{rds_jobid}',job_dict)
+            else:
+                try:
+                    consul_kv.del_key(f'ConsulManager/jobs/{rds_jobid}')
+                    deljob(rds_jobid)
+                except:
+                    pass
+            return {'code': 20000, 'data': f'{vendor}/{account}/{region}：编辑成功！'}
+api.add_resource(Edit, '/api/edit/<stype>')
diff --git a/flask-consul/views/jms.py b/flask-consul/views/jms.py
index 7e222a9..14da4bf 100644
--- a/flask-consul/views/jms.py
+++ b/flask-consul/views/jms.py
@@ -63,7 +63,7 @@ class Jms(Resource):
                     jms_job = consul_kv.get_value(f'ConsulManager/record/jms/{vendor}/{account}')
                     runtime = jms_job.get('update')
                     count_sync = jms_job.get('count')
-                    nextime = getjob(f'{vendor}/{account}/jms').next_run_time.strftime("%m%d/%H:%M")
+                    nextime = getjob(f'{vendor}/{account}/jms').next_run_time.strftime("%m.%d/%H:%M")
                     sync = True
                 ecs_list.append({'vendor':vendors[vendor],'account':account,'count_linux':count_linux,
                                  'count_win':count_win,'count_mem':f'{count_mem}GB','count_cpu':f'{count_cpu}核',
diff --git a/flask-consul/views/jobs.py b/flask-consul/views/jobs.py
index 3c212b0..5d696d2 100644
--- a/flask-consul/views/jobs.py
+++ b/flask-consul/views/jobs.py
@@ -20,6 +20,9 @@ def init():
 def deljob(jobid):
     Scheduler.remove_job(jobid)
 
+def modjob_interval(jobid,job_interval):
+    Scheduler.modify_job(jobid,trigger='interval',minutes=job_interval)
+
 def addjob(job_id,job_func,job_args,job_interval):
     Scheduler.add_job(id=job_id, func=job_func, args=job_args, trigger='interval',
                       minutes=job_interval, replace_existing=True)
@@ -38,7 +41,7 @@ class Jobs(Resource):
             query_dict['vendor'] = {v : k for k, v in vendors.items()}[query_dict['vendor']]
         query_set = set({k:v for k,v in query_dict.items() if v != ''}.items())
         job_list = list(consul_kv.get_kv_dict(f'ConsulManager/jobs').values())
-        job_run_dict = {job.id:job.next_run_time.strftime("%m%d/%H:%M") for job in Scheduler.get_jobs()}
+        job_run_dict = {job.id:job.next_run_time.strftime("%m.%d/%H:%M") for job in Scheduler.get_jobs()}
         job_count_dict = consul_kv.get_kv_dict('ConsulManager/record/jobs')
         jobs = []
         for i in job_list:
@@ -91,17 +94,17 @@ class Jobs(Resource):
             if record_dict['status'] == 20000:
                 consul_kv.put_kv(f'ConsulManager/jobs/{proj_job_id}',proj_job_dict)
                 for res in restype:
+                    for reg in job_dict['region']:
+                        res_job_id = f"{job_dict['vendor']}/{job_dict['account']}/{res}/{reg}"
+                        res_job_func = f"__main__:{job_dict['vendor']}.{res}"
+                        res_job_args = [job_dict['account'],reg]
+                        res_job_interval = int(job_dict[f'{res}_interval'])
+                        Scheduler.add_job(id=res_job_id, func=res_job_func, args=res_job_args, trigger='interval',
+                                          minutes=res_job_interval, replace_existing=True)
+                        res_job_dict = {'id':res_job_id,'func':res_job_func,'args':res_job_args,'minutes':res_job_interval,
+                                        'trigger': 'interval','replace_existing': True}
 
-                    res_job_id = f"{job_dict['vendor']}/{job_dict['account']}/{res}/{job_dict['region']}"
-                    res_job_func = f"__main__:{job_dict['vendor']}.{res}"
-                    res_job_args = [job_dict['account'],job_dict['region']]
-                    res_job_interval = int(job_dict[f'{res}_interval'])
-                    Scheduler.add_job(id=res_job_id, func=res_job_func, args=res_job_args, trigger='interval',
-                                  minutes=res_job_interval, replace_existing=True)
-                    res_job_dict = {'id':res_job_id,'func':res_job_func,'args':res_job_args,'minutes':res_job_interval,
-                                "trigger": "interval","replace_existing": True}
-
-                    consul_kv.put_kv(f'ConsulManager/jobs/{res_job_id}',res_job_dict)
+                        consul_kv.put_kv(f'ConsulManager/jobs/{res_job_id}',res_job_dict)
             else:
                 Scheduler.remove_job(proj_job_id)
 
diff --git a/flask-consul/views/nodes.py b/flask-consul/views/nodes.py
index c6bd2ea..d2be7cf 100644
--- a/flask-consul/views/nodes.py
+++ b/flask-consul/views/nodes.py
@@ -25,15 +25,19 @@ class Nodes(Resource):
             group_dict = consul_kv.get_value(f'ConsulManager/assets/{cloud}/group/{account}')
             group_list = [{'gid':k,'gname':v}for k,v in group_dict.items()]
             return {'code': 20000,'group':group_list}
-        elif stype == 'ecs':
+        elif stype == 'res':
             if job_id == '' or job_id == None:
-                return {'code': 20000,'ecs_list': [] }
+                return {'code': 20000,'res_list': [] }
             else:
-                return consul_kv.get_ecs_services(job_id) 
+                return consul_kv.get_res_services(job_id) 
         elif stype == 'jobecs':
             jobecs = consul_kv.get_keys_list('ConsulManager/jobs')
             jobecs_list = [i.split('/jobs/')[1] for i in jobecs if '/ecs/' in i]
             return {'code': 20000,'jobecs':jobecs_list}
+        elif stype == 'jobrds':
+            jobrds = consul_kv.get_keys_list('ConsulManager/jobs')
+            jobrds_list = [i.split('/jobs/')[1] for i in jobrds if '/rds/' in i]
+            return {'code': 20000,'jobrds':jobrds_list}
         elif stype == 'ecs_services':
             jobecs = consul_kv.get_keys_list('ConsulManager/jobs')
             jobecs_list = [i.split('/jobs/')[1] for i in jobecs if '/ecs/' in i]
@@ -60,12 +64,12 @@ class Nodes(Resource):
             checked = args['checked']
             cst_ecs_dict = consul_kv.get_kv_dict('ConsulManager/assets/sync_ecs_custom/')
             cst_ecs_keylist = [k.split('/')[-1] for k,v in cst_ecs_dict.items() if v != {}]
-            ecs_info = consul_kv.get_ecs_services(jobecs_name)
+            ecs_info = consul_kv.get_res_services(jobecs_name)
             if checked == 'false':
                 return ecs_info
             else:
-                cst_ecs_list = [i for i in ecs_info['ecs_list'] if i['iid'] in cst_ecs_keylist]
-                return {'code': 20000, 'ecs_list': cst_ecs_list}
+                cst_ecs_list = [i for i in ecs_info['res_list'] if i['iid'] in cst_ecs_keylist]
+                return {'code': 20000, 'res_list': cst_ecs_list}
                 
     def post(self, stype):
         if stype == 'config':
diff --git a/vue-consul/src/api/edit.js b/vue-consul/src/api/edit.js
new file mode 100644
index 0000000..16d3aee
--- /dev/null
+++ b/vue-consul/src/api/edit.js
@@ -0,0 +1,22 @@
+import request from '@/utils/request-ops'
+
+export function getCloud() {
+  return request({
+    url: '/api/edit/cloud',
+    method: 'get'
+  })
+}
+export function findGroup(vendor, account, region) {
+  return request({
+    url: '/api/edit/find',
+    method: 'get',
+    params: { vendor, account, region }
+  })
+}
+export function PostEditJob(editJob) {
+  return request({
+    url: '/api/edit/commit',
+    method: 'post',
+    data: { editJob }
+  })
+}
diff --git a/vue-consul/src/api/node-exporter.js b/vue-consul/src/api/node-exporter.js
index 62ac1ed..946dd33 100644
--- a/vue-consul/src/api/node-exporter.js
+++ b/vue-consul/src/api/node-exporter.js
@@ -32,14 +32,21 @@ export function getGroup(job_id) {
   })
 }
 
-export function getEcsList(job_id) {
+export function getResList(job_id) {
   return request({
-    url: '/api/nodes/ecs',
+    url: '/api/nodes/res',
     method: 'get',
     params: { job_id }
   })
 }
 
+export function getJobRds() {
+  return request({
+    url: '/api/nodes/jobrds',
+    method: 'get'
+  })
+}
+
 export function getJobEcs() {
   return request({
     url: '/api/nodes/jobecs',
diff --git a/vue-consul/src/router/index.js b/vue-consul/src/router/index.js
index 96e2efe..87712e1 100644
--- a/vue-consul/src/router/index.js
+++ b/vue-consul/src/router/index.js
@@ -86,14 +86,14 @@ export const constantRoutes = [
     path: '/nodes',
     component: Layout,
     redirect: '/nodes/jobs',
-    name: '云资源监控',
-    meta: { title: '云资源监控', icon: 'el-icon-shopping-bag-2' },
+    name: '云资源管理',
+    meta: { title: '云资源管理', icon: 'el-icon-shopping-bag-2' },
     children: [
       {
         path: 'jobs',
-        name: '接入数据源',
+        name: '接入云厂商',
         component: () => import('@/views/node-exporter/jobs'),
-        meta: { title: '接入数据源', icon: 'el-icon-school' }
+        meta: { title: '接入云厂商', icon: 'el-icon-school' }
       },
       {
         path: 'exp',
@@ -149,7 +149,7 @@ export const constantRoutes = [
         path: 'rds',
         name: 'RDS',
         component: () => import('@/views/rds/index'),
-        meta: { title: 'MySQL管理', icon: 'el-icon-cpu' },
+        meta: { title: 'MySQL管理', icon: 'el-icon-coin' },
         children: [
           {
             path: 'lists',
@@ -157,12 +157,14 @@ export const constantRoutes = [
             component: () => import('@/views/rds/lists'),
             meta: { title: '云MySQL列表', icon: 'el-icon-cloudy' }
           },
+          /**
           {
             path: 'self',
             name: '自建MySQL管理',
             component: () => import('@/views/rds/self'),
             meta: { title: '自建MySQL管理', icon: 'el-icon-s-platform' }
           },
+          */
           {
             path: 'pconfig',
             name: 'rds-pconfig',
diff --git a/vue-consul/src/views/node-exporter/.jobs.vue.swp b/vue-consul/src/views/node-exporter/.jobs.vue.swp
new file mode 100644
index 0000000000000000000000000000000000000000..8d3810858b56b04da44133016eef4dfa617a925e
GIT binary patch
literal 40960
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

literal 0
HcmV?d00001

diff --git a/vue-consul/src/views/node-exporter/jobs.vue b/vue-consul/src/views/node-exporter/jobs.vue
index c396b10..c7b24bb 100644
--- a/vue-consul/src/views/node-exporter/jobs.vue
+++ b/vue-consul/src/views/node-exporter/jobs.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-alert type="success" center close-text="知道了">
+    <el-alert type="success" center close-text="朕知道了">
       <el-link icon="el-icon-warning" type="success" href="https://github.com/starsliao/ConsulManager/blob/main/docs/ECS%E4%B8%BB%E6%9C%BA%E7%9B%91%E6%8E%A7.md" target="_blank">应用场景：如何优雅的使用Consul管理ECS主机监控</el-link>
     </el-alert>
     <el-select v-model="query.vendor" placeholder="云厂商" clearable style="width: 150px" class="filter-item" @change="fetchData(query)">
@@ -16,8 +16,11 @@
     <el-tooltip class="item" effect="light" content="清空查询条件" placement="top">
       <el-button class="filter-item" style="margin-left: 10px;" type="info" icon="el-icon-delete" circle @click="resetData" />
     </el-tooltip>
-    <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="handleCreate">
-      新增同步源
+    <el-button class="filter-item" type="primary" icon="el-icon-s-promotion" @click="handleCreate">
+      新增云资源
+    </el-button>
+    <el-button class="filter-item" type="warning" icon="el-icon-edit" @click="handleEdit">
+      编辑云资源
     </el-button>
     <div style="float: right;">
       <el-tooltip class="item" effect="light" content="刷新当前页面" placement="top">
@@ -31,7 +34,7 @@
       <el-table-column prop="account" label="账户" sortable align="center" />
       <el-table-column prop="itype" label="资源" sortable align="center">
         <template slot-scope="{row}">
-          <div v-if="row.itype === 'ecs'" slot="reference" class="name-wrapper">
+          <div v-if="row.itype !== 'group'" slot="reference" class="name-wrapper">
             <el-tag size="medium">{{ row.itype.toUpperCase() }}</el-tag>
           </div>
           <div v-else>
@@ -43,7 +46,7 @@
       <el-table-column prop="count" label="资源数" sortable align="center">
         <template slot-scope="{row}">
           <span style="font-weight:bold">{{ row.count }} </span>
-          <el-tooltip v-if="row.itype === 'ecs'" style="diaplay:inline" effect="dark" placement="top">
+          <el-tooltip v-if="row.itype !== 'group'" style="diaplay:inline" effect="dark" placement="top">
             <div slot="content"> 开机：{{ row.on }}，关机：{{ row.off }} </div>
             <i class="el-icon-info" />
           </el-tooltip>
@@ -82,10 +85,10 @@
       </el-table>
     </el-dialog>
 
-    <el-dialog title="新增同步源" :visible.sync="newFormVisible" width="40%">
+    <el-dialog title="新增云资源" :visible.sync="newFormVisible" width="40%">
       <el-form ref="dataForm" :rules="rules" :model="ecsJob" label-position="right" label-width="auto" style="width: 90%; margin-left: 1px;">
         <el-form-item label="云厂商" prop="vendor">
-          <el-select v-model="ecsJob.vendor" placeholder="请选择" @change="ecsJob.region=''">
+          <el-select v-model="ecsJob.vendor" placeholder="请选择" @change="ecsJob.region=[]">
             <el-option v-for="item in vendors" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -107,7 +110,7 @@
           <el-input v-model="ecsJob.sk" placeholder="请输入AccessKey Secret" show-password />
         </el-form-item>
         <el-form-item label="区域" prop="region">
-          <el-select v-model="ecsJob.region" placeholder="请选择">
+          <el-select v-model="ecsJob.region" filterable multiple collapse-tags placeholder="请选择">
             <el-option v-for="item in regions[ecsJob.vendor]" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
@@ -116,7 +119,7 @@
           <el-checkbox-group v-model="restype">
             <el-checkbox label="group" disabled>分组</el-checkbox>
             <el-checkbox label="ecs">ECS</el-checkbox>
-            <el-checkbox label="rds">RDS</el-checkbox>
+            <el-checkbox label="rds">MySQL</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
 
@@ -134,7 +137,7 @@
         <el-form-item v-if="restype.includes('ecs')" label="ECS同步间隔(分钟)" prop="ecs_interval">
           <el-input v-model="ecsJob.ecs_interval" />
         </el-form-item>
-        <el-form-item v-if="restype.includes('rds')" label="RDS同步间隔(分钟)" prop="rds_interval">
+        <el-form-item v-if="restype.includes('rds')" label="MySQL同步间隔(分钟)" prop="rds_interval">
           <el-input v-model="ecsJob.rds_interval" />
         </el-form-item>
       </el-form>
@@ -152,6 +155,72 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="编辑云资源" :visible.sync="editFormVisible" width="40%">
+      <el-form ref="dataForm" :rules="rules" :model="editJob" label-position="right" label-width="auto" style="width: 90%; margin-left: 1px;">
+        <el-form-item label="云厂商" prop="vendor">
+          <el-select v-model="editJob.vendor" placeholder="请选择" @change="editJob.region=[];editJob.account=''">
+            <el-option v-for="item in vendors" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="账户" prop="account">
+          <el-select v-model="editJob.account" placeholder="请选择" @change="editJob.akskswitch=false;editJob.region=''">
+            <el-option v-for="item in cloud_dict[editJob.vendor]" :key="item" :label="item" :value="item" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="修改密钥">
+          <el-switch v-model="editJob.akskswitch" />
+        </el-form-item>
+        <el-form-item v-if="editJob.akskswitch" label="Access Key" prop="ak">
+          <el-input v-model="editJob.ak" placeholder="请输AccessKey ID" />
+        </el-form-item>
+        <el-form-item v-if="editJob.akskswitch" label="Secret Key" prop="sk">
+          <el-input v-model="editJob.sk" placeholder="请输入AccessKey Secret" show-password />
+        </el-form-item>
+
+        <el-form-item label="区域" prop="region">
+          <el-select v-model="editJob.region" filterable placeholder="请选择" @change="fetchGroup(editJob.vendor, editJob.account, editJob.region)">
+            <el-option v-for="item in regions[editJob.vendor]" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="资源类型">
+          <el-checkbox-group v-model="editJob.restype">
+            <el-checkbox label="group" disabled>分组</el-checkbox>
+            <el-checkbox label="ecs">ECS</el-checkbox>
+            <el-checkbox label="rds">MySQL</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+
+        <el-form-item prop="proj_interval">
+          <span slot="label">
+            <span class="span-box">
+              <span>分组同步间隔(分钟)</span>
+              <el-tooltip style="diaplay:inline" effect="dark" content="分组是采集云厂商用于资源分组的字段，阿里云：资源组，华为云：企业项目，腾讯云：所属项目。请在创建云主机时设置好属组。" placement="top">
+                <i class="el-icon-info" />
+              </el-tooltip>
+            </span>
+          </span>
+          <el-input v-model="editJob.proj_interval" />
+        </el-form-item>
+        <el-form-item v-if="editJob.restype.includes('ecs')" label="ECS同步间隔(分钟)" prop="ecs_interval">
+          <el-input v-model="editJob.ecs_interval" />
+        </el-form-item>
+        <el-form-item v-if="editJob.restype.includes('rds')" label="MySQL同步间隔(分钟)" prop="rds_interval">
+          <el-input v-model="editJob.rds_interval" />
+        </el-form-item>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editFormVisible = false">
+          取消
+        </el-button>
+        <el-button type="primary" @click="editData(editJob)">
+          确认
+        </el-button>
+      </div>
+    </el-dialog>
+
     <el-dialog title="更新同步间隔" :visible.sync="upFormVisible" width="30%">
       <el-form ref="dataForm" :rules="rules" :model="upjob" label-position="right" label-width="130px" style="margin-left: 20px;">
         <el-form-item label="同步间隔(分钟)" prop="interval">
@@ -172,6 +241,7 @@
 
 <script>
 import { getAllJobs, PostJob, DelJob, getGroup } from '@/api/node-exporter'
+import { getCloud, findGroup, PostEditJob } from '@/api/edit'
 export default {
   data() {
     const validateInput = (rule, value, callback) => {
@@ -202,8 +272,7 @@ export default {
           { validator: validateInput, trigger: ['blur', 'change'] }],
         sk: [{ required: true, message: '此为必填项', trigger: 'change' },
           { validator: validateInput, trigger: ['blur', 'change'] }],
-        region: [{ required: true, message: '此为必填项', trigger: 'blur' },
-          { validator: validateInput, trigger: ['blur'] }],
+        region: [{ required: true, message: '此为必填项', trigger: 'blur' }],
         proj_interval: [{ required: true, message: '此为必填项', trigger: 'change' },
           { validator: validateInput, trigger: ['blur', 'change'] }],
         ecs_interval: [{ required: true, message: '此为必填项', trigger: 'change' },
@@ -257,10 +326,13 @@ export default {
         ]
       },
 
-      ecsJob: { vendor: '', ak: '', sk: '', region: '', account: '', proj_interval: 60, ecs_interval: 5, rds_interval: 5 },
+      ecsJob: { vendor: '', ak: '', sk: '', region: [], account: '', proj_interval: 60, ecs_interval: 5, rds_interval: 5 },
+      editJob: { restype: ['group'] },
+      cloud_dict: {},
       upjob: { jobid: '', interval: '' },
       newFormVisible: false,
       upFormVisible: false,
+      editFormVisible: false,
       entFormVisible: false
     }
   },
@@ -280,6 +352,8 @@ export default {
     tableRowClassName({ row }) {
       if (row.itype === 'ecs') {
         return 'success-row'
+      } else if (row.itype === 'rds') {
+        return 'warning-row'
       }
       return ''
     },
@@ -297,8 +371,26 @@ export default {
         this.listLoading = false
       })
     },
+
+    fetchGroup(vendor, account, region) {
+      this.listLoading = true
+      findGroup(vendor, account, region).then(response => {
+        this.editJob.restype = response.restype
+        this.editJob.proj_interval = response.interval.proj_interval
+        this.editJob.ecs_interval = response.interval.ecs_interval
+        this.editJob.rds_interval = response.interval.rds_interval
+        this.listLoading = false
+      })
+    },
+    handleEdit() {
+      this.editJob = { vendor: '', akskswitch: false, ak: '', sk: '', region: '', account: '', restype: ['group'], proj_interval: 60, ecs_interval: 5, rds_interval: 5 }
+      getCloud().then(response => {
+        this.cloud_dict = response.cloud_dict
+      })
+      this.editFormVisible = true
+    },
     handleCreate() {
-      this.ecsJob = { vendor: '', ak: '', sk: '', region: '', account: '', proj_interval: 60, ecs_interval: 5, rds_interval: 5 }
+      this.ecsJob = { vendor: '', ak: '', sk: '', region: [], account: '', proj_interval: 60, ecs_interval: 5, rds_interval: 5 }
       this.ecsJob.account = this.query.account
       this.newFormVisible = true
     },
@@ -322,6 +414,21 @@ export default {
         }
       })
     },
+    editData(editJob) {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          this.editFormVisible = false
+          this.listLoading = true
+          PostEditJob(editJob).then(response => {
+            this.fetchData()
+            this.$message({
+              message: response.data,
+              type: 'success'
+            })
+          })
+        }
+      })
+    },
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
@@ -335,7 +442,7 @@ export default {
               message: response.data,
               type: 'success'
             })
-            this.ecsJob.region = ''
+            this.ecsJob.region = []
           })
         }
       })
@@ -408,4 +515,7 @@ export default {
   .el-table .success-row {
     background: #f0f9eb;
   }
+  .el-table .warning-row {
+    background: oldlace;
+  }
 </style>
diff --git a/vue-consul/src/views/node-exporter/lists.vue b/vue-consul/src/views/node-exporter/lists.vue
index 65fab37..35a3b13 100644
--- a/vue-consul/src/views/node-exporter/lists.vue
+++ b/vue-consul/src/views/node-exporter/lists.vue
@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import { getEcsList, getJobEcs, postCstEcs, getCstEcsConfig, getCstEcsList } from '@/api/node-exporter'
+import { getResList, getJobEcs, postCstEcs, getCstEcsConfig, getCstEcsList } from '@/api/node-exporter'
 export default {
   data() {
     return {
@@ -100,7 +100,7 @@ export default {
     cstEcsList(jobecs_name, checked) {
       this.listLoading = true
       getCstEcsList(jobecs_name, checked).then(response => {
-        this.ecs_list = response.ecs_list
+        this.ecs_list = response.res_list
         this.listLoading = false
       })
     },
@@ -136,8 +136,8 @@ export default {
     fetchEcs(job_id) {
       this.checked = false
       this.listLoading = true
-      getEcsList(job_id).then(response => {
-        this.ecs_list = response.ecs_list
+      getResList(job_id).then(response => {
+        this.ecs_list = response.res_list
         this.listLoading = false
       })
     }
diff --git a/vue-consul/src/views/rds/.lists.vue.swp b/vue-consul/src/views/rds/.lists.vue.swp
deleted file mode 100644
index 0ee9a00c050b9c5895ef4f6ddf94f5d3dc45d14e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/vue-consul/src/views/rds/lists.vue b/vue-consul/src/views/rds/lists.vue
index c55b577..ad8bf89 100644
--- a/vue-consul/src/views/rds/lists.vue
+++ b/vue-consul/src/views/rds/lists.vue
@@ -1,44 +1,18 @@
 <template>
   <div class="app-container">
-    <el-select v-model="jobecs_name" placeholder="请选择需要查询的云MySQL列表" filterable collapse-tags clearable style="width: 350px" class="filter-item" @change="fetchEcs(jobecs_name)">
-      <el-option v-for="item in jobecs_list" :key="item" :label="item" :value="item" />
+    <el-select v-model="jobrds_name" placeholder="请选择需要查询的云MySQL列表" filterable collapse-tags clearable style="width: 350px" class="filter-item" @change="fetchRds(jobrds_name)">
+      <el-option v-for="item in jobrds_list" :key="item" :label="item" :value="item" />
     </el-select>
-    <el-checkbox v-model="checked" style="margin-left: 10px;" label="仅显示修改过的" border @change="cstEcsList(jobecs_name,checked)" />
-    <el-tooltip class="item" effect="light" content="刷新当前ECS列表" placement="top">
-      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-refresh" circle @click="fetchEcs(jobecs_name)" />
+    <el-tooltip class="item" effect="light" content="刷新当前RDS列表" placement="top">
+      <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-refresh" circle @click="fetchRds(jobrds_name)" />
     </el-tooltip>
     <div style="float: right;margin-left: 10px;">
       <el-input v-model="iname" prefix-icon="el-icon-search" placeholder="请输入名称、实例或实例ID进行筛选" clearable style="width: 300px" class="filter-item" />
     </div>
-    <el-dialog title="自定义实例信息" :visible.sync="dialogFormVisible" width="45%">
-      <el-form ref="dataForm" :model="cst_ecs" label-position="right" label-width="auto" style="width: 90%; margin-left: 20px;">
-        <el-form-item label="自定义端口">
-          <el-switch v-model="cst_ecs.portswitch" />
-        </el-form-item>
-        <el-form-item v-if="cst_ecs.portswitch" required label="端口：">
-          <el-input v-model="cst_ecs.port" />
-        </el-form-item>
-        <el-form-item label="自定义IP">
-          <el-switch v-model="cst_ecs.ipswitch" />
-        </el-form-item>
-        <el-form-item v-if="cst_ecs.ipswitch" required label="IP：">
-          <el-input v-model="cst_ecs.ip" />
-        </el-form-item>
-        <font size="3px" color="#ff0000">如需恢复同步该实例的IP端口信息，请关闭开启的自定义选项后，再同步一次所属数据源。</font>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">
-          取消
-        </el-button>
-        <el-button type="primary" @click="createData">
-          确认
-        </el-button>
-      </div>
-    </el-dialog>
 
     <el-table
       v-loading="listLoading"
-      :data="ecs_list.filter(data => !iname || (data.name.toLowerCase().includes(iname.toLowerCase()) || data.instance.toLowerCase().includes(iname.toLowerCase()) || data.iid.toLowerCase().includes(iname.toLowerCase())))"
+      :data="rds_list.filter(data => !iname || (data.name.toLowerCase().includes(iname.toLowerCase()) || data.instance.toLowerCase().includes(iname.toLowerCase()) || data.iid.toLowerCase().includes(iname.toLowerCase())))"
       :default-sort="{ prop: 'exp', order: 'ascending' }"
       border
       fit
@@ -48,96 +22,66 @@
       <el-table-column type="index" align="center" />
       <el-table-column prop="group" label="分组" sortable align="center" width="150" show-overflow-tooltip />
       <el-table-column prop="name" label="名称" sortable align="center" width="220" show-overflow-tooltip />
-      <el-table-column prop="instance" label="实例" sortable align="center" width="180" />
-      <el-table-column prop="os" label="系统" sortable align="center" width="100" />
-      <el-table-column prop="cpu" label="CPU" sortable align="center" width="80" />
-      <el-table-column prop="mem" label="内存" sortable align="center" width="80" />
-      <el-table-column prop="exp" label="到期日" sortable align="center" width="120" />
-      <el-table-column prop="iid" label="实例ID" sortable align="center" />
-      <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
+      <el-table-column prop="instance" label="实例" sortable align="center" width="180">
         <template slot-scope="{row}">
-          <el-button type="primary" size="mini" @click="handleUpdate(row.iid)">
-            自定义实例
-          </el-button>
+          <span style="font-weight:bold">{{ row.instance }} </span>
+          <el-tooltip style="diaplay:inline" effect="dark" placement="top">
+            <div slot="content"> 域名：{{ row.domain }}</div>
+            <i class="el-icon-info" />
+          </el-tooltip>
         </template>
       </el-table-column>
+      <el-table-column prop="ver" label="版本" sortable align="center" width="80" />
+      <el-table-column prop="cpu" label="CPU" sortable align="center" width="80" />
+      <el-table-column prop="mem" label="内存" sortable align="center" width="80" />
+      <el-table-column prop="disk" label="磁盘" sortable align="center" width="80" />
+      <el-table-column prop="exp" label="到期日" sortable align="center" width="120" />
+      <el-table-column prop="iid" label="实例ID" sortable align="center" />
     </el-table>
   </div>
 </template>
 
 <script>
-import { getEcsList, getJobEcs, postCstEcs, getCstEcsConfig, getCstEcsList } from '@/api/node-exporter'
+import { getResList, getJobRds } from '@/api/node-exporter'
 export default {
   data() {
     return {
       listLoading: false,
       dialogFormVisible: false,
       checked: false,
-      jobecs_name: '',
+      jobrds_name: '',
       iname: '',
-      jobecs_list: [],
-      ecs_list: [],
-      cst_ecs: { iid: '', portswitch: false, ipswitch: false, port: '', ip: '' }
+      jobrds_list: [],
+      rds_list: []
     }
   },
   created() {
-    getJobEcs().then(response => {
-      this.jobecs_list = response.jobecs
+    getJobRds().then(response => {
+      this.jobrds_list = response.jobrds
       if (this.$route.query.job_id) {
-        this.fetchEcs(this.$route.query.job_id)
+        this.fetchRds(this.$route.query.job_id)
       } else {
-        this.jobecs_name = this.jobecs_list[0]
-        this.fetchEcs(this.jobecs_name)
+        this.jobrds_name = this.jobrds_list[0]
+        this.fetchRds(this.jobrds_name)
       }
     })
   },
   mounted() {
     if (this.$route.query.job_id) {
-      this.jobecs_name = this.$route.query.job_id
+      this.jobrds_name = this.$route.query.job_id
     }
   },
   methods: {
-    cstEcsList(jobecs_name, checked) {
-      this.listLoading = true
-      getCstEcsList(jobecs_name, checked).then(response => {
-        this.ecs_list = response.ecs_list
-        this.listLoading = false
+    fetchJobRds() {
+      getJobRds().then(response => {
+        this.jobrds_list = response.jobrds
       })
     },
-    handleUpdate(iid) {
-      this.listLoading = true
-      this.dialogFormVisible = true
-      getCstEcsConfig(iid).then(response => {
-        this.cst_ecs = response.cst_ecs
-        this.listLoading = false
-        this.dialogFormVisible = true
-      })
-    },
-    createData() {
-      this.$refs['dataForm'].validate((valid) => {
-        if (valid) {
-          this.dialogFormVisible = false
-          this.listLoading = true
-          postCstEcs(this.cst_ecs).then(response => {
-            this.fetchEcs(this.jobecs_name)
-            this.$message({
-              message: response.data,
-              type: 'success'
-            })
-          })
-        }
-      })
-    },
-    fetchJobEcs() {
-      getJobEcs().then(response => {
-        this.jobecs_list = response.jobecs
-      })
-    },
-    fetchEcs(job_id) {
+    fetchRds(job_id) {
       this.checked = false
       this.listLoading = true
-      getEcsList(job_id).then(response => {
-        this.ecs_list = response.ecs_list
+      getResList(job_id).then(response => {
+        this.rds_list = response.res_list
         this.listLoading = false
       })
     }