|
@@ -20,8 +20,8 @@ |
|
@@ -20,8 +20,8 @@ |
20
|
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
|
20
|
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
|
21
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
21
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
23
|
- <state relative-caret-position="357">
|
|
|
24
|
- <caret line="38" column="34" lean-forward="true" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
|
23
|
+ <state relative-caret-position="306">
|
|
|
24
|
+ <caret line="23" column="47" selection-start-line="23" selection-start-column="47" selection-end-line="23" selection-end-column="47" />
|
25
|
<folding>
|
25
|
<folding>
|
26
|
<element signature="e#128#165#0#PHP" expanded="true" />
|
26
|
<element signature="e#128#165#0#PHP" expanded="true" />
|
27
|
</folding>
|
27
|
</folding>
|
|
@@ -44,7 +44,7 @@ |
|
@@ -44,7 +44,7 @@ |
44
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
|
44
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
|
45
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
45
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
46
|
<provider selected="true" editor-type-id="text-editor">
|
46
|
<provider selected="true" editor-type-id="text-editor">
|
47
|
- <state relative-caret-position="170">
|
47
|
+ <state relative-caret-position="221">
|
48
|
<caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
|
48
|
<caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
|
49
|
<folding>
|
49
|
<folding>
|
50
|
<element signature="e#130#167#0#PHP" expanded="true" />
|
50
|
<element signature="e#130#167#0#PHP" expanded="true" />
|
|
@@ -53,6 +53,15 @@ |
|
@@ -53,6 +53,15 @@ |
53
|
</provider>
|
53
|
</provider>
|
54
|
</entry>
|
54
|
</entry>
|
55
|
</file>
|
55
|
</file>
|
|
|
56
|
+ <file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
|
|
|
57
|
+ <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
58
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
59
|
+ <state relative-caret-position="306">
|
|
|
60
|
+ <caret line="18" column="50" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
|
|
|
61
|
+ </state>
|
|
|
62
|
+ </provider>
|
|
|
63
|
+ </entry>
|
|
|
64
|
+ </file>
|
56
|
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
|
65
|
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
|
57
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
66
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
58
|
<provider selected="true" editor-type-id="text-editor">
|
67
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -110,8 +119,8 @@ |
|
@@ -110,8 +119,8 @@ |
110
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
119
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
111
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
120
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
112
|
<provider selected="true" editor-type-id="text-editor">
|
121
|
<provider selected="true" editor-type-id="text-editor">
|
113
|
- <state relative-caret-position="2040">
|
|
|
114
|
- <caret line="129" column="11" selection-start-line="104" selection-start-column="8" selection-end-line="129" selection-end-column="11" />
|
122
|
+ <state relative-caret-position="436">
|
|
|
123
|
+ <caret line="154" column="33" selection-start-line="154" selection-start-column="20" selection-end-line="154" selection-end-column="33" />
|
115
|
<folding>
|
124
|
<folding>
|
116
|
<element signature="e#128#160#0#PHP" expanded="true" />
|
125
|
<element signature="e#128#160#0#PHP" expanded="true" />
|
117
|
</folding>
|
126
|
</folding>
|
|
@@ -140,13 +149,13 @@ |
|
@@ -140,13 +149,13 @@ |
140
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
149
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
141
|
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
|
150
|
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
|
142
|
<option value="$PROJECT_DIR$/application/home/controller/Upload.php" />
|
151
|
<option value="$PROJECT_DIR$/application/home/controller/Upload.php" />
|
143
|
- <option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
|
|
144
|
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
|
152
|
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
|
145
|
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
|
153
|
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
|
146
|
<option value="$PROJECT_DIR$/application/home/controller/Question.php" />
|
154
|
<option value="$PROJECT_DIR$/application/home/controller/Question.php" />
|
147
|
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
|
155
|
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
|
148
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
156
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
149
|
<option value="$PROJECT_DIR$/application/database.php" />
|
157
|
<option value="$PROJECT_DIR$/application/database.php" />
|
|
|
158
|
+ <option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
150
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
159
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
151
|
</list>
|
160
|
</list>
|
152
|
</option>
|
161
|
</option>
|
|
@@ -237,6 +246,12 @@ |
|
@@ -237,6 +246,12 @@ |
237
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
246
|
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
238
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
247
|
<item name="advertising" type="462c0819:PsiDirectoryNode" />
|
239
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
248
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
249
|
+ <item name="extra" type="462c0819:PsiDirectoryNode" />
|
|
|
250
|
+ </path>
|
|
|
251
|
+ <path>
|
|
|
252
|
+ <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
253
|
+ <item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
254
|
+ <item name="application" type="462c0819:PsiDirectoryNode" />
|
240
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
255
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
241
|
</path>
|
256
|
</path>
|
242
|
<path>
|
257
|
<path>
|
|
@@ -246,6 +261,11 @@ |
|
@@ -246,6 +261,11 @@ |
246
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
261
|
<item name="home" type="462c0819:PsiDirectoryNode" />
|
247
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
262
|
<item name="controller" type="462c0819:PsiDirectoryNode" />
|
248
|
</path>
|
263
|
</path>
|
|
|
264
|
+ <path>
|
|
|
265
|
+ <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
|
|
|
266
|
+ <item name="advertising" type="462c0819:PsiDirectoryNode" />
|
|
|
267
|
+ <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
268
|
+ </path>
|
249
|
</expand>
|
269
|
</expand>
|
250
|
<select />
|
270
|
<select />
|
251
|
</subPane>
|
271
|
</subPane>
|
|
@@ -262,6 +282,7 @@ |
|
@@ -262,6 +282,7 @@ |
262
|
</component>
|
282
|
</component>
|
263
|
<component name="RecentsManager">
|
283
|
<component name="RecentsManager">
|
264
|
<key name="CopyFile.RECENT_KEYS">
|
284
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
285
|
+ <recent name="D:\wamp\www\advertising\public" />
|
265
|
<recent name="D:\wamp\www\advertising" />
|
286
|
<recent name="D:\wamp\www\advertising" />
|
266
|
<recent name="D:\wamp\www\advertising\application\home\controller" />
|
287
|
<recent name="D:\wamp\www\advertising\application\home\controller" />
|
267
|
<recent name="D:\wamp\www\advertising\application\extra" />
|
288
|
<recent name="D:\wamp\www\advertising\application\extra" />
|
|
@@ -299,7 +320,7 @@ |
|
@@ -299,7 +320,7 @@ |
299
|
<workItem from="1571705047810" duration="3754000" />
|
320
|
<workItem from="1571705047810" duration="3754000" />
|
300
|
<workItem from="1571790358186" duration="28939000" />
|
321
|
<workItem from="1571790358186" duration="28939000" />
|
301
|
<workItem from="1571877780953" duration="28080000" />
|
322
|
<workItem from="1571877780953" duration="28080000" />
|
302
|
- <workItem from="1571963886703" duration="7537000" />
|
323
|
+ <workItem from="1571963886703" duration="8855000" />
|
303
|
</task>
|
324
|
</task>
|
304
|
<task id="LOCAL-00001" summary="数据库配置">
|
325
|
<task id="LOCAL-00001" summary="数据库配置">
|
305
|
<created>1571972429395</created>
|
326
|
<created>1571972429395</created>
|
|
@@ -308,11 +329,25 @@ |
|
@@ -308,11 +329,25 @@ |
308
|
<option name="project" value="LOCAL" />
|
329
|
<option name="project" value="LOCAL" />
|
309
|
<updated>1571972429395</updated>
|
330
|
<updated>1571972429395</updated>
|
310
|
</task>
|
331
|
</task>
|
311
|
- <option name="localTasksCounter" value="2" />
|
332
|
+ <task id="LOCAL-00002" summary="微信公众平台配置">
|
|
|
333
|
+ <created>1571972572694</created>
|
|
|
334
|
+ <option name="number" value="00002" />
|
|
|
335
|
+ <option name="presentableId" value="LOCAL-00002" />
|
|
|
336
|
+ <option name="project" value="LOCAL" />
|
|
|
337
|
+ <updated>1571972572694</updated>
|
|
|
338
|
+ </task>
|
|
|
339
|
+ <task id="LOCAL-00003" summary="调试授权">
|
|
|
340
|
+ <created>1571972828504</created>
|
|
|
341
|
+ <option name="number" value="00003" />
|
|
|
342
|
+ <option name="presentableId" value="LOCAL-00003" />
|
|
|
343
|
+ <option name="project" value="LOCAL" />
|
|
|
344
|
+ <updated>1571972828504</updated>
|
|
|
345
|
+ </task>
|
|
|
346
|
+ <option name="localTasksCounter" value="4" />
|
312
|
<servers />
|
347
|
<servers />
|
313
|
</component>
|
348
|
</component>
|
314
|
<component name="TimeTrackingManager">
|
349
|
<component name="TimeTrackingManager">
|
315
|
- <option name="totallyTimeSpent" value="77878000" />
|
350
|
+ <option name="totallyTimeSpent" value="79196000" />
|
316
|
</component>
|
351
|
</component>
|
317
|
<component name="ToolWindowManager">
|
352
|
<component name="ToolWindowManager">
|
318
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
353
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -349,16 +384,11 @@ |
|
@@ -349,16 +384,11 @@ |
349
|
</component>
|
384
|
</component>
|
350
|
<component name="VcsManagerConfiguration">
|
385
|
<component name="VcsManagerConfiguration">
|
351
|
<MESSAGE value="数据库配置" />
|
386
|
<MESSAGE value="数据库配置" />
|
352
|
- <option name="LAST_COMMIT_MESSAGE" value="数据库配置" />
|
387
|
+ <MESSAGE value="微信公众平台配置" />
|
|
|
388
|
+ <MESSAGE value="调试授权" />
|
|
|
389
|
+ <option name="LAST_COMMIT_MESSAGE" value="调试授权" />
|
353
|
</component>
|
390
|
</component>
|
354
|
<component name="editorHistoryManager">
|
391
|
<component name="editorHistoryManager">
|
355
|
- <entry file="file://$PROJECT_DIR$/application/common.php">
|
|
|
356
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
357
|
- <state relative-caret-position="7803">
|
|
|
358
|
- <caret line="459" column="41" lean-forward="true" selection-start-line="459" selection-start-column="41" selection-end-line="459" selection-end-column="41" />
|
|
|
359
|
- </state>
|
|
|
360
|
- </provider>
|
|
|
361
|
- </entry>
|
|
|
362
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
392
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
363
|
<provider selected="true" editor-type-id="text-editor">
|
393
|
<provider selected="true" editor-type-id="text-editor">
|
364
|
<state relative-caret-position="2618">
|
394
|
<state relative-caret-position="2618">
|
|
@@ -502,13 +532,6 @@ |
|
@@ -502,13 +532,6 @@ |
502
|
</state>
|
532
|
</state>
|
503
|
</provider>
|
533
|
</provider>
|
504
|
</entry>
|
534
|
</entry>
|
505
|
- <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
506
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
507
|
- <state relative-caret-position="306">
|
|
|
508
|
- <caret line="18" column="50" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
|
|
|
509
|
- </state>
|
|
|
510
|
- </provider>
|
|
|
511
|
- </entry>
|
|
|
512
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
535
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
513
|
<provider selected="true" editor-type-id="text-editor">
|
536
|
<provider selected="true" editor-type-id="text-editor">
|
514
|
<state relative-caret-position="419">
|
537
|
<state relative-caret-position="419">
|
|
@@ -613,16 +636,6 @@ |
|
@@ -613,16 +636,6 @@ |
613
|
</state>
|
636
|
</state>
|
614
|
</provider>
|
637
|
</provider>
|
615
|
</entry>
|
638
|
</entry>
|
616
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
617
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
618
|
- <state relative-caret-position="2040">
|
|
|
619
|
- <caret line="129" column="11" selection-start-line="104" selection-start-column="8" selection-end-line="129" selection-end-column="11" />
|
|
|
620
|
- <folding>
|
|
|
621
|
- <element signature="e#128#160#0#PHP" expanded="true" />
|
|
|
622
|
- </folding>
|
|
|
623
|
- </state>
|
|
|
624
|
- </provider>
|
|
|
625
|
- </entry>
|
|
|
626
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
639
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
|
627
|
<provider selected="true" editor-type-id="text-editor">
|
640
|
<provider selected="true" editor-type-id="text-editor">
|
628
|
<state relative-caret-position="2533">
|
641
|
<state relative-caret-position="2533">
|
|
@@ -643,16 +656,6 @@ |
|
@@ -643,16 +656,6 @@ |
643
|
</state>
|
656
|
</state>
|
644
|
</provider>
|
657
|
</provider>
|
645
|
</entry>
|
658
|
</entry>
|
646
|
- <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
647
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
648
|
- <state relative-caret-position="170">
|
|
|
649
|
- <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
|
|
|
650
|
- <folding>
|
|
|
651
|
- <element signature="e#130#167#0#PHP" expanded="true" />
|
|
|
652
|
- </folding>
|
|
|
653
|
- </state>
|
|
|
654
|
- </provider>
|
|
|
655
|
- </entry>
|
|
|
656
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
|
659
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
|
657
|
<provider selected="true" editor-type-id="text-editor">
|
660
|
<provider selected="true" editor-type-id="text-editor">
|
658
|
<state relative-caret-position="573">
|
661
|
<state relative-caret-position="573">
|
|
@@ -694,10 +697,40 @@ |
|
@@ -694,10 +697,40 @@ |
694
|
</state>
|
697
|
</state>
|
695
|
</provider>
|
698
|
</provider>
|
696
|
</entry>
|
699
|
</entry>
|
|
|
700
|
+ <entry file="file://$PROJECT_DIR$/public/MP_verify_4KFkEP03TkXO6gP2.txt">
|
|
|
701
|
+ <provider selected="true" editor-type-id="text-editor" />
|
|
|
702
|
+ </entry>
|
|
|
703
|
+ <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
|
|
|
704
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
705
|
+ <state relative-caret-position="306">
|
|
|
706
|
+ <caret line="18" column="50" selection-start-line="18" selection-start-column="50" selection-end-line="18" selection-end-column="50" />
|
|
|
707
|
+ </state>
|
|
|
708
|
+ </provider>
|
|
|
709
|
+ </entry>
|
|
|
710
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
711
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
712
|
+ <state relative-caret-position="221">
|
|
|
713
|
+ <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="28" selection-end-column="5" />
|
|
|
714
|
+ <folding>
|
|
|
715
|
+ <element signature="e#130#167#0#PHP" expanded="true" />
|
|
|
716
|
+ </folding>
|
|
|
717
|
+ </state>
|
|
|
718
|
+ </provider>
|
|
|
719
|
+ </entry>
|
|
|
720
|
+ <entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
721
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
722
|
+ <state relative-caret-position="436">
|
|
|
723
|
+ <caret line="154" column="33" selection-start-line="154" selection-start-column="20" selection-end-line="154" selection-end-column="33" />
|
|
|
724
|
+ <folding>
|
|
|
725
|
+ <element signature="e#128#160#0#PHP" expanded="true" />
|
|
|
726
|
+ </folding>
|
|
|
727
|
+ </state>
|
|
|
728
|
+ </provider>
|
|
|
729
|
+ </entry>
|
697
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
730
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
698
|
<provider selected="true" editor-type-id="text-editor">
|
731
|
<provider selected="true" editor-type-id="text-editor">
|
699
|
- <state relative-caret-position="357">
|
|
|
700
|
- <caret line="38" column="34" lean-forward="true" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
|
732
|
+ <state relative-caret-position="306">
|
|
|
733
|
+ <caret line="23" column="47" selection-start-line="23" selection-start-column="47" selection-end-line="23" selection-end-column="47" />
|
701
|
<folding>
|
734
|
<folding>
|
702
|
<element signature="e#128#165#0#PHP" expanded="true" />
|
735
|
<element signature="e#128#165#0#PHP" expanded="true" />
|
703
|
</folding>
|
736
|
</folding>
|