郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 99f876a2350340e0c0862a097d9a650b4f90c645 1 个父辈 cd79a669
1 个管道 的构建 通过 耗费 7 秒

修改判断用户是否注册

内嵌 并排对比
正在显示 2 个修改的文件 包含 171 行增加 和 202 行删除
... ... @@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,104 +24,75 @@
<select />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<leaf>
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<state relative-caret-position="95">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1988#0#PHP" expanded="false" />
<element signature="e#1993#2498#0#PHP" expanded="false" />
<element signature="e#2504#3005#0#PHP" expanded="false" />
<element signature="e#3010#3839#0#PHP" expanded="false" />
<element signature="e#3845#4158#0#PHP" expanded="false" />
<element signature="e#4163#4538#0#PHP" expanded="false" />
<element signature="e#4544#4901#0#PHP" expanded="false" />
<element signature="e#4906#5314#0#PHP" expanded="false" />
<element signature="e#5320#5702#0#PHP" expanded="false" />
<element signature="e#5707#6377#0#PHP" expanded="false" />
<element signature="e#6383#6826#0#PHP" expanded="false" />
<element signature="e#6831#7681#0#PHP" expanded="false" />
<element signature="e#7687#7954#0#PHP" expanded="false" />
<element signature="e#7959#8434#0#PHP" expanded="false" />
<element signature="e#8440#8940#0#PHP" expanded="false" />
<element signature="e#8945#9734#0#PHP" expanded="false" />
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="204" column="5" lean-forward="false" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
<state relative-caret-position="275">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
<element signature="e#609#825#0#PHP" expanded="false" />
<element signature="e#831#1300#0#PHP" expanded="false" />
<element signature="e#1305#2073#0#PHP" expanded="false" />
<element signature="e#2079#2297#0#PHP" expanded="false" />
<element signature="e#2302#2510#0#PHP" expanded="false" />
<element signature="e#2516#2992#0#PHP" expanded="false" />
<element signature="e#2997#3515#0#PHP" expanded="false" />
<element signature="e#3521#4033#0#PHP" expanded="false" />
<element signature="e#4038#4601#0#PHP" expanded="false" />
<element signature="e#4607#5104#0#PHP" expanded="false" />
<element signature="e#5109#5949#0#PHP" expanded="false" />
<element signature="e#5955#6273#0#PHP" expanded="false" />
<element signature="e#6278#6654#0#PHP" expanded="false" />
<element signature="e#6660#7015#0#PHP" expanded="false" />
<element signature="e#7020#7429#0#PHP" expanded="false" />
<element signature="e#7435#7820#0#PHP" expanded="false" />
<element signature="e#7825#8496#0#PHP" expanded="false" />
<element signature="e#8502#8948#0#PHP" expanded="false" />
<element signature="e#8953#9804#0#PHP" expanded="false" />
<element signature="e#9810#10080#0#PHP" expanded="false" />
<element signature="e#10085#10561#0#PHP" expanded="false" />
<element signature="e#10567#11127#0#PHP" expanded="false" />
<element signature="e#11132#11959#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<file leaf-file-name="RestBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="624">
<caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="515">
<caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
... ... @@ -146,7 +117,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/select.html" />
<option value="$PROJECT_DIR$/data/conf/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
... ... @@ -184,7 +154,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/know/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/build/index.html" />
<option value="$PROJECT_DIR$/public/info.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
<option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/simplewind/vendor/weiwei/api-doc/src/Doc.php" />
... ... @@ -197,6 +166,8 @@
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
</list>
</option>
</component>
... ... @@ -214,9 +185,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="417" />
<option name="y" value="82" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="235" />
<option name="y" value="57" />
<option name="width" value="1582" />
<option name="height" value="982" />
</component>
... ... @@ -235,7 +206,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
... ... @@ -266,6 +236,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -353,18 +324,19 @@
<workItem from="1574815992559" duration="11623000" />
<workItem from="1574837405404" duration="1203000" />
<workItem from="1574903328460" duration="15512000" />
<workItem from="1574930017327" duration="7063000" />
<workItem from="1574930017327" duration="7716000" />
<workItem from="1574986868818" duration="2791000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="355055000" />
<option name="totallyTimeSpent" value="358499000" />
</component>
<component name="ToolWindowManager">
<frame x="417" y="82" width="1582" height="982" extended-state="0" />
<frame x="235" y="57" width="1582" height="982" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1826544" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18528253" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -592,14 +564,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="230" column="28" lean-forward="true" selection-start-line="230" selection-start-column="28" selection-end-line="230" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/ShoppicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
... ... @@ -667,7 +631,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="34" column="21" lean-forward="false" selection-start-line="34" selection-start-column="21" selection-end-line="34" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -702,24 +665,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="138" column="4" lean-forward="true" selection-start-line="138" selection-start-column="4" selection-end-line="177" selection-end-column="5" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#859#1113#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
... ... @@ -776,9 +721,58 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
<folding>
<element signature="n#generateCode#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="562" column="58" lean-forward="true" selection-start-line="562" selection-start-column="58" selection-end-line="562" selection-end-column="58" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<state relative-caret-position="618">
<caret line="204" column="5" lean-forward="false" selection-start-line="204" selection-start-column="5" selection-end-line="204" selection-end-column="5" />
<folding>
<element signature="e#411#604#0#PHP" expanded="false" />
... ... @@ -809,9 +803,39 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<folding>
<element signature="e#131#161#0#PHP" expanded="false" />
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1988#0#PHP" expanded="false" />
<element signature="e#1993#2498#0#PHP" expanded="false" />
<element signature="e#2504#3005#0#PHP" expanded="false" />
<element signature="e#3010#3839#0#PHP" expanded="false" />
<element signature="e#3845#4158#0#PHP" expanded="false" />
<element signature="e#4163#4538#0#PHP" expanded="false" />
<element signature="e#4544#4901#0#PHP" expanded="false" />
<element signature="e#4906#5314#0#PHP" expanded="false" />
<element signature="e#5320#5702#0#PHP" expanded="false" />
<element signature="e#5707#6377#0#PHP" expanded="false" />
<element signature="e#6383#6826#0#PHP" expanded="false" />
<element signature="e#6831#7681#0#PHP" expanded="false" />
<element signature="e#7687#7954#0#PHP" expanded="false" />
<element signature="e#7959#8434#0#PHP" expanded="false" />
<element signature="e#8440#8940#0#PHP" expanded="false" />
<element signature="e#8945#9734#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="842">
<state relative-caret-position="95">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
... ... @@ -830,6 +854,8 @@
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
... ... @@ -849,82 +875,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/nsms/nsms.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
<state relative-caret-position="515">
<caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="423">
<caret line="1781" column="23" lean-forward="false" selection-start-line="1781" selection-start-column="23" selection-end-line="1781" selection-end-column="23" />
<folding>
<element signature="n#generateCode#0;n#!!top" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="160" column="7" lean-forward="true" selection-start-line="160" selection-start-column="7" selection-end-line="160" selection-end-column="7" />
<folding>
<element signature="e#131#161#0#PHP" expanded="true" />
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
<element signature="e#896#1112#0#PHP" expanded="false" />
<element signature="e#1117#1500#0#PHP" expanded="false" />
<element signature="e#1506#1988#0#PHP" expanded="false" />
<element signature="e#1993#2498#0#PHP" expanded="false" />
<element signature="e#2504#3005#0#PHP" expanded="false" />
<element signature="e#3010#3839#0#PHP" expanded="false" />
<element signature="e#3845#4158#0#PHP" expanded="false" />
<element signature="e#4163#4538#0#PHP" expanded="false" />
<element signature="e#4544#4901#0#PHP" expanded="false" />
<element signature="e#4906#5314#0#PHP" expanded="false" />
<element signature="e#5320#5702#0#PHP" expanded="false" />
<element signature="e#5707#6377#0#PHP" expanded="false" />
<element signature="e#6383#6826#0#PHP" expanded="false" />
<element signature="e#6831#7681#0#PHP" expanded="false" />
<element signature="e#7687#7954#0#PHP" expanded="false" />
<element signature="e#7959#8434#0#PHP" expanded="false" />
<element signature="e#8440#8940#0#PHP" expanded="false" />
<element signature="e#8945#9734#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="624">
<caret line="581" column="40" lean-forward="true" selection-start-line="581" selection-start-column="40" selection-end-line="581" selection-end-column="40" />
<state relative-caret-position="275">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -92,27 +92,26 @@ class RestBaseController
private function _initUser()
{
$token = $this->request->header('XX-Token');
$deviceType = $this->request->header('XX-Device-Type');
//$deviceType = $this->request->header('XX-Device-Type');
if (empty($token)) {
return;
}
if (empty($deviceType)) {
return;
}
// if (empty($deviceType)) {
// return;
// }
if (!in_array($deviceType, $this->allowedDeviceTypes)) {
return;
}
// if (!in_array($deviceType, $this->allowedDeviceTypes)) {
// return;
// }
$this->token = $token;
$this->deviceType = $deviceType;
//$this->deviceType = $deviceType;
$user = Db::name('user_token')
->alias('a')
->field('b.*')
->where(['token' => $token, 'device_type' => $deviceType])
->where(['token' => $token])
->join('__USER__ b', 'a.user_id = b.id')
->find();
... ...