diff --git a/jcloud/api/aliyun_server_light.py b/jcloud/api/aliyun_server_light.py index 605db08..e403325 100644 --- a/jcloud/api/aliyun_server_light.py +++ b/jcloud/api/aliyun_server_light.py @@ -1559,7 +1559,7 @@ def get_password(pagetype, name, fieldname): return jingrow.get_pg(pagetype, name).get_password(fieldname) @jingrow.whitelist() -def install_jsite(instance_id, site_name, git_repo, site_url, revalidate_token, server_url, api_key, api_secret, region_id='cn-shanghai'): +def install_jsite(instance_id, site_name, git_repo, site_url, revalidate_token, jingrow_server_url, jingrow_api_key, jingrow_api_secret, region_id='cn-shanghai'): """在实例上安装Jsite前端""" try: # 验证实例ID是否存在 @@ -1572,7 +1572,7 @@ def install_jsite(instance_id, site_name, git_repo, site_url, revalidate_token, region_id = server.region # 构建命令内容 - command_content = 'curl -s -o /tmp/install_jsite.sh https://cloud.jingrow.com//files/install_jsite.sh && chmod +x /tmp/install_jsite.sh && /tmp/install_jsite.sh --site-name {{site_name}} --git-repo {{git_repo}} --site-url {{site_url}} --revalidate-token {{revalidate_token}} --server-url {{server_url}} --api-key {{api_key}} --api-secret {{api_secret}}' + command_content = 'curl -s -o /tmp/install_jsite.sh https://cloud.jingrow.com//files/install_jsite.sh && chmod +x /tmp/install_jsite.sh && /tmp/install_jsite.sh --site-name {{site_name}} --git-repo {{git_repo}} --site-url {{site_url}} --revalidate-token {{revalidate_token}} --server-url {{jingrow_server_url}} --api-key {{jingrow_api_key}} --api-secret {{jingrow_api_secret}}' # 构建参数 parameters = { @@ -1580,9 +1580,9 @@ def install_jsite(instance_id, site_name, git_repo, site_url, revalidate_token, 'git_repo': git_repo, 'site_url': site_url, 'revalidate_token': revalidate_token, - 'server_url': server_url, - 'api_key': api_key, - 'api_secret': api_secret + 'jingrow_server_url': jingrow_server_url, + 'jingrow_api_key': jingrow_api_key, + 'jingrow_api_secret': jingrow_api_secret } manager = _get_manager()