...
|
...
|
@@ -2,7 +2,12 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment="">
|
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" />
|
|
|
<change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_cert.p12" afterPath="" />
|
|
|
<change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_cert.pem" afterPath="" />
|
|
|
<change type="DELETED" beforePath="$PROJECT_DIR$/addons/epay/certs/apiclient_key.pem" afterPath="" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/addons/epay/config.php" afterPath="$PROJECT_DIR$/addons/epay/config.php" />
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Wxpay.php" afterPath="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -38,8 +43,8 @@ |
|
|
<file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="530">
|
|
|
<caret line="301" column="42" lean-forward="true" selection-start-line="301" selection-start-column="42" selection-end-line="301" selection-end-column="42" />
|
|
|
<state relative-caret-position="185">
|
|
|
<caret line="304" column="41" lean-forward="true" selection-start-line="304" selection-start-column="41" selection-end-line="304" selection-end-column="41" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
@@ -47,6 +52,16 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/addons/epay/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="460">
|
|
|
<caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
...
|
...
|
@@ -97,7 +112,6 @@ |
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$USER_HOME$/AppData/Local/Temp/gjr_user.sql" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/meal/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/meal.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Meal.php" />
|
...
|
...
|
@@ -142,12 +156,13 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Pplate.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pplate.js" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/controller/Ptube.php" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/invoice.php" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/invoice.js" />
|
|
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Person.php" />
|
|
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
|
|
<option value="$PROJECT_DIR$/addons/epay/config.php" />
|
|
|
<option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -209,6 +224,24 @@ |
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="epay" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="addons" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="epay" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
<item name="certs" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
...
|
...
|
@@ -231,6 +264,7 @@ |
|
|
</component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="F:\wamp64\www\project\gangjuren\addons\epay\certs" />
|
|
|
<recent name="F:\wamp64\www\project\gangjuren" />
|
|
|
<recent name="F:\wamp64\www\project\gangjuren\application\api\controller" />
|
|
|
<recent name="F:\wamp64\www\project\gangjuren\public" />
|
...
|
...
|
@@ -276,12 +310,12 @@ |
|
|
<workItem from="1566547320999" duration="10575000" />
|
|
|
<workItem from="1566607074350" duration="21141000" />
|
|
|
<workItem from="1566780240850" duration="14011000" />
|
|
|
<workItem from="1566866516544" duration="6483000" />
|
|
|
<workItem from="1566866516544" duration="7366000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="186520000" />
|
|
|
<option name="totallyTimeSpent" value="187403000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -338,20 +372,6 @@ |
|
|
<watches-manager />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/admin/view/equipment/edit.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="414">
|
|
|
<caret line="51" column="4" lean-forward="false" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Validate.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="138">
|
|
|
<caret line="7" column="3" lean-forward="true" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="3" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Token.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="161">
|
...
|
...
|
@@ -693,10 +713,26 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/addons/epay/certs/证书使用说明.txt">
|
|
|
<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$/addons/epay/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="460">
|
|
|
<caret line="23" column="30" lean-forward="true" selection-start-line="23" selection-start-column="30" selection-end-line="23" selection-end-column="30" />
|
|
|
<folding />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="530">
|
|
|
<caret line="301" column="42" lean-forward="true" selection-start-line="301" selection-start-column="42" selection-end-line="301" selection-end-column="42" />
|
|
|
<state relative-caret-position="185">
|
|
|
<caret line="304" column="41" lean-forward="true" selection-start-line="304" selection-start-column="41" selection-end-line="304" selection-end-column="41" />
|
|
|
<folding>
|
|
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
</folding>
|
...
|
...
|
|