Commit 2c4cd242 by lei

1

parent 0d4d5cb6
...@@ -5,20 +5,9 @@ ...@@ -5,20 +5,9 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="69cbe23c-d853-4b51-b873-06f85f1d3199" name="变更" comment=""> <list default="true" id="69cbe23c-d853-4b51-b873-06f85f1d3199" name="变更" comment="">
<change afterPath="$PROJECT_DIR$/Vmlogin.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/download_img.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Vmlogin.py" beforeDir="false" afterPath="$PROJECT_DIR$/Vmlogin.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/Img_Ai.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/python-demo.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/ai_pyppeteer.py" beforeDir="false" afterPath="$PROJECT_DIR$/ai_pyppeteer.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ai_pyppeteer.py" beforeDir="false" afterPath="$PROJECT_DIR$/ai_pyppeteer.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bit_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/bit_api.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/bit_selenium.py" beforeDir="false" afterPath="$PROJECT_DIR$/bit_selenium.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gpt.py" beforeDir="false" afterPath="$PROJECT_DIR$/gpt.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -75,27 +64,6 @@ ...@@ -75,27 +64,6 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration default="true" type="PythonConfigurationType" factoryName="Python">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="ai_pyppeteer" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true"> <configuration name="ai_pyppeteer" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
<module name="python-demo" /> <module name="python-demo" />
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
...@@ -180,81 +148,6 @@ ...@@ -180,81 +148,6 @@
<option name="INPUT_FILE" value="" /> <option name="INPUT_FILE" value="" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration default="true" type="Tox" factoryName="Tox">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<method v="2" />
</configuration>
<configuration default="true" type="docs" factoryName="Docutils task">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="docutils_input_file" value="" />
<option name="docutils_output_file" value="" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="" />
<option name="docutils_open_in_browser" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="docs" factoryName="Sphinx task">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="docutils_input_file" value="" />
<option name="docutils_output_file" value="" />
<option name="docutils_params" value="" />
<option name="docutils_task" value="" />
<option name="docutils_open_in_browser" value="false" />
<method v="2" />
</configuration>
<configuration default="true" type="tests" factoryName="Autodetect">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method v="2" />
</configuration>
<configuration default="true" type="tests" factoryName="Doctests">
<module name="Img_Ai" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="" />
<option name="CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="FOLDER_NAME" value="" />
<option name="TEST_TYPE" value="TEST_SCRIPT" />
<option name="PATTERN" value="" />
<option name="USE_PATTERN" value="false" />
<method v="2" />
</configuration>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Python.ai_pyppeteer" /> <item itemvalue="Python.ai_pyppeteer" />
......
...@@ -73,6 +73,7 @@ class VmLogin: ...@@ -73,6 +73,7 @@ class VmLogin:
url = self.get_local_url(f'/profile/start?profileId={profile_id}') url = self.get_local_url(f'/profile/start?profileId={profile_id}')
text = requests.get(url).json() text = requests.get(url).json()
if text['status'] == 'ERROR': if text['status'] == 'ERROR':
logger.info(text)
return '' return ''
return ('' + text['value']).replace("http://127.0.0.1:", "") return ('' + text['value']).replace("http://127.0.0.1:", "")
......
...@@ -378,8 +378,10 @@ class ToWork: ...@@ -378,8 +378,10 @@ class ToWork:
else: else:
url = f'http://127.0.0.1:{proxy}/json/version' url = f'http://127.0.0.1:{proxy}/json/version'
logger.info(url) logger.info(url)
ws = requests.get(url).json()
logger.info(ws)
browser = await pyppeteer.connect({ browser = await pyppeteer.connect({
"browserWSEndpoint": requests.get(url).json()['webSocketDebuggerUrl'], "browserWSEndpoint": ws['webSocketDebuggerUrl'],
'args': [ 'args': [
'--window-size=1536,824', '--window-size=1536,824',
'--start-maximized', '--start-maximized',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment