|
@@ -37,22 +37,24 @@ |
|
@@ -37,22 +37,24 @@ |
37
|
</usages-collector>
|
37
|
</usages-collector>
|
38
|
<usages-collector id="statistics.file.extensions.open">
|
38
|
<usages-collector id="statistics.file.extensions.open">
|
39
|
<counts>
|
39
|
<counts>
|
40
|
- <entry key="php" value="3" />
|
40
|
+ <entry key="log" value="2" />
|
|
|
41
|
+ <entry key="php" value="4" />
|
41
|
</counts>
|
42
|
</counts>
|
42
|
</usages-collector>
|
43
|
</usages-collector>
|
43
|
<usages-collector id="statistics.file.types.open">
|
44
|
<usages-collector id="statistics.file.types.open">
|
44
|
<counts>
|
45
|
<counts>
|
45
|
- <entry key="PHP" value="3" />
|
46
|
+ <entry key="ANSI Aware" value="2" />
|
|
|
47
|
+ <entry key="PHP" value="4" />
|
46
|
</counts>
|
48
|
</counts>
|
47
|
</usages-collector>
|
49
|
</usages-collector>
|
48
|
<usages-collector id="statistics.file.extensions.edit">
|
50
|
<usages-collector id="statistics.file.extensions.edit">
|
49
|
<counts>
|
51
|
<counts>
|
50
|
- <entry key="php" value="72" />
|
52
|
+ <entry key="php" value="82" />
|
51
|
</counts>
|
53
|
</counts>
|
52
|
</usages-collector>
|
54
|
</usages-collector>
|
53
|
<usages-collector id="statistics.file.types.edit">
|
55
|
<usages-collector id="statistics.file.types.edit">
|
54
|
<counts>
|
56
|
<counts>
|
55
|
- <entry key="PHP" value="72" />
|
57
|
+ <entry key="PHP" value="82" />
|
56
|
</counts>
|
58
|
</counts>
|
57
|
</usages-collector>
|
59
|
</usages-collector>
|
58
|
</session>
|
60
|
</session>
|
|
@@ -60,34 +62,6 @@ |
|
@@ -60,34 +62,6 @@ |
60
|
<component name="FileEditorManager">
|
62
|
<component name="FileEditorManager">
|
61
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
63
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
62
|
<file pinned="false" current-in-tab="false">
|
64
|
<file pinned="false" current-in-tab="false">
|
63
|
- <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
|
|
|
64
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
65
|
- <state relative-caret-position="225">
|
|
|
66
|
- <caret line="17" selection-start-line="17" selection-end-line="17" selection-end-column="49" />
|
|
|
67
|
- <folding>
|
|
|
68
|
- <element signature="e#910#989#0#PHP" />
|
|
|
69
|
- <element signature="e#1014#1431#0#PHP" />
|
|
|
70
|
- <element signature="e#1458#2597#0#PHP" />
|
|
|
71
|
- <element signature="e#1512#1579#0#PHP" />
|
|
|
72
|
- <element signature="e#1727#1807#0#PHP" />
|
|
|
73
|
- <element signature="e#1895#2062#0#PHP" />
|
|
|
74
|
- <element signature="e#3095#3140#0#PHP" />
|
|
|
75
|
- <element signature="e#3095#3189#0#PHP" />
|
|
|
76
|
- </folding>
|
|
|
77
|
- </state>
|
|
|
78
|
- </provider>
|
|
|
79
|
- </entry>
|
|
|
80
|
- </file>
|
|
|
81
|
- <file pinned="false" current-in-tab="false">
|
|
|
82
|
- <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
|
|
|
83
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
84
|
- <state relative-caret-position="2375">
|
|
|
85
|
- <caret line="106" column="20" selection-start-line="106" selection-start-column="20" selection-end-line="106" selection-end-column="20" />
|
|
|
86
|
- </state>
|
|
|
87
|
- </provider>
|
|
|
88
|
- </entry>
|
|
|
89
|
- </file>
|
|
|
90
|
- <file pinned="false" current-in-tab="false">
|
|
|
91
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
65
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
92
|
<provider selected="true" editor-type-id="text-editor">
|
66
|
<provider selected="true" editor-type-id="text-editor">
|
93
|
<state relative-caret-position="125">
|
67
|
<state relative-caret-position="125">
|
|
@@ -129,15 +103,29 @@ |
|
@@ -129,15 +103,29 @@ |
129
|
</provider>
|
103
|
</provider>
|
130
|
</entry>
|
104
|
</entry>
|
131
|
</file>
|
105
|
</file>
|
132
|
- <file pinned="false" current-in-tab="true">
|
106
|
+ <file pinned="false" current-in-tab="false">
|
133
|
<entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
|
107
|
<entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
|
134
|
<provider selected="true" editor-type-id="text-editor">
|
108
|
<provider selected="true" editor-type-id="text-editor">
|
135
|
- <state relative-caret-position="525">
|
|
|
136
|
- <caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="4" />
|
109
|
+ <state relative-caret-position="400">
|
|
|
110
|
+ <caret line="58" column="39" lean-forward="true" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
|
137
|
</state>
|
111
|
</state>
|
138
|
</provider>
|
112
|
</provider>
|
139
|
</entry>
|
113
|
</entry>
|
140
|
</file>
|
114
|
</file>
|
|
|
115
|
+ <file pinned="false" current-in-tab="true">
|
|
|
116
|
+ <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php">
|
|
|
117
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
118
|
+ <state relative-caret-position="148">
|
|
|
119
|
+ <caret line="166" column="20" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
|
|
|
120
|
+ </state>
|
|
|
121
|
+ </provider>
|
|
|
122
|
+ </entry>
|
|
|
123
|
+ </file>
|
|
|
124
|
+ <file pinned="true" current-in-tab="false">
|
|
|
125
|
+ <entry file="remoteDeploymentFS://<e5231f46-34aa-4a7e-8b92-f8985d5a7d2a>/alidata/www/ser/wei/dm161xueche/public/paycenter/logs/2019-04-11.log">
|
|
|
126
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
127
|
+ </entry>
|
|
|
128
|
+ </file>
|
141
|
</leaf>
|
129
|
</leaf>
|
142
|
</component>
|
130
|
</component>
|
143
|
<component name="FindInProjectRecents">
|
131
|
<component name="FindInProjectRecents">
|
|
@@ -326,7 +314,12 @@ |
|
@@ -326,7 +314,12 @@ |
326
|
</panes>
|
314
|
</panes>
|
327
|
</component>
|
315
|
</component>
|
328
|
<component name="PropertiesComponent">
|
316
|
<component name="PropertiesComponent">
|
329
|
- <property name="WebServerToolWindowFactoryState" value="false" />
|
317
|
+ <property name="WebServerToolWindowFactoryState" value="true" />
|
|
|
318
|
+ <property name="WebServerToolWindowPanel.toolwindow.highlight.mappings" value="true" />
|
|
|
319
|
+ <property name="WebServerToolWindowPanel.toolwindow.highlight.symlinks" value="true" />
|
|
|
320
|
+ <property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
|
|
|
321
|
+ <property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
|
|
|
322
|
+ <property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
|
330
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
323
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
331
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
324
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
332
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
325
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
@@ -377,21 +370,7 @@ |
|
@@ -377,21 +370,7 @@ |
377
|
<workItem from="1536496471879" duration="16852000" />
|
370
|
<workItem from="1536496471879" duration="16852000" />
|
378
|
<workItem from="1536677895835" duration="7811000" />
|
371
|
<workItem from="1536677895835" duration="7811000" />
|
379
|
<workItem from="1536940132237" duration="27028000" />
|
372
|
<workItem from="1536940132237" duration="27028000" />
|
380
|
- <workItem from="1554968186701" duration="3413000" />
|
|
|
381
|
- </task>
|
|
|
382
|
- <task id="LOCAL-00042" summary="登录处理">
|
|
|
383
|
- <created>1535637704890</created>
|
|
|
384
|
- <option name="number" value="00042" />
|
|
|
385
|
- <option name="presentableId" value="LOCAL-00042" />
|
|
|
386
|
- <option name="project" value="LOCAL" />
|
|
|
387
|
- <updated>1535637704890</updated>
|
|
|
388
|
- </task>
|
|
|
389
|
- <task id="LOCAL-00043" summary="登录处理">
|
|
|
390
|
- <created>1535637833495</created>
|
|
|
391
|
- <option name="number" value="00043" />
|
|
|
392
|
- <option name="presentableId" value="LOCAL-00043" />
|
|
|
393
|
- <option name="project" value="LOCAL" />
|
|
|
394
|
- <updated>1535637833495</updated>
|
373
|
+ <workItem from="1554968186701" duration="3715000" />
|
395
|
</task>
|
374
|
</task>
|
396
|
<task id="LOCAL-00044" summary="登录处理">
|
375
|
<task id="LOCAL-00044" summary="登录处理">
|
397
|
<created>1535638014265</created>
|
376
|
<created>1535638014265</created>
|
|
@@ -722,20 +701,35 @@ |
|
@@ -722,20 +701,35 @@ |
722
|
<option name="project" value="LOCAL" />
|
701
|
<option name="project" value="LOCAL" />
|
723
|
<updated>1554971981700</updated>
|
702
|
<updated>1554971981700</updated>
|
724
|
</task>
|
703
|
</task>
|
725
|
- <option name="localTasksCounter" value="91" />
|
704
|
+ <task id="LOCAL-00091" summary="评价问题重构">
|
|
|
705
|
+ <created>1554972020059</created>
|
|
|
706
|
+ <option name="number" value="00091" />
|
|
|
707
|
+ <option name="presentableId" value="LOCAL-00091" />
|
|
|
708
|
+ <option name="project" value="LOCAL" />
|
|
|
709
|
+ <updated>1554972020059</updated>
|
|
|
710
|
+ </task>
|
|
|
711
|
+ <task id="LOCAL-00092" summary="评价问题重构">
|
|
|
712
|
+ <created>1554972036379</created>
|
|
|
713
|
+ <option name="number" value="00092" />
|
|
|
714
|
+ <option name="presentableId" value="LOCAL-00092" />
|
|
|
715
|
+ <option name="project" value="LOCAL" />
|
|
|
716
|
+ <updated>1554972036379</updated>
|
|
|
717
|
+ </task>
|
|
|
718
|
+ <option name="localTasksCounter" value="93" />
|
726
|
<servers />
|
719
|
<servers />
|
727
|
</component>
|
720
|
</component>
|
728
|
<component name="TimeTrackingManager">
|
721
|
<component name="TimeTrackingManager">
|
729
|
- <option name="totallyTimeSpent" value="170023000" />
|
722
|
+ <option name="totallyTimeSpent" value="170325000" />
|
730
|
</component>
|
723
|
</component>
|
731
|
<component name="ToolWindowManager">
|
724
|
<component name="ToolWindowManager">
|
732
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
725
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
733
|
<editor active="true" />
|
726
|
<editor active="true" />
|
734
|
<layout>
|
727
|
<layout>
|
735
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16471216" />
|
728
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16471216" />
|
736
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
729
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
737
|
<window_info id="npm" order="2" side_tool="true" />
|
730
|
<window_info id="npm" order="2" side_tool="true" />
|
738
|
<window_info id="Favorites" order="3" side_tool="true" />
|
731
|
<window_info id="Favorites" order="3" side_tool="true" />
|
|
|
732
|
+ <window_info anchor="bottom" id="File Transfer" weight="0.32899022" />
|
739
|
<window_info anchor="bottom" id="Message" order="0" />
|
733
|
<window_info anchor="bottom" id="Message" order="0" />
|
740
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
|
734
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
|
741
|
<window_info anchor="bottom" id="Run" order="2" />
|
735
|
<window_info anchor="bottom" id="Run" order="2" />
|
|
@@ -748,10 +742,11 @@ |
|
@@ -748,10 +742,11 @@ |
748
|
<window_info anchor="bottom" id="Terminal" order="9" />
|
742
|
<window_info anchor="bottom" id="Terminal" order="9" />
|
749
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.32952926" />
|
743
|
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.32952926" />
|
750
|
<window_info anchor="bottom" id="Version Control" order="11" weight="0.3293348" />
|
744
|
<window_info anchor="bottom" id="Version Control" order="11" weight="0.3293348" />
|
|
|
745
|
+ <window_info active="true" anchor="right" id="Remote Host" visible="true" weight="0.25053304" />
|
751
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
746
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
752
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
747
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
753
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
748
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
754
|
- <window_info anchor="right" id="Database" order="3" weight="0.32995737" />
|
749
|
+ <window_info anchor="right" id="Database" order="3" weight="0.26865673" />
|
755
|
</layout>
|
750
|
</layout>
|
756
|
<layout-to-restore>
|
751
|
<layout-to-restore>
|
757
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
|
752
|
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
|
|
@@ -800,7 +795,6 @@ |
|
@@ -800,7 +795,6 @@ |
800
|
<option name="LAST_COMMIT_MESSAGE" value="评价问题重构" />
|
795
|
<option name="LAST_COMMIT_MESSAGE" value="评价问题重构" />
|
801
|
</component>
|
796
|
</component>
|
802
|
<component name="editorHistoryManager">
|
797
|
<component name="editorHistoryManager">
|
803
|
- <entry file="file://$PROJECT_DIR$/public/jsapi_ticket.json" />
|
|
|
804
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" />
|
798
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController [3].php" />
|
805
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [5].php" />
|
799
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [5].php" />
|
806
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/edit_single.html" />
|
800
|
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/edit_single.html" />
|
|
@@ -933,6 +927,20 @@ |
|
@@ -933,6 +927,20 @@ |
933
|
</state>
|
927
|
</state>
|
934
|
</provider>
|
928
|
</provider>
|
935
|
</entry>
|
929
|
</entry>
|
|
|
930
|
+ <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php">
|
|
|
931
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
932
|
+ <state relative-caret-position="550">
|
|
|
933
|
+ <caret line="43" column="26" selection-start-line="43" selection-start-column="26" selection-end-line="43" selection-end-column="26" />
|
|
|
934
|
+ </state>
|
|
|
935
|
+ </provider>
|
|
|
936
|
+ </entry>
|
|
|
937
|
+ <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php">
|
|
|
938
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
939
|
+ <state relative-caret-position="398">
|
|
|
940
|
+ <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
|
|
|
941
|
+ </state>
|
|
|
942
|
+ </provider>
|
|
|
943
|
+ </entry>
|
936
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
944
|
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
|
937
|
<provider selected="true" editor-type-id="text-editor">
|
945
|
<provider selected="true" editor-type-id="text-editor">
|
938
|
<state relative-caret-position="125">
|
946
|
<state relative-caret-position="125">
|
|
@@ -955,24 +963,17 @@ |
|
@@ -955,24 +963,17 @@ |
955
|
</state>
|
963
|
</state>
|
956
|
</provider>
|
964
|
</provider>
|
957
|
</entry>
|
965
|
</entry>
|
958
|
- <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.Config.php">
|
|
|
959
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
960
|
- <state relative-caret-position="550">
|
|
|
961
|
- <caret line="43" column="26" selection-start-line="43" selection-start-column="26" selection-end-line="43" selection-end-column="26" />
|
|
|
962
|
- </state>
|
|
|
963
|
- </provider>
|
|
|
964
|
- </entry>
|
|
|
965
|
- <entry file="file://$PROJECT_DIR$/simplewind/vendor/wxpay_php_sdk/lib/WxPay.Api.php">
|
966
|
+ <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
|
966
|
<provider selected="true" editor-type-id="text-editor">
|
967
|
<provider selected="true" editor-type-id="text-editor">
|
967
|
- <state relative-caret-position="398">
|
|
|
968
|
- <caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
|
968
|
+ <state relative-caret-position="400">
|
|
|
969
|
+ <caret line="58" column="39" lean-forward="true" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
|
969
|
</state>
|
970
|
</state>
|
970
|
</provider>
|
971
|
</provider>
|
971
|
</entry>
|
972
|
</entry>
|
972
|
- <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/index.php">
|
973
|
+ <entry file="file://$PROJECT_DIR$/public/paycenter/wechat/WxPay.JsApiPay.php">
|
973
|
<provider selected="true" editor-type-id="text-editor">
|
974
|
<provider selected="true" editor-type-id="text-editor">
|
974
|
- <state relative-caret-position="525">
|
|
|
975
|
- <caret line="30" column="4" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="4" />
|
975
|
+ <state relative-caret-position="148">
|
|
|
976
|
+ <caret line="166" column="20" selection-start-line="166" selection-start-column="20" selection-end-line="166" selection-end-column="20" />
|
976
|
</state>
|
977
|
</state>
|
977
|
</provider>
|
978
|
</provider>
|
978
|
</entry>
|
979
|
</entry>
|