王晓刚 / advertising · 提交

转到一个项目

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

我的分享

内嵌 并排对比
正在显示 2 个修改的文件 包含 100 行增加 和 68 行删除
... ... @@ -5,7 +5,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/application/home/view/share/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/share/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Server.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Server.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -63,17 +64,35 @@
<file leaf-file-name="Share.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="553">
<caret line="94" column="37" selection-start-line="94" selection-start-column="37" selection-end-line="94" selection-end-column="37" />
<state relative-caret-position="723">
<caret line="98" column="60" lean-forward="true" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="Server.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1971">
<caret line="152" column="20" selection-start-line="152" selection-start-column="20" selection-end-line="152" selection-end-column="20" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="89" column="67" selection-start-line="89" selection-start-column="67" selection-end-line="89" selection-end-column="67" />
<state relative-caret-position="640">
<caret line="89" column="34" selection-start-line="89" selection-start-column="34" selection-end-line="89" selection-end-column="34" />
</state>
</provider>
</entry>
... ... @@ -160,7 +179,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/assets/js/backend/slide.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_exp_log_audit.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
... ... @@ -209,8 +227,9 @@
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter_view.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/view/share/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
</list>
</option>
</component>
... ... @@ -302,6 +321,12 @@
<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="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -430,42 +455,7 @@
<workItem from="1572914713443" duration="29898000" />
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="30413000" />
</task>
<task id="LOCAL-00369" summary="我的钱包">
<created>1573210032963</created>
<option name="number" value="00369" />
<option name="presentableId" value="LOCAL-00369" />
<option name="project" value="LOCAL" />
<updated>1573210032963</updated>
</task>
<task id="LOCAL-00370" summary="我的钱包">
<created>1573210088082</created>
<option name="number" value="00370" />
<option name="presentableId" value="LOCAL-00370" />
<option name="project" value="LOCAL" />
<updated>1573210088082</updated>
</task>
<task id="LOCAL-00371" summary="我的钱包">
<created>1573210145431</created>
<option name="number" value="00371" />
<option name="presentableId" value="LOCAL-00371" />
<option name="project" value="LOCAL" />
<updated>1573210145431</updated>
</task>
<task id="LOCAL-00372" summary="我的钱包">
<created>1573210186311</created>
<option name="number" value="00372" />
<option name="presentableId" value="LOCAL-00372" />
<option name="project" value="LOCAL" />
<updated>1573210186311</updated>
</task>
<task id="LOCAL-00373" summary="我的钱包">
<created>1573210209764</created>
<option name="number" value="00373" />
<option name="presentableId" value="LOCAL-00373" />
<option name="project" value="LOCAL" />
<updated>1573210209764</updated>
<workItem from="1573174620844" duration="31580000" />
</task>
<task id="LOCAL-00374" summary="我的钱包">
<created>1573210247059</created>
... ... @@ -775,11 +765,46 @@
<option name="project" value="LOCAL" />
<updated>1573212192169</updated>
</task>
<option name="localTasksCounter" value="418" />
<task id="LOCAL-00418" summary="我的分享">
<created>1573212301573</created>
<option name="number" value="00418" />
<option name="presentableId" value="LOCAL-00418" />
<option name="project" value="LOCAL" />
<updated>1573212301573</updated>
</task>
<task id="LOCAL-00419" summary="我的分享">
<created>1573212356105</created>
<option name="number" value="00419" />
<option name="presentableId" value="LOCAL-00419" />
<option name="project" value="LOCAL" />
<updated>1573212356105</updated>
</task>
<task id="LOCAL-00420" summary="我的分享">
<created>1573212444481</created>
<option name="number" value="00420" />
<option name="presentableId" value="LOCAL-00420" />
<option name="project" value="LOCAL" />
<updated>1573212444481</updated>
</task>
<task id="LOCAL-00421" summary="我的分享">
<created>1573212483509</created>
<option name="number" value="00421" />
<option name="presentableId" value="LOCAL-00421" />
<option name="project" value="LOCAL" />
<updated>1573212483509</updated>
</task>
<task id="LOCAL-00422" summary="我的分享">
<created>1573213355407</created>
<option name="number" value="00422" />
<option name="presentableId" value="LOCAL-00422" />
<option name="project" value="LOCAL" />
<updated>1573213355407</updated>
</task>
<option name="localTasksCounter" value="423" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="371505000" />
<option name="totallyTimeSpent" value="372672000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -864,13 +889,6 @@
<option name="LAST_COMMIT_MESSAGE" value="我的分享" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="63" selection-start-line="63" selection-end-line="63" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4352">
... ... @@ -982,9 +1000,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
... ... @@ -1103,13 +1118,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1037">
<caret line="69" column="8" selection-start-line="69" selection-start-column="8" selection-end-line="71" selection-end-column="63" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
... ... @@ -1185,17 +1193,38 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="89" column="34" selection-start-line="89" selection-start-column="34" selection-end-line="89" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="17" column="8" lean-forward="true" selection-start-line="17" selection-start-column="8" selection-end-line="17" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Share.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="553">
<caret line="94" column="37" selection-start-line="94" selection-start-column="37" selection-end-line="94" selection-end-column="37" />
<state relative-caret-position="723">
<caret line="98" column="60" lean-forward="true" selection-start-line="98" selection-start-column="60" selection-end-line="98" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/share/index.html">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="61" selection-start-line="20" selection-start-column="18" selection-end-line="20" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Server.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="89" column="67" selection-start-line="89" selection-start-column="67" selection-end-line="89" selection-end-column="67" />
<state relative-caret-position="1971">
<caret line="152" column="20" selection-start-line="152" selection-start-column="20" selection-end-line="152" selection-end-column="20" />
</state>
</provider>
</entry>
... ...
... ... @@ -62,6 +62,7 @@ class Server extends WechatBase
$token = $accessToken->getToken(false);
$url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=$token&openid=$openid&lang=zh_CN";
$user_data = json_decode($this->http_get($url),true);
cache('user_data',$user_data);
$this->new_user($user_data,$openid,$options['app_id'],$share_id);
}
}
... ... @@ -135,6 +136,7 @@ class Server extends WechatBase
'type' => 1,
'parent_id' => $share_id,
]);
cache($userId);
$row=Db::name("third")->insert([
'openid' => $openid,
... ... @@ -148,6 +150,7 @@ class Server extends WechatBase
'login_times' => 1,
'more' => json_encode($wechat_user)
]);
cache($row);
return $userId;
}
}
\ No newline at end of file
... ...