郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 55577541cbeb5b1d310f35efefd98df0515cfa65 1 个父辈 c4ea7e99
1 个管道 的构建 通过 耗费 1 秒

修改判断用户身份

内嵌 并排对比
正在显示 2 个修改的文件 包含 133 行增加 和 71 行删除
... ... @@ -2,8 +2,7 @@
<project version="4">
<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/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,11 +24,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="394">
<caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" />
<state relative-caret-position="498">
<caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -51,6 +50,8 @@
<element signature="e#7527#8377#0#PHP" expanded="false" />
<element signature="e#8383#8650#0#PHP" expanded="false" />
<element signature="e#8655#9130#0#PHP" expanded="false" />
<element signature="e#9136#9635#0#PHP" expanded="false" />
<element signature="e#9640#10661#0#PHP" expanded="false" />
<element signature="e#10667#11034#0#PHP" expanded="false" />
<element signature="e#11039#11479#0#PHP" expanded="false" />
</folding>
... ... @@ -58,6 +59,64 @@
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="199">
<caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3844#0#PHP" expanded="false" />
<element signature="e#3850#4197#0#PHP" expanded="false" />
<element signature="e#4202#4648#0#PHP" expanded="false" />
<element signature="e#4654#4914#0#PHP" expanded="false" />
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6046#0#PHP" expanded="false" />
<element signature="e#6051#7279#0#PHP" expanded="false" />
<element signature="e#7302#7847#0#PHP" expanded="false" />
<element signature="e#7853#8134#0#PHP" expanded="false" />
<element signature="e#8139#8531#0#PHP" expanded="false" />
<element signature="e#8537#9086#0#PHP" expanded="false" />
<element signature="e#9091#10290#0#PHP" expanded="false" />
<element signature="e#10296#10753#0#PHP" expanded="false" />
<element signature="e#10758#12021#0#PHP" expanded="false" />
<element signature="e#12044#12396#0#PHP" expanded="false" />
<element signature="e#12402#13086#0#PHP" expanded="false" />
<element signature="e#13091#14350#0#PHP" expanded="false" />
<element signature="e#14356#14818#0#PHP" expanded="false" />
<element signature="e#14823#17028#0#PHP" expanded="false" />
<element signature="e#17034#17643#0#PHP" expanded="false" />
<element signature="e#17648#18981#0#PHP" expanded="false" />
<element signature="e#18987#19344#0#PHP" expanded="false" />
<element signature="e#19349#20230#0#PHP" expanded="false" />
<element signature="e#20236#20588#0#PHP" expanded="false" />
<element signature="e#20593#21670#0#PHP" expanded="false" />
<element signature="e#21676#22031#0#PHP" expanded="false" />
<element signature="e#22036#23116#0#PHP" expanded="false" />
<element signature="e#23122#23546#0#PHP" expanded="false" />
<element signature="e#23551#24162#0#PHP" expanded="false" />
<element signature="e#24168#24664#0#PHP" expanded="false" />
<element signature="e#24669#25776#0#PHP" expanded="false" />
<element signature="e#25782#26066#0#PHP" expanded="false" />
<element signature="e#26071#26649#0#PHP" expanded="false" />
<element signature="e#26670#26989#0#PHP" expanded="false" />
<element signature="e#26995#27403#0#PHP" expanded="false" />
<element signature="e#27409#28168#0#PHP" expanded="false" />
<element signature="e#28188#29052#0#PHP" expanded="false" />
<element signature="e#29079#29479#0#PHP" expanded="false" />
<element signature="e#29503#30076#0#PHP" expanded="false" />
<element signature="e#30099#30909#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -127,8 +186,8 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -146,9 +205,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="39" />
<option name="y" value="38" />
<component name="ProjectFrameBounds">
<option name="x" value="302" />
<option name="y" value="62" />
<option name="width" value="1582" />
<option name="height" value="960" />
</component>
... ... @@ -293,15 +352,15 @@
<workItem from="1575332430854" duration="21245000" />
<workItem from="1575359408189" duration="10054000" />
<workItem from="1575419186725" duration="599000" />
<workItem from="1575420787741" duration="903000" />
<workItem from="1575420787741" duration="1612000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="443259000" />
<option name="totallyTimeSpent" value="443968000" />
</component>
<component name="ToolWindowManager">
<frame x="39" y="38" width="1582" height="960" extended-state="1" />
<frame x="302" y="62" width="1582" height="960" extended-state="0" />
<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.17017083" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -764,65 +823,10 @@
</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="328">
<caret line="823" column="27" lean-forward="false" selection-start-line="823" selection-start-column="27" selection-end-line="823" selection-end-column="27" />
<folding>
<element signature="e#131#169#0#PHP" expanded="false" />
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3857#0#PHP" expanded="false" />
<element signature="e#3863#4210#0#PHP" expanded="false" />
<element signature="e#4215#4661#0#PHP" expanded="false" />
<element signature="e#4667#4927#0#PHP" expanded="false" />
<element signature="e#4932#5133#0#PHP" expanded="false" />
<element signature="e#5139#5401#0#PHP" expanded="false" />
<element signature="e#5406#5611#0#PHP" expanded="false" />
<element signature="e#5617#6059#0#PHP" expanded="false" />
<element signature="e#6064#7292#0#PHP" expanded="false" />
<element signature="e#7315#7860#0#PHP" expanded="false" />
<element signature="e#7866#8147#0#PHP" expanded="false" />
<element signature="e#8152#8544#0#PHP" expanded="false" />
<element signature="e#8550#9099#0#PHP" expanded="false" />
<element signature="e#9104#10303#0#PHP" expanded="false" />
<element signature="e#10309#10766#0#PHP" expanded="false" />
<element signature="e#10771#12034#0#PHP" expanded="false" />
<element signature="e#12057#12409#0#PHP" expanded="false" />
<element signature="e#12415#13099#0#PHP" expanded="false" />
<element signature="e#13104#14363#0#PHP" expanded="false" />
<element signature="e#14369#14831#0#PHP" expanded="false" />
<element signature="e#14836#17041#0#PHP" expanded="false" />
<element signature="e#17047#17656#0#PHP" expanded="false" />
<element signature="e#17661#18994#0#PHP" expanded="false" />
<element signature="e#19000#19357#0#PHP" expanded="false" />
<element signature="e#19362#20243#0#PHP" expanded="false" />
<element signature="e#20249#20601#0#PHP" expanded="false" />
<element signature="e#20606#21683#0#PHP" expanded="false" />
<element signature="e#21689#22044#0#PHP" expanded="false" />
<element signature="e#22049#23129#0#PHP" expanded="false" />
<element signature="e#23135#23559#0#PHP" expanded="false" />
<element signature="e#23564#24175#0#PHP" expanded="false" />
<element signature="e#25795#26079#0#PHP" expanded="false" />
<element signature="e#26084#26662#0#PHP" expanded="false" />
<element signature="e#26683#27002#0#PHP" expanded="false" />
<element signature="e#27008#27416#0#PHP" expanded="false" />
<element signature="e#27422#28181#0#PHP" expanded="false" />
<element signature="e#28201#29065#0#PHP" expanded="false" />
<element signature="e#29092#29492#0#PHP" expanded="false" />
<element signature="e#29516#30089#0#PHP" expanded="false" />
<element signature="e#30112#30922#0#PHP" 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="394">
<caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" />
<state relative-caret-position="498">
<caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
<folding>
<element signature="e#329#544#0#PHP" expanded="false" />
<element signature="e#549#890#0#PHP" expanded="false" />
... ... @@ -844,11 +848,69 @@
<element signature="e#7527#8377#0#PHP" expanded="false" />
<element signature="e#8383#8650#0#PHP" expanded="false" />
<element signature="e#8655#9130#0#PHP" expanded="false" />
<element signature="e#9136#9635#0#PHP" expanded="false" />
<element signature="e#9640#10661#0#PHP" expanded="false" />
<element signature="e#10667#11034#0#PHP" expanded="false" />
<element signature="e#11039#11479#0#PHP" 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="199">
<caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
<folding>
<element signature="e#366#715#0#PHP" expanded="false" />
<element signature="e#720#1485#0#PHP" expanded="false" />
<element signature="e#1491#1720#0#PHP" expanded="false" />
<element signature="e#1725#3358#0#PHP" expanded="false" />
<element signature="e#3364#3604#0#PHP" expanded="false" />
<element signature="e#3609#3844#0#PHP" expanded="false" />
<element signature="e#3850#4197#0#PHP" expanded="false" />
<element signature="e#4202#4648#0#PHP" expanded="false" />
<element signature="e#4654#4914#0#PHP" expanded="false" />
<element signature="e#4919#5120#0#PHP" expanded="false" />
<element signature="e#5126#5388#0#PHP" expanded="false" />
<element signature="e#5393#5598#0#PHP" expanded="false" />
<element signature="e#5604#6046#0#PHP" expanded="false" />
<element signature="e#6051#7279#0#PHP" expanded="false" />
<element signature="e#7302#7847#0#PHP" expanded="false" />
<element signature="e#7853#8134#0#PHP" expanded="false" />
<element signature="e#8139#8531#0#PHP" expanded="false" />
<element signature="e#8537#9086#0#PHP" expanded="false" />
<element signature="e#9091#10290#0#PHP" expanded="false" />
<element signature="e#10296#10753#0#PHP" expanded="false" />
<element signature="e#10758#12021#0#PHP" expanded="false" />
<element signature="e#12044#12396#0#PHP" expanded="false" />
<element signature="e#12402#13086#0#PHP" expanded="false" />
<element signature="e#13091#14350#0#PHP" expanded="false" />
<element signature="e#14356#14818#0#PHP" expanded="false" />
<element signature="e#14823#17028#0#PHP" expanded="false" />
<element signature="e#17034#17643#0#PHP" expanded="false" />
<element signature="e#17648#18981#0#PHP" expanded="false" />
<element signature="e#18987#19344#0#PHP" expanded="false" />
<element signature="e#19349#20230#0#PHP" expanded="false" />
<element signature="e#20236#20588#0#PHP" expanded="false" />
<element signature="e#20593#21670#0#PHP" expanded="false" />
<element signature="e#21676#22031#0#PHP" expanded="false" />
<element signature="e#22036#23116#0#PHP" expanded="false" />
<element signature="e#23122#23546#0#PHP" expanded="false" />
<element signature="e#23551#24162#0#PHP" expanded="false" />
<element signature="e#24168#24664#0#PHP" expanded="false" />
<element signature="e#24669#25776#0#PHP" expanded="false" />
<element signature="e#25782#26066#0#PHP" expanded="false" />
<element signature="e#26071#26649#0#PHP" expanded="false" />
<element signature="e#26670#26989#0#PHP" expanded="false" />
<element signature="e#26995#27403#0#PHP" expanded="false" />
<element signature="e#27409#28168#0#PHP" expanded="false" />
<element signature="e#28188#29052#0#PHP" expanded="false" />
<element signature="e#29079#29479#0#PHP" expanded="false" />
<element signature="e#29503#30076#0#PHP" expanded="false" />
<element signature="e#30099#30909#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -135,9 +135,9 @@ class UserController extends RestBaseController
$user_id = $this->getUserId();
$data = Db::name('user')
->where('id',$user_id)
->field('id,is_set')
->field('is_set')
->find();
$this->success('success',$data['is_set']);
$this->success('success',$data);
}
/**
... ...