diff --git a/plugins/migration_api/index.py b/plugins/migration_api/index.py index 1df637b19..3b440b278 100755 --- a/plugins/migration_api/index.py +++ b/plugins/migration_api/index.py @@ -212,7 +212,8 @@ def get_src_config(args): diskInfo = psutil.disk_usage('/www') except: diskInfo = psutil.disk_usage('/') - serverInfo['disk'] = diskInfo[2] + + serverInfo['disk'] = mw.toSize(diskInfo[2]) return serverInfo @@ -222,15 +223,32 @@ def get_dst_config(args): api = classApi(data['url'], data['token']) disk = api.send('/system/disk_info', {}) info = api.send('/system/get_env_info', {}) - print(disk) - print(info) + + result = info['data'] + + result['disk'] = disk + return result def stepTwo(): data = {} data['local'] = get_src_config(None) data['remote'] = get_dst_config(None) + return mw.returnJson(True, 'ok', data) + + +def get_src_info(args): + # 获取本地服务器网站、数据库. + data = {} + data['sites'] = mw.M('sites').field( + "id,name,path,ps,status,addtime").order("id desc").select() + data['databases'] = mw.M('databases').field( + 'id,name,ps').order("id desc").select() + return data + +def stepThree(): + data = get_src_info(None) return mw.returnJson(True, 'ok', data) if __name__ == "__main__": @@ -247,5 +265,7 @@ if __name__ == "__main__": print(stepOne()) elif func == 'step_two': print(stepTwo()) + elif func == 'step_three': + print(stepThree()) else: print('error') diff --git a/plugins/migration_api/js/app.js b/plugins/migration_api/js/app.js index 166f194c5..1f0927181 100755 --- a/plugins/migration_api/js/app.js +++ b/plugins/migration_api/js/app.js @@ -92,24 +92,40 @@ function initStep2(){ $('.psync_info').hide(); var info = rdata.data; - + var body = '
服务 | 当前服务器 | 远程服务器 |
---|---|---|
网站服务 | '+info['local']['webserver']+' | OpenResty |
安装MySQL | '+(info['local']['mysql']?'是':'否')+' | 是 |
安装PHP | '+info['local']['php'].join('/')+' | 74 |
可用磁盘 | '+info['local']['disk']+' | 54GB |
网站服务 | \ +'+info['local']['webserver']+' | \ +'+info['remote']['webserver']+' | \ +
安装MySQL | \ +'+(info['local']['mysql']?'是':'否')+' | \ +'+(info['remote']['mysql']?'是':'否')+' | \ +
安装PHP | \ +'+(info['local']['php'].join('/'))+' | \ +'+(info['remote']['php'].join('/')) +' | \ +
可用磁盘 | \ +'+info['local']['disk']+' | \ +'+info['remote']['disk'][0]['size'][0]+' | \ +