王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 e2b0058a30ba8c30e462246941d44c8f7bc9e991 1 个父辈 c0f8900c

权限调试

内嵌 并排对比
正在显示 2 个修改的文件 包含 82 行增加 和 28 行删除
... ... @@ -2,7 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/extra/wechat.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/wechat.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -16,11 +17,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
<state relative-caret-position="289">
<caret line="67" column="68" selection-start-line="67" selection-start-column="68" selection-end-line="67" selection-end-column="68" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
... ... @@ -28,6 +29,24 @@
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -69,7 +88,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log/index.html" />
... ... @@ -77,7 +95,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/model/Goods.php" />
... ... @@ -107,6 +124,8 @@
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
</list>
</option>
</component>
... ... @@ -232,6 +251,12 @@
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="extra" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -317,7 +342,7 @@
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="26117000" />
<workItem from="1572395935540" duration="27417000" />
<workItem from="1572395935540" duration="27976000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -557,11 +582,39 @@
<option name="project" value="LOCAL" />
<updated>1572417195136</updated>
</task>
<option name="localTasksCounter" value="35" />
<task id="LOCAL-00035" summary="权限调试">
<created>1572435878816</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1572435878818</updated>
</task>
<task id="LOCAL-00036" summary="权限调试">
<created>1572435963964</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1572435963964</updated>
</task>
<task id="LOCAL-00037" summary="权限调试">
<created>1572436017689</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1572436017689</updated>
</task>
<task id="LOCAL-00038" summary="权限调试">
<created>1572436214307</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1572436214307</updated>
</task>
<option name="localTasksCounter" value="39" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="212642000" />
<option name="totallyTimeSpent" value="213201000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -628,16 +681,10 @@
<MESSAGE value="支付" />
<MESSAGE value="提现" />
<MESSAGE value="调试提现" />
<option name="LAST_COMMIT_MESSAGE" value="调试提现" />
<MESSAGE value="权限调试" />
<option name="LAST_COMMIT_MESSAGE" value="权限调试" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -696,13 +743,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="833">
<caret line="49" column="65" selection-start-line="49" selection-start-column="65" selection-end-line="49" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
... ... @@ -1011,14 +1051,28 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="69" column="15" selection-start-line="69" selection-start-column="15" selection-end-line="69" selection-end-column="15" />
<state relative-caret-position="289">
<caret line="67" column="68" selection-start-line="67" selection-start-column="68" selection-end-line="67" selection-end-column="68" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="21" column="42" selection-start-line="21" selection-start-column="42" selection-end-line="21" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="51" column="36" selection-start-line="51" selection-start-column="36" selection-end-line="51" selection-end-column="36" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>
... ...
... ... @@ -48,8 +48,8 @@ return [
'payment' => [
'merchant_id' => '1559598041',
'key' => 'JEV45KQewTHopscD9uQj0IBigQTtS2IF',
'cert_path' => 'wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
'key_path' => 'wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！
'cert_path' => '../wechat/cert/apiclient_cert.pem', // XXX: 绝对路径！！！！
'key_path' => '../wechat/cert/apiclient_key.pem', // XXX: 绝对路径！！！！
// 'device_info' => '013467007045764',
// 'sub_app_id' => '',
// 'sub_merchant_id' => '',
... ...