up

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')

plugins/migration_api/js/app.js

@@ -92,24 +92,40 @@ function initStep2(){
                 $('.psync_info').hide();
 
                 var info = rdata.data;
-                
+
                 var body = '<div class="divtable">\
                     <table class="table table-hover">\
                     <thead>\
                         <tr><th style="border-right:1px solid #ddd">服务</th><th>当前服务器</th><th>远程服务器</th></tr>\
                     </thead>\
                     <tbody>\
-                        <tr><td style="border-right:1px solid #ddd">网站服务</td><td>'+info['local']['webserver']+'</td><td>OpenResty</td></tr>\
-                        <tr><td style="border-right:1px solid #ddd">安装MySQL</td><td>'+(info['local']['mysql']?'是':'否')+'</td><td>是</td></tr>\
-                        <tr><td style="border-right:1px solid #ddd">安装PHP</td><td>'+info['local']['php'].join('/')+'</td><td>74</td></tr>\
-                        <tr><td style="border-right:1px solid #ddd">可用磁盘</td><td>'+info['local']['disk']+'</td><td>54GB</td></tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">网站服务</td>\
+                            <td>'+info['local']['webserver']+'</td>\
+                            <td>'+info['remote']['webserver']+'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">安装MySQL</td>\
+                            <td>'+(info['local']['mysql']?'是':'否')+'</td>\
+                            <td>'+(info['remote']['mysql']?'是':'否')+'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">安装PHP</td>\
+                            <td>'+(info['local']['php'].join('/'))+'</td>\
+                            <td>'+(info['remote']['php'].join('/')) +'</td>\
+                        </tr>\
+                        <tr>\
+                            <td style="border-right:1px solid #ddd">可用磁盘</td>\
+                            <td>'+info['local']['disk']+'</td>\
+                            <td>'+info['remote']['disk'][0]['size'][0]+'</td>\
+                        </tr>\
                     </tbody>\
                     </table>\
                     </div>';
                 body += '<div class="line mtb20" style="text-align: left;">\
                     <button class="btn btn-default btn-sm mr20 pathTestting">重新检测</button>\
                     <button class="btn btn-default btn-sm mr20 pathBcak">上一步</button>\
-                    <button class="btn btn-success btn-sm psync-next pathNext" disabled="disabled">下一步</button>\
+                    <button class="btn btn-success btn-sm psync-next pathNext">下一步</button>\
                 </div>';
 
                 $('.psync_path').html(body);