|
@@ -2,13 +2,7 @@ |
|
@@ -2,13 +2,7 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
4
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
5
|
- <change afterPath="$PROJECT_DIR$/public/assets/img/wechat_pay.png" afterDir="false" />
|
|
|
6
|
- <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.p12" afterDir="false" />
|
|
|
7
|
- <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem" afterDir="false" />
|
|
|
8
|
- <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem" afterDir="false" />
|
|
|
9
|
- <change afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterDir="false" />
|
|
|
10
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
11
|
- <change beforePath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />
|
|
|
12
|
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
|
6
|
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
|
13
|
</list>
|
7
|
</list>
|
14
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
@@ -50,8 +44,8 @@ |
|
@@ -50,8 +44,8 @@ |
50
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
44
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
51
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
45
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
46
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
- <state relative-caret-position="589">
|
|
|
54
|
- <caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
|
47
|
+ <state relative-caret-position="606">
|
|
|
48
|
+ <caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
|
55
|
<folding>
|
49
|
<folding>
|
56
|
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
50
|
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
57
|
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
51
|
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
|
@@ -78,8 +72,8 @@ |
|
@@ -78,8 +72,8 @@ |
78
|
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
|
72
|
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
|
79
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
73
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
80
|
<provider selected="true" editor-type-id="text-editor">
|
74
|
<provider selected="true" editor-type-id="text-editor">
|
81
|
- <state relative-caret-position="544">
|
|
|
82
|
- <caret line="44" column="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
|
75
|
+ <state relative-caret-position="527">
|
|
|
76
|
+ <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
|
83
|
</state>
|
77
|
</state>
|
84
|
</provider>
|
78
|
</provider>
|
85
|
</entry>
|
79
|
</entry>
|
|
@@ -87,7 +81,7 @@ |
|
@@ -87,7 +81,7 @@ |
87
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
81
|
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
|
88
|
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
|
82
|
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
|
89
|
<provider selected="true" editor-type-id="text-editor">
|
83
|
<provider selected="true" editor-type-id="text-editor">
|
90
|
- <state relative-caret-position="152">
|
84
|
+ <state relative-caret-position="203">
|
91
|
<caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
|
85
|
<caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
|
92
|
</state>
|
86
|
</state>
|
93
|
</provider>
|
87
|
</provider>
|
|
@@ -375,7 +369,7 @@ |
|
@@ -375,7 +369,7 @@ |
375
|
<workItem from="1572050747518" duration="29776000" />
|
369
|
<workItem from="1572050747518" duration="29776000" />
|
376
|
<workItem from="1572087949120" duration="1641000" />
|
370
|
<workItem from="1572087949120" duration="1641000" />
|
377
|
<workItem from="1572223206994" duration="28857000" />
|
371
|
<workItem from="1572223206994" duration="28857000" />
|
378
|
- <workItem from="1572309778506" duration="17281000" />
|
372
|
+ <workItem from="1572309778506" duration="17871000" />
|
379
|
</task>
|
373
|
</task>
|
380
|
<task id="LOCAL-00001" summary="数据库配置">
|
374
|
<task id="LOCAL-00001" summary="数据库配置">
|
381
|
<created>1571972429395</created>
|
375
|
<created>1571972429395</created>
|
|
@@ -461,11 +455,25 @@ |
|
@@ -461,11 +455,25 @@ |
461
|
<option name="project" value="LOCAL" />
|
455
|
<option name="project" value="LOCAL" />
|
462
|
<updated>1572329761584</updated>
|
456
|
<updated>1572329761584</updated>
|
463
|
</task>
|
457
|
</task>
|
464
|
- <option name="localTasksCounter" value="13" />
|
458
|
+ <task id="LOCAL-00013" summary="证书">
|
|
|
459
|
+ <created>1572331840264</created>
|
|
|
460
|
+ <option name="number" value="00013" />
|
|
|
461
|
+ <option name="presentableId" value="LOCAL-00013" />
|
|
|
462
|
+ <option name="project" value="LOCAL" />
|
|
|
463
|
+ <updated>1572331840264</updated>
|
|
|
464
|
+ </task>
|
|
|
465
|
+ <task id="LOCAL-00014" summary="证书">
|
|
|
466
|
+ <created>1572332267490</created>
|
|
|
467
|
+ <option name="number" value="00014" />
|
|
|
468
|
+ <option name="presentableId" value="LOCAL-00014" />
|
|
|
469
|
+ <option name="project" value="LOCAL" />
|
|
|
470
|
+ <updated>1572332267490</updated>
|
|
|
471
|
+ </task>
|
|
|
472
|
+ <option name="localTasksCounter" value="15" />
|
465
|
<servers />
|
473
|
<servers />
|
466
|
</component>
|
474
|
</component>
|
467
|
<component name="TimeTrackingManager">
|
475
|
<component name="TimeTrackingManager">
|
468
|
- <option name="totallyTimeSpent" value="176389000" />
|
476
|
+ <option name="totallyTimeSpent" value="176979000" />
|
469
|
</component>
|
477
|
</component>
|
470
|
<component name="ToolWindowManager">
|
478
|
<component name="ToolWindowManager">
|
471
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
479
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -528,12 +536,10 @@ |
|
@@ -528,12 +536,10 @@ |
528
|
<MESSAGE value="数据库配置" />
|
536
|
<MESSAGE value="数据库配置" />
|
529
|
<MESSAGE value="微信公众平台配置" />
|
537
|
<MESSAGE value="微信公众平台配置" />
|
530
|
<MESSAGE value="调试授权" />
|
538
|
<MESSAGE value="调试授权" />
|
531
|
- <option name="LAST_COMMIT_MESSAGE" value="调试授权" />
|
539
|
+ <MESSAGE value="证书" />
|
|
|
540
|
+ <option name="LAST_COMMIT_MESSAGE" value="证书" />
|
532
|
</component>
|
541
|
</component>
|
533
|
<component name="editorHistoryManager">
|
542
|
<component name="editorHistoryManager">
|
534
|
- <entry file="file://$PROJECT_DIR$/application/extra/site.php">
|
|
|
535
|
- <provider selected="true" editor-type-id="text-editor" />
|
|
|
536
|
- </entry>
|
|
|
537
|
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
|
543
|
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
|
538
|
<provider selected="true" editor-type-id="text-editor">
|
544
|
<provider selected="true" editor-type-id="text-editor">
|
539
|
<state relative-caret-position="391">
|
545
|
<state relative-caret-position="391">
|
|
@@ -811,20 +817,6 @@ |
|
@@ -811,20 +817,6 @@ |
811
|
</state>
|
817
|
</state>
|
812
|
</provider>
|
818
|
</provider>
|
813
|
</entry>
|
819
|
</entry>
|
814
|
- <entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
|
|
|
815
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
816
|
- <state>
|
|
|
817
|
- <caret column="15" selection-start-column="15" selection-end-column="15" />
|
|
|
818
|
- </state>
|
|
|
819
|
- </provider>
|
|
|
820
|
- </entry>
|
|
|
821
|
- <entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
|
|
|
822
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
823
|
- <state relative-caret-position="152">
|
|
|
824
|
- <caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
|
|
|
825
|
- </state>
|
|
|
826
|
- </provider>
|
|
|
827
|
- </entry>
|
|
|
828
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
820
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
829
|
<provider selected="true" editor-type-id="text-editor">
|
821
|
<provider selected="true" editor-type-id="text-editor">
|
830
|
<state relative-caret-position="572">
|
822
|
<state relative-caret-position="572">
|
|
@@ -858,10 +850,17 @@ |
|
@@ -858,10 +850,17 @@ |
858
|
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
|
850
|
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
|
859
|
<provider selected="true" editor-type-id="text-editor" />
|
851
|
<provider selected="true" editor-type-id="text-editor" />
|
860
|
</entry>
|
852
|
</entry>
|
|
|
853
|
+ <entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
|
|
|
854
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
855
|
+ <state>
|
|
|
856
|
+ <caret column="15" selection-start-column="15" selection-end-column="15" />
|
|
|
857
|
+ </state>
|
|
|
858
|
+ </provider>
|
|
|
859
|
+ </entry>
|
861
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
860
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
862
|
<provider selected="true" editor-type-id="text-editor">
|
861
|
<provider selected="true" editor-type-id="text-editor">
|
863
|
- <state relative-caret-position="589">
|
|
|
864
|
- <caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
|
862
|
+ <state relative-caret-position="606">
|
|
|
863
|
+ <caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
|
865
|
<folding>
|
864
|
<folding>
|
866
|
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
865
|
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
867
|
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
866
|
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
|
|
@@ -875,10 +874,20 @@ |
|
@@ -875,10 +874,20 @@ |
875
|
</state>
|
874
|
</state>
|
876
|
</provider>
|
875
|
</provider>
|
877
|
</entry>
|
876
|
</entry>
|
|
|
877
|
+ <entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
|
|
|
878
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
879
|
+ <state relative-caret-position="203">
|
|
|
880
|
+ <caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
|
|
|
881
|
+ </state>
|
|
|
882
|
+ </provider>
|
|
|
883
|
+ </entry>
|
|
|
884
|
+ <entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
|
|
|
885
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
886
|
+ </entry>
|
878
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
887
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
879
|
<provider selected="true" editor-type-id="text-editor">
|
888
|
<provider selected="true" editor-type-id="text-editor">
|
880
|
- <state relative-caret-position="544">
|
|
|
881
|
- <caret line="44" column="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
|
889
|
+ <state relative-caret-position="527">
|
|
|
890
|
+ <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
|
882
|
</state>
|
891
|
</state>
|
883
|
</provider>
|
892
|
</provider>
|
884
|
</entry>
|
893
|
</entry>
|