...
|
...
|
@@ -2,8 +2,7 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/extra/wechat.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/wechat.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/admin/controller/Pay.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Pay.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -29,20 +28,20 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
|
|
|
<state relative-caret-position="34">
|
|
|
<caret line="25" column="19" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="487">
|
|
|
<caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" />
|
|
|
<state relative-caret-position="623">
|
|
|
<caret line="59" column="6" lean-forward="true" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -124,8 +123,8 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
|
|
|
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -342,7 +341,7 @@ |
|
|
<workItem from="1572087949120" duration="1641000" />
|
|
|
<workItem from="1572223206994" duration="28857000" />
|
|
|
<workItem from="1572309778506" duration="26117000" />
|
|
|
<workItem from="1572395935540" duration="27976000" />
|
|
|
<workItem from="1572395935540" duration="28060000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="数据库配置">
|
|
|
<created>1571972429395</created>
|
...
|
...
|
@@ -610,11 +609,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572436214307</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="39" />
|
|
|
<task id="LOCAL-00039" summary="权限调试">
|
|
|
<created>1572436430112</created>
|
|
|
<option name="number" value="00039" />
|
|
|
<option name="presentableId" value="LOCAL-00039" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572436430112</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00040" summary="权限调试">
|
|
|
<created>1572436442390</created>
|
|
|
<option name="number" value="00040" />
|
|
|
<option name="presentableId" value="LOCAL-00040" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572436442390</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="41" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="213201000" />
|
|
|
<option name="totallyTimeSpent" value="213285000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1059,17 +1072,17 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
|
|
|
<state relative-caret-position="623">
|
|
|
<caret line="59" column="6" lean-forward="true" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="487">
|
|
|
<caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" />
|
|
|
<state relative-caret-position="34">
|
|
|
<caret line="25" column="19" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|