王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 fd93382e70c056c9067d4ee4dc8a50943ea98da8 1 个父辈 e5a74fc7
1 个管道 的构建 通过 耗费 0 秒

权限调试

内嵌 并排对比
正在显示 2 个修改的文件 包含 34 行增加 和 21 行删除
@@ -2,8 +2,7 @@ @@ -2,8 +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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/application/extra/wechat.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/wechat.php" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/application/admin/controller/Pay.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Pay.php" afterDir="false" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -29,20 +28,20 @@ @@ -29,20 +28,20 @@
29 </provider> 28 </provider>
30 </entry> 29 </entry>
31 </file> 30 </file>
32 - <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false"> 31 + <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
33 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php"> 32 <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
34 <provider selected="true" editor-type-id="text-editor"> 33 <provider selected="true" editor-type-id="text-editor">
35 - <state relative-caret-position="306">  
36 - <caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" /> 34 + <state relative-caret-position="34">
  35 + <caret line="25" column="19" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
37 </state> 36 </state>
38 </provider> 37 </provider>
39 </entry> 38 </entry>
40 </file> 39 </file>
41 - <file leaf-file-name="wechat.php" pinned="false" current-in-tab="true"> 40 + <file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
42 <entry file="file://$PROJECT_DIR$/application/extra/wechat.php"> 41 <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
43 <provider selected="true" editor-type-id="text-editor"> 42 <provider selected="true" editor-type-id="text-editor">
44 - <state relative-caret-position="487">  
45 - <caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" /> 43 + <state relative-caret-position="623">
  44 + <caret line="59" column="6" lean-forward="true" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
46 </state> 45 </state>
47 </provider> 46 </provider>
48 </entry> 47 </entry>
@@ -124,8 +123,8 @@ @@ -124,8 +123,8 @@
124 <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" /> 123 <option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
125 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" /> 124 <option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
126 <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" /> 125 <option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
127 - <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />  
128 <option value="$PROJECT_DIR$/application/extra/wechat.php" /> 126 <option value="$PROJECT_DIR$/application/extra/wechat.php" />
  127 + <option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
129 </list> 128 </list>
130 </option> 129 </option>
131 </component> 130 </component>
@@ -342,7 +341,7 @@ @@ -342,7 +341,7 @@
342 <workItem from="1572087949120" duration="1641000" /> 341 <workItem from="1572087949120" duration="1641000" />
343 <workItem from="1572223206994" duration="28857000" /> 342 <workItem from="1572223206994" duration="28857000" />
344 <workItem from="1572309778506" duration="26117000" /> 343 <workItem from="1572309778506" duration="26117000" />
345 - <workItem from="1572395935540" duration="27976000" /> 344 + <workItem from="1572395935540" duration="28060000" />
346 </task> 345 </task>
347 <task id="LOCAL-00001" summary="数据库配置"> 346 <task id="LOCAL-00001" summary="数据库配置">
348 <created>1571972429395</created> 347 <created>1571972429395</created>
@@ -610,11 +609,25 @@ @@ -610,11 +609,25 @@
610 <option name="project" value="LOCAL" /> 609 <option name="project" value="LOCAL" />
611 <updated>1572436214307</updated> 610 <updated>1572436214307</updated>
612 </task> 611 </task>
613 - <option name="localTasksCounter" value="39" /> 612 + <task id="LOCAL-00039" summary="权限调试">
  613 + <created>1572436430112</created>
  614 + <option name="number" value="00039" />
  615 + <option name="presentableId" value="LOCAL-00039" />
  616 + <option name="project" value="LOCAL" />
  617 + <updated>1572436430112</updated>
  618 + </task>
  619 + <task id="LOCAL-00040" summary="权限调试">
  620 + <created>1572436442390</created>
  621 + <option name="number" value="00040" />
  622 + <option name="presentableId" value="LOCAL-00040" />
  623 + <option name="project" value="LOCAL" />
  624 + <updated>1572436442390</updated>
  625 + </task>
  626 + <option name="localTasksCounter" value="41" />
614 <servers /> 627 <servers />
615 </component> 628 </component>
616 <component name="TimeTrackingManager"> 629 <component name="TimeTrackingManager">
617 - <option name="totallyTimeSpent" value="213201000" /> 630 + <option name="totallyTimeSpent" value="213285000" />
618 </component> 631 </component>
619 <component name="ToolWindowManager"> 632 <component name="ToolWindowManager">
620 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 633 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1059,17 +1072,17 @@ @@ -1059,17 +1072,17 @@
1059 </state> 1072 </state>
1060 </provider> 1073 </provider>
1061 </entry> 1074 </entry>
1062 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php"> 1075 + <entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
1063 <provider selected="true" editor-type-id="text-editor"> 1076 <provider selected="true" editor-type-id="text-editor">
1064 - <state relative-caret-position="306">  
1065 - <caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" /> 1077 + <state relative-caret-position="623">
  1078 + <caret line="59" column="6" lean-forward="true" selection-start-line="59" selection-start-column="6" selection-end-line="59" selection-end-column="6" />
1066 </state> 1079 </state>
1067 </provider> 1080 </provider>
1068 </entry> 1081 </entry>
1069 - <entry file="file://$PROJECT_DIR$/application/extra/wechat.php"> 1082 + <entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
1070 <provider selected="true" editor-type-id="text-editor"> 1083 <provider selected="true" editor-type-id="text-editor">
1071 - <state relative-caret-position="487">  
1072 - <caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" /> 1084 + <state relative-caret-position="34">
  1085 + <caret line="25" column="19" selection-start-line="25" selection-start-column="19" selection-end-line="25" selection-end-column="19" />
1073 </state> 1086 </state>
1074 </provider> 1087 </provider>
1075 </entry> 1088 </entry>
@@ -48,8 +48,8 @@ return [ @@ -48,8 +48,8 @@ return [
48 'payment' => [ 48 'payment' => [
49 'merchant_id' => '1559598041', 49 'merchant_id' => '1559598041',
50 'key' => 'JEV45KQewTHopscD9uQj0IBigQTtS2IF', 50 'key' => 'JEV45KQewTHopscD9uQj0IBigQTtS2IF',
51 - 'cert_path' => '../wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！  
52 - 'key_path' => '../wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！ 51 + 'cert_path' => 'wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
  52 + 'key_path' => 'wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！
53 // 'device_info' => '013467007045764', 53 // 'device_info' => '013467007045764',
54 // 'sub_app_id' => '', 54 // 'sub_app_id' => '',
55 // 'sub_merchant_id' => '', 55 // 'sub_merchant_id' => '',
@@ -62,6 +62,6 @@ return [ @@ -62,6 +62,6 @@ return [
62 */ 62 */
63 'guzzle' => [ 63 'guzzle' => [
64 'timeout' => 3.0, // 超时时间（秒） 64 'timeout' => 3.0, // 超时时间（秒）
65 - 'verify' => true, // 关掉 SSL 认证（强烈不建议！！！） 65 + 'verify' => false, // 关掉 SSL 认证（强烈不建议！！！）
66 ], 66 ],
67 ]; 67 ];