|
@@ -2,7 +2,7 @@ |
|
@@ -2,7 +2,7 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
<list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment="">
|
4
|
<list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment="">
|
5
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/addons/epay/config.php" afterPath="$PROJECT_DIR$/addons/epay/config.php" />
|
5
|
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Wxpay.php" afterPath="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
6
|
</list>
|
6
|
</list>
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
7
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="TRACKING_ENABLED" value="true" />
|
8
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -26,7 +26,7 @@ |
|
@@ -26,7 +26,7 @@ |
26
|
<file leaf-file-name="Person.php" pinned="false" current-in-tab="false">
|
26
|
<file leaf-file-name="Person.php" pinned="false" current-in-tab="false">
|
27
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
27
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
28
|
<provider selected="true" editor-type-id="text-editor">
|
28
|
<provider selected="true" editor-type-id="text-editor">
|
29
|
- <state relative-caret-position="530">
|
29
|
+ <state relative-caret-position="1496">
|
30
|
<caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
30
|
<caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
31
|
<folding>
|
31
|
<folding>
|
32
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
32
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
|
@@ -35,11 +35,11 @@ |
|
@@ -35,11 +35,11 @@ |
35
|
</provider>
|
35
|
</provider>
|
36
|
</entry>
|
36
|
</entry>
|
37
|
</file>
|
37
|
</file>
|
38
|
- <file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="false">
|
38
|
+ <file leaf-file-name="Wxpay.php" pinned="false" current-in-tab="true">
|
39
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
39
|
<entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
40
|
<provider selected="true" editor-type-id="text-editor">
|
40
|
<provider selected="true" editor-type-id="text-editor">
|
41
|
- <state relative-caret-position="369">
|
|
|
42
|
- <caret line="309" column="58" lean-forward="true" selection-start-line="309" selection-start-column="58" selection-end-line="309" selection-end-column="58" />
|
41
|
+ <state relative-caret-position="415">
|
|
|
42
|
+ <caret line="290" column="38" lean-forward="true" selection-start-line="290" selection-start-column="38" selection-end-line="290" selection-end-column="38" />
|
43
|
<folding>
|
43
|
<folding>
|
44
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
44
|
<element signature="e#38#68#0#PHP" expanded="true" />
|
45
|
</folding>
|
45
|
</folding>
|
|
@@ -57,11 +57,11 @@ |
|
@@ -57,11 +57,11 @@ |
57
|
</provider>
|
57
|
</provider>
|
58
|
</entry>
|
58
|
</entry>
|
59
|
</file>
|
59
|
</file>
|
60
|
- <file leaf-file-name="config.php" pinned="false" current-in-tab="true">
|
60
|
+ <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
|
61
|
<entry file="file://$PROJECT_DIR$/addons/epay/config.php">
|
61
|
<entry file="file://$PROJECT_DIR$/addons/epay/config.php">
|
62
|
<provider selected="true" editor-type-id="text-editor">
|
62
|
<provider selected="true" editor-type-id="text-editor">
|
63
|
- <state relative-caret-position="276">
|
|
|
64
|
- <caret line="12" column="48" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="48" />
|
63
|
+ <state relative-caret-position="483">
|
|
|
64
|
+ <caret line="24" column="24" lean-forward="true" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
|
65
|
<folding />
|
65
|
<folding />
|
66
|
</state>
|
66
|
</state>
|
67
|
</provider>
|
67
|
</provider>
|
|
@@ -166,8 +166,8 @@ |
|
@@ -166,8 +166,8 @@ |
166
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
166
|
<option value="$PROJECT_DIR$/application/extra/site.php" />
|
167
|
<option value="$PROJECT_DIR$/application/api/controller/Person.php" />
|
167
|
<option value="$PROJECT_DIR$/application/api/controller/Person.php" />
|
168
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
168
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
169
|
- <option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
|
|
170
|
<option value="$PROJECT_DIR$/addons/epay/config.php" />
|
169
|
<option value="$PROJECT_DIR$/addons/epay/config.php" />
|
|
|
170
|
+ <option value="$PROJECT_DIR$/application/api/controller/Wxpay.php" />
|
171
|
</list>
|
171
|
</list>
|
172
|
</option>
|
172
|
</option>
|
173
|
</component>
|
173
|
</component>
|
|
@@ -315,12 +315,12 @@ |
|
@@ -315,12 +315,12 @@ |
315
|
<workItem from="1566547320999" duration="10575000" />
|
315
|
<workItem from="1566547320999" duration="10575000" />
|
316
|
<workItem from="1566607074350" duration="21141000" />
|
316
|
<workItem from="1566607074350" duration="21141000" />
|
317
|
<workItem from="1566780240850" duration="14011000" />
|
317
|
<workItem from="1566780240850" duration="14011000" />
|
318
|
- <workItem from="1566866516544" duration="8897000" />
|
318
|
+ <workItem from="1566866516544" duration="9276000" />
|
319
|
</task>
|
319
|
</task>
|
320
|
<servers />
|
320
|
<servers />
|
321
|
</component>
|
321
|
</component>
|
322
|
<component name="TimeTrackingManager">
|
322
|
<component name="TimeTrackingManager">
|
323
|
- <option name="totallyTimeSpent" value="188934000" />
|
323
|
+ <option name="totallyTimeSpent" value="189313000" />
|
324
|
</component>
|
324
|
</component>
|
325
|
<component name="ToolWindowManager">
|
325
|
<component name="ToolWindowManager">
|
326
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
326
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -685,16 +685,6 @@ |
|
@@ -685,16 +685,6 @@ |
685
|
</state>
|
685
|
</state>
|
686
|
</provider>
|
686
|
</provider>
|
687
|
</entry>
|
687
|
</entry>
|
688
|
- <entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
|
|
689
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
690
|
- <state relative-caret-position="530">
|
|
|
691
|
- <caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
|
|
692
|
- <folding>
|
|
|
693
|
- <element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
694
|
- </folding>
|
|
|
695
|
- </state>
|
|
|
696
|
- </provider>
|
|
|
697
|
- </entry>
|
|
|
698
|
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
688
|
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
699
|
<provider selected="true" editor-type-id="text-editor">
|
689
|
<provider selected="true" editor-type-id="text-editor">
|
700
|
<state relative-caret-position="184">
|
690
|
<state relative-caret-position="184">
|
|
@@ -711,16 +701,6 @@ |
|
@@ -711,16 +701,6 @@ |
711
|
</state>
|
701
|
</state>
|
712
|
</provider>
|
702
|
</provider>
|
713
|
</entry>
|
703
|
</entry>
|
714
|
- <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
715
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
716
|
- <state relative-caret-position="369">
|
|
|
717
|
- <caret line="309" column="58" lean-forward="true" selection-start-line="309" selection-start-column="58" selection-end-line="309" selection-end-column="58" />
|
|
|
718
|
- <folding>
|
|
|
719
|
- <element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
720
|
- </folding>
|
|
|
721
|
- </state>
|
|
|
722
|
- </provider>
|
|
|
723
|
- </entry>
|
|
|
724
|
<entry file="file://$PROJECT_DIR$/addons/epay/library/Yansongda/Pay/Gateways/Wechat.php">
|
704
|
<entry file="file://$PROJECT_DIR$/addons/epay/library/Yansongda/Pay/Gateways/Wechat.php">
|
725
|
<provider selected="true" editor-type-id="text-editor">
|
705
|
<provider selected="true" editor-type-id="text-editor">
|
726
|
<state relative-caret-position="-1311">
|
706
|
<state relative-caret-position="-1311">
|
|
@@ -739,11 +719,31 @@ |
|
@@ -739,11 +719,31 @@ |
739
|
</entry>
|
719
|
</entry>
|
740
|
<entry file="file://$PROJECT_DIR$/addons/epay/config.php">
|
720
|
<entry file="file://$PROJECT_DIR$/addons/epay/config.php">
|
741
|
<provider selected="true" editor-type-id="text-editor">
|
721
|
<provider selected="true" editor-type-id="text-editor">
|
742
|
- <state relative-caret-position="276">
|
|
|
743
|
- <caret line="12" column="48" lean-forward="false" selection-start-line="12" selection-start-column="30" selection-end-line="12" selection-end-column="48" />
|
722
|
+ <state relative-caret-position="483">
|
|
|
723
|
+ <caret line="24" column="24" lean-forward="true" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
|
744
|
<folding />
|
724
|
<folding />
|
745
|
</state>
|
725
|
</state>
|
746
|
</provider>
|
726
|
</provider>
|
747
|
</entry>
|
727
|
</entry>
|
|
|
728
|
+ <entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
|
|
|
729
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
730
|
+ <state relative-caret-position="1496">
|
|
|
731
|
+ <caret line="483" column="35" lean-forward="false" selection-start-line="483" selection-start-column="35" selection-end-line="483" selection-end-column="35" />
|
|
|
732
|
+ <folding>
|
|
|
733
|
+ <element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
734
|
+ </folding>
|
|
|
735
|
+ </state>
|
|
|
736
|
+ </provider>
|
|
|
737
|
+ </entry>
|
|
|
738
|
+ <entry file="file://$PROJECT_DIR$/application/api/controller/Wxpay.php">
|
|
|
739
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
740
|
+ <state relative-caret-position="415">
|
|
|
741
|
+ <caret line="290" column="38" lean-forward="true" selection-start-line="290" selection-start-column="38" selection-end-line="290" selection-end-column="38" />
|
|
|
742
|
+ <folding>
|
|
|
743
|
+ <element signature="e#38#68#0#PHP" expanded="true" />
|
|
|
744
|
+ </folding>
|
|
|
745
|
+ </state>
|
|
|
746
|
+ </provider>
|
|
|
747
|
+ </entry>
|
748
|
</component>
|
748
|
</component>
|
749
|
</project> |
749
|
</project> |