Commit 0cce3fa7 by zhaihuitao

update

parent 72564928
......@@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="d0064643-2990-4ed3-bfb0-875849b30f4e" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/envcfg.py" afterPath="$PROJECT_DIR$/config/envcfg.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -67,16 +68,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_startup.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_startup.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="45" lean-forward="true" selection-start-line="12" selection-start-column="45" selection-end-line="12" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tokenTest.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
......@@ -89,33 +80,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_batchUpload.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_batchUpload.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding>
<element signature="e#108#123#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/__init__.py">
<file leaf-file-name="baseEvent.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<state relative-caret-position="352">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_install.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_install.py">
<file leaf-file-name="test_adshow.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<state relative-caret-position="240">
<caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding />
</state>
</provider>
......@@ -124,8 +103,8 @@
<file leaf-file-name="test_adclick.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<state relative-caret-position="240">
<caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding />
</state>
</provider>
......@@ -141,23 +120,41 @@
</provider>
</entry>
</file>
<file leaf-file-name="test_custom.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_custom.py">
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<folding>
<element signature="e#102#117#0" expanded="true" />
</folding>
<state relative-caret-position="330">
<caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="envcfg.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<file leaf-file-name="click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="25" column="28" lean-forward="false" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<state relative-caret-position="352">
<caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="test_click.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -215,8 +212,8 @@
<option value="$PROJECT_DIR$/testcase/android_events/tokenTest.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_install.py" />
<option value="$PROJECT_DIR$/config/prod/params.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
<option value="$PROJECT_DIR$/testcase/android_events/test_adclick.py" />
<option value="$PROJECT_DIR$/config/envcfg.py" />
</list>
</option>
</component>
......@@ -940,7 +937,14 @@
<option name="project" value="LOCAL" />
<updated>1598860679221</updated>
</task>
<option name="localTasksCounter" value="40" />
<task id="LOCAL-00040" summary="update">
<created>1598860695945</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1598860695945</updated>
</task>
<option name="localTasksCounter" value="41" />
<servers />
</component>
<component name="TestHistory">
......@@ -1035,6 +1039,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="27" column="13" lean-forward="true" selection-start-line="24" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1042,6 +1047,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
......@@ -1049,6 +1055,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7260">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1098,6 +1105,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110">
<caret line="74" column="13" lean-forward="false" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1119,6 +1127,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1110">
<caret line="74" column="13" lean-forward="true" selection-start-line="74" selection-start-column="13" selection-end-line="74" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
......@@ -1190,13 +1199,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/common/yamlUtil.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
......@@ -1218,20 +1220,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file:///anaconda3/lib/python3.6/site-packages/xlwings/constants.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
......@@ -1254,13 +1242,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_payment.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="322">
......@@ -1289,13 +1270,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="26" lean-forward="true" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_pageduration.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
......@@ -1321,7 +1295,7 @@
<state relative-caret-position="120">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="12" selection-end-column="44" />
<folding>
<element signature="e#102#117#0" expanded="true" />
<element signature="e#102#117#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1339,7 +1313,7 @@
<state relative-caret-position="105">
<caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<folding>
<element signature="e#108#123#0" expanded="true" />
<element signature="e#108#123#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1360,6 +1334,24 @@
</state>
</provider>
</entry>
<entry file="file:///anaconda3/lib/python3.6/site-packages/requests/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="372" column="0" lean-forward="false" selection-start-line="372" selection-start-column="0" selection-end-line="372" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/tokenTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
......@@ -1370,36 +1362,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/baseEvent.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="21" column="19" lean-forward="true" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<state relative-caret-position="352">
<caret line="487" column="13" lean-forward="false" selection-start-line="487" selection-start-column="13" selection-end-line="487" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file:///anaconda3/lib/python3.6/site-packages/requests/models.py">
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adshow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="127">
<caret line="372" column="0" lean-forward="false" selection-start-line="372" selection-start-column="0" selection-end-line="372" selection-end-column="0" />
<state relative-caret-position="240">
<caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/prod/params.py">
<entry file="file://$PROJECT_DIR$/testcase/android_click/click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18">
<caret line="10" column="29" lean-forward="false" selection-start-line="10" selection-start-column="29" selection-end-line="10" selection-end-column="29" />
<folding>
<element signature="e#97#108#0" expanded="true" />
</folding>
<state relative-caret-position="352">
<caret line="109" column="0" lean-forward="false" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_click/test_click.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="352">
<caret line="62" column="0" lean-forward="false" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcase/android_events/test_adclick.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="20" column="26" lean-forward="false" selection-start-line="20" selection-start-column="26" selection-end-line="20" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/envcfg.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="131">
<caret line="25" column="28" lean-forward="false" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<state relative-caret-position="330">
<caret line="25" column="28" lean-forward="true" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
<folding />
</state>
</provider>
......
......@@ -19,8 +19,8 @@ prod = {
"appkey": "9b17c1568c3ce34599c5fd2778483ff9"
},
"events": {
# "url": "http://tlog.trackingio.com/receive/tkio/",
"url": "http://10.3.20.42:8080",
"url": "http://tlog.trackingio.com/receive/tkio/",
# "url": "http://10.3.20.42:8080",
"interface": "/receive/tkiov2/install",
"appkey": "b58f29d64718c6723895cb8a2389258c",
"adclick": "adclick"
......
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