郭盛 / scrap · 提交

转到一个项目

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

修改判断用户身份

内嵌 并排对比
正在显示 2 个修改的文件 包含 133 行增加 和 71 行删除
@@ -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="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/HomeController.php" afterPath="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
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" />
@@ -25,11 +24,11 @@ @@ -25,11 +24,11 @@
25 </component> 24 </component>
26 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
27 <leaf> 26 <leaf>
28 - <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="true"> 27 + <file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 28 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
30 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
31 - <state relative-caret-position="394">  
32 - <caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" /> 30 + <state relative-caret-position="498">
  31 + <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
33 <folding> 32 <folding>
34 <element signature="e#329#544#0#PHP" expanded="false" /> 33 <element signature="e#329#544#0#PHP" expanded="false" />
35 <element signature="e#549#890#0#PHP" expanded="false" /> 34 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -51,6 +50,8 @@ @@ -51,6 +50,8 @@
51 <element signature="e#7527#8377#0#PHP" expanded="false" /> 50 <element signature="e#7527#8377#0#PHP" expanded="false" />
52 <element signature="e#8383#8650#0#PHP" expanded="false" /> 51 <element signature="e#8383#8650#0#PHP" expanded="false" />
53 <element signature="e#8655#9130#0#PHP" expanded="false" /> 52 <element signature="e#8655#9130#0#PHP" expanded="false" />
  53 + <element signature="e#9136#9635#0#PHP" expanded="false" />
  54 + <element signature="e#9640#10661#0#PHP" expanded="false" />
54 <element signature="e#10667#11034#0#PHP" expanded="false" /> 55 <element signature="e#10667#11034#0#PHP" expanded="false" />
55 <element signature="e#11039#11479#0#PHP" expanded="false" /> 56 <element signature="e#11039#11479#0#PHP" expanded="false" />
56 </folding> 57 </folding>
@@ -58,6 +59,64 @@ @@ -58,6 +59,64 @@
58 </provider> 59 </provider>
59 </entry> 60 </entry>
60 </file> 61 </file>
  62 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
  63 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state relative-caret-position="199">
  66 + <caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
  67 + <folding>
  68 + <element signature="e#366#715#0#PHP" expanded="false" />
  69 + <element signature="e#720#1485#0#PHP" expanded="false" />
  70 + <element signature="e#1491#1720#0#PHP" expanded="false" />
  71 + <element signature="e#1725#3358#0#PHP" expanded="false" />
  72 + <element signature="e#3364#3604#0#PHP" expanded="false" />
  73 + <element signature="e#3609#3844#0#PHP" expanded="false" />
  74 + <element signature="e#3850#4197#0#PHP" expanded="false" />
  75 + <element signature="e#4202#4648#0#PHP" expanded="false" />
  76 + <element signature="e#4654#4914#0#PHP" expanded="false" />
  77 + <element signature="e#4919#5120#0#PHP" expanded="false" />
  78 + <element signature="e#5126#5388#0#PHP" expanded="false" />
  79 + <element signature="e#5393#5598#0#PHP" expanded="false" />
  80 + <element signature="e#5604#6046#0#PHP" expanded="false" />
  81 + <element signature="e#6051#7279#0#PHP" expanded="false" />
  82 + <element signature="e#7302#7847#0#PHP" expanded="false" />
  83 + <element signature="e#7853#8134#0#PHP" expanded="false" />
  84 + <element signature="e#8139#8531#0#PHP" expanded="false" />
  85 + <element signature="e#8537#9086#0#PHP" expanded="false" />
  86 + <element signature="e#9091#10290#0#PHP" expanded="false" />
  87 + <element signature="e#10296#10753#0#PHP" expanded="false" />
  88 + <element signature="e#10758#12021#0#PHP" expanded="false" />
  89 + <element signature="e#12044#12396#0#PHP" expanded="false" />
  90 + <element signature="e#12402#13086#0#PHP" expanded="false" />
  91 + <element signature="e#13091#14350#0#PHP" expanded="false" />
  92 + <element signature="e#14356#14818#0#PHP" expanded="false" />
  93 + <element signature="e#14823#17028#0#PHP" expanded="false" />
  94 + <element signature="e#17034#17643#0#PHP" expanded="false" />
  95 + <element signature="e#17648#18981#0#PHP" expanded="false" />
  96 + <element signature="e#18987#19344#0#PHP" expanded="false" />
  97 + <element signature="e#19349#20230#0#PHP" expanded="false" />
  98 + <element signature="e#20236#20588#0#PHP" expanded="false" />
  99 + <element signature="e#20593#21670#0#PHP" expanded="false" />
  100 + <element signature="e#21676#22031#0#PHP" expanded="false" />
  101 + <element signature="e#22036#23116#0#PHP" expanded="false" />
  102 + <element signature="e#23122#23546#0#PHP" expanded="false" />
  103 + <element signature="e#23551#24162#0#PHP" expanded="false" />
  104 + <element signature="e#24168#24664#0#PHP" expanded="false" />
  105 + <element signature="e#24669#25776#0#PHP" expanded="false" />
  106 + <element signature="e#25782#26066#0#PHP" expanded="false" />
  107 + <element signature="e#26071#26649#0#PHP" expanded="false" />
  108 + <element signature="e#26670#26989#0#PHP" expanded="false" />
  109 + <element signature="e#26995#27403#0#PHP" expanded="false" />
  110 + <element signature="e#27409#28168#0#PHP" expanded="false" />
  111 + <element signature="e#28188#29052#0#PHP" expanded="false" />
  112 + <element signature="e#29079#29479#0#PHP" expanded="false" />
  113 + <element signature="e#29503#30076#0#PHP" expanded="false" />
  114 + <element signature="e#30099#30909#0#PHP" expanded="false" />
  115 + </folding>
  116 + </state>
  117 + </provider>
  118 + </entry>
  119 + </file>
61 </leaf> 120 </leaf>
62 </component> 121 </component>
63 <component name="FileTemplateManagerImpl"> 122 <component name="FileTemplateManagerImpl">
@@ -127,8 +186,8 @@ @@ -127,8 +186,8 @@
127 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" /> 186 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
128 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 187 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
129 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 188 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
130 - <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />  
131 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 189 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
  190 + <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
132 </list> 191 </list>
133 </option> 192 </option>
134 </component> 193 </component>
@@ -146,9 +205,9 @@ @@ -146,9 +205,9 @@
146 <sorting>DEFINITION_ORDER</sorting> 205 <sorting>DEFINITION_ORDER</sorting>
147 </component> 206 </component>
148 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 207 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
149 - <component name="ProjectFrameBounds" extendedState="1">  
150 - <option name="x" value="39" />  
151 - <option name="y" value="38" /> 208 + <component name="ProjectFrameBounds">
  209 + <option name="x" value="302" />
  210 + <option name="y" value="62" />
152 <option name="width" value="1582" /> 211 <option name="width" value="1582" />
153 <option name="height" value="960" /> 212 <option name="height" value="960" />
154 </component> 213 </component>
@@ -293,15 +352,15 @@ @@ -293,15 +352,15 @@
293 <workItem from="1575332430854" duration="21245000" /> 352 <workItem from="1575332430854" duration="21245000" />
294 <workItem from="1575359408189" duration="10054000" /> 353 <workItem from="1575359408189" duration="10054000" />
295 <workItem from="1575419186725" duration="599000" /> 354 <workItem from="1575419186725" duration="599000" />
296 - <workItem from="1575420787741" duration="903000" /> 355 + <workItem from="1575420787741" duration="1612000" />
297 </task> 356 </task>
298 <servers /> 357 <servers />
299 </component> 358 </component>
300 <component name="TimeTrackingManager"> 359 <component name="TimeTrackingManager">
301 - <option name="totallyTimeSpent" value="443259000" /> 360 + <option name="totallyTimeSpent" value="443968000" />
302 </component> 361 </component>
303 <component name="ToolWindowManager"> 362 <component name="ToolWindowManager">
304 - <frame x="39" y="38" width="1582" height="960" extended-state="1" /> 363 + <frame x="302" y="62" width="1582" height="960" extended-state="0" />
305 <editor active="true" /> 364 <editor active="true" />
306 <layout> 365 <layout>
307 <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" /> 366 <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 @@ @@ -764,65 +823,10 @@
764 </state> 823 </state>
765 </provider> 824 </provider>
766 </entry> 825 </entry>
767 - <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">  
768 - <provider selected="true" editor-type-id="text-editor">  
769 - <state relative-caret-position="328">  
770 - <caret line="823" column="27" lean-forward="false" selection-start-line="823" selection-start-column="27" selection-end-line="823" selection-end-column="27" />  
771 - <folding>  
772 - <element signature="e#131#169#0#PHP" expanded="false" />  
773 - <element signature="e#366#715#0#PHP" expanded="false" />  
774 - <element signature="e#720#1485#0#PHP" expanded="false" />  
775 - <element signature="e#1491#1720#0#PHP" expanded="false" />  
776 - <element signature="e#1725#3358#0#PHP" expanded="false" />  
777 - <element signature="e#3364#3604#0#PHP" expanded="false" />  
778 - <element signature="e#3609#3857#0#PHP" expanded="false" />  
779 - <element signature="e#3863#4210#0#PHP" expanded="false" />  
780 - <element signature="e#4215#4661#0#PHP" expanded="false" />  
781 - <element signature="e#4667#4927#0#PHP" expanded="false" />  
782 - <element signature="e#4932#5133#0#PHP" expanded="false" />  
783 - <element signature="e#5139#5401#0#PHP" expanded="false" />  
784 - <element signature="e#5406#5611#0#PHP" expanded="false" />  
785 - <element signature="e#5617#6059#0#PHP" expanded="false" />  
786 - <element signature="e#6064#7292#0#PHP" expanded="false" />  
787 - <element signature="e#7315#7860#0#PHP" expanded="false" />  
788 - <element signature="e#7866#8147#0#PHP" expanded="false" />  
789 - <element signature="e#8152#8544#0#PHP" expanded="false" />  
790 - <element signature="e#8550#9099#0#PHP" expanded="false" />  
791 - <element signature="e#9104#10303#0#PHP" expanded="false" />  
792 - <element signature="e#10309#10766#0#PHP" expanded="false" />  
793 - <element signature="e#10771#12034#0#PHP" expanded="false" />  
794 - <element signature="e#12057#12409#0#PHP" expanded="false" />  
795 - <element signature="e#12415#13099#0#PHP" expanded="false" />  
796 - <element signature="e#13104#14363#0#PHP" expanded="false" />  
797 - <element signature="e#14369#14831#0#PHP" expanded="false" />  
798 - <element signature="e#14836#17041#0#PHP" expanded="false" />  
799 - <element signature="e#17047#17656#0#PHP" expanded="false" />  
800 - <element signature="e#17661#18994#0#PHP" expanded="false" />  
801 - <element signature="e#19000#19357#0#PHP" expanded="false" />  
802 - <element signature="e#19362#20243#0#PHP" expanded="false" />  
803 - <element signature="e#20249#20601#0#PHP" expanded="false" />  
804 - <element signature="e#20606#21683#0#PHP" expanded="false" />  
805 - <element signature="e#21689#22044#0#PHP" expanded="false" />  
806 - <element signature="e#22049#23129#0#PHP" expanded="false" />  
807 - <element signature="e#23135#23559#0#PHP" expanded="false" />  
808 - <element signature="e#23564#24175#0#PHP" expanded="false" />  
809 - <element signature="e#25795#26079#0#PHP" expanded="false" />  
810 - <element signature="e#26084#26662#0#PHP" expanded="false" />  
811 - <element signature="e#26683#27002#0#PHP" expanded="false" />  
812 - <element signature="e#27008#27416#0#PHP" expanded="false" />  
813 - <element signature="e#27422#28181#0#PHP" expanded="false" />  
814 - <element signature="e#28201#29065#0#PHP" expanded="false" />  
815 - <element signature="e#29092#29492#0#PHP" expanded="false" />  
816 - <element signature="e#29516#30089#0#PHP" expanded="false" />  
817 - <element signature="e#30112#30922#0#PHP" expanded="false" />  
818 - </folding>  
819 - </state>  
820 - </provider>  
821 - </entry>  
822 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php"> 826 <entry file="file://$PROJECT_DIR$/api/index/controller/HomeController.php">
823 <provider selected="true" editor-type-id="text-editor"> 827 <provider selected="true" editor-type-id="text-editor">
824 - <state relative-caret-position="394">  
825 - <caret line="374" column="11" lean-forward="true" selection-start-line="374" selection-start-column="11" selection-end-line="374" selection-end-column="11" /> 828 + <state relative-caret-position="498">
  829 + <caret line="355" column="31" lean-forward="false" selection-start-line="355" selection-start-column="31" selection-end-line="355" selection-end-column="31" />
826 <folding> 830 <folding>
827 <element signature="e#329#544#0#PHP" expanded="false" /> 831 <element signature="e#329#544#0#PHP" expanded="false" />
828 <element signature="e#549#890#0#PHP" expanded="false" /> 832 <element signature="e#549#890#0#PHP" expanded="false" />
@@ -844,11 +848,69 @@ @@ -844,11 +848,69 @@
844 <element signature="e#7527#8377#0#PHP" expanded="false" /> 848 <element signature="e#7527#8377#0#PHP" expanded="false" />
845 <element signature="e#8383#8650#0#PHP" expanded="false" /> 849 <element signature="e#8383#8650#0#PHP" expanded="false" />
846 <element signature="e#8655#9130#0#PHP" expanded="false" /> 850 <element signature="e#8655#9130#0#PHP" expanded="false" />
  851 + <element signature="e#9136#9635#0#PHP" expanded="false" />
  852 + <element signature="e#9640#10661#0#PHP" expanded="false" />
847 <element signature="e#10667#11034#0#PHP" expanded="false" /> 853 <element signature="e#10667#11034#0#PHP" expanded="false" />
848 <element signature="e#11039#11479#0#PHP" expanded="false" /> 854 <element signature="e#11039#11479#0#PHP" expanded="false" />
849 </folding> 855 </folding>
850 </state> 856 </state>
851 </provider> 857 </provider>
852 </entry> 858 </entry>
  859 + <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
  860 + <provider selected="true" editor-type-id="text-editor">
  861 + <state relative-caret-position="199">
  862 + <caret line="157" column="7" lean-forward="true" selection-start-line="157" selection-start-column="7" selection-end-line="157" selection-end-column="7" />
  863 + <folding>
  864 + <element signature="e#366#715#0#PHP" expanded="false" />
  865 + <element signature="e#720#1485#0#PHP" expanded="false" />
  866 + <element signature="e#1491#1720#0#PHP" expanded="false" />
  867 + <element signature="e#1725#3358#0#PHP" expanded="false" />
  868 + <element signature="e#3364#3604#0#PHP" expanded="false" />
  869 + <element signature="e#3609#3844#0#PHP" expanded="false" />
  870 + <element signature="e#3850#4197#0#PHP" expanded="false" />
  871 + <element signature="e#4202#4648#0#PHP" expanded="false" />
  872 + <element signature="e#4654#4914#0#PHP" expanded="false" />
  873 + <element signature="e#4919#5120#0#PHP" expanded="false" />
  874 + <element signature="e#5126#5388#0#PHP" expanded="false" />
  875 + <element signature="e#5393#5598#0#PHP" expanded="false" />
  876 + <element signature="e#5604#6046#0#PHP" expanded="false" />
  877 + <element signature="e#6051#7279#0#PHP" expanded="false" />
  878 + <element signature="e#7302#7847#0#PHP" expanded="false" />
  879 + <element signature="e#7853#8134#0#PHP" expanded="false" />
  880 + <element signature="e#8139#8531#0#PHP" expanded="false" />
  881 + <element signature="e#8537#9086#0#PHP" expanded="false" />
  882 + <element signature="e#9091#10290#0#PHP" expanded="false" />
  883 + <element signature="e#10296#10753#0#PHP" expanded="false" />
  884 + <element signature="e#10758#12021#0#PHP" expanded="false" />
  885 + <element signature="e#12044#12396#0#PHP" expanded="false" />
  886 + <element signature="e#12402#13086#0#PHP" expanded="false" />
  887 + <element signature="e#13091#14350#0#PHP" expanded="false" />
  888 + <element signature="e#14356#14818#0#PHP" expanded="false" />
  889 + <element signature="e#14823#17028#0#PHP" expanded="false" />
  890 + <element signature="e#17034#17643#0#PHP" expanded="false" />
  891 + <element signature="e#17648#18981#0#PHP" expanded="false" />
  892 + <element signature="e#18987#19344#0#PHP" expanded="false" />
  893 + <element signature="e#19349#20230#0#PHP" expanded="false" />
  894 + <element signature="e#20236#20588#0#PHP" expanded="false" />
  895 + <element signature="e#20593#21670#0#PHP" expanded="false" />
  896 + <element signature="e#21676#22031#0#PHP" expanded="false" />
  897 + <element signature="e#22036#23116#0#PHP" expanded="false" />
  898 + <element signature="e#23122#23546#0#PHP" expanded="false" />
  899 + <element signature="e#23551#24162#0#PHP" expanded="false" />
  900 + <element signature="e#24168#24664#0#PHP" expanded="false" />
  901 + <element signature="e#24669#25776#0#PHP" expanded="false" />
  902 + <element signature="e#25782#26066#0#PHP" expanded="false" />
  903 + <element signature="e#26071#26649#0#PHP" expanded="false" />
  904 + <element signature="e#26670#26989#0#PHP" expanded="false" />
  905 + <element signature="e#26995#27403#0#PHP" expanded="false" />
  906 + <element signature="e#27409#28168#0#PHP" expanded="false" />
  907 + <element signature="e#28188#29052#0#PHP" expanded="false" />
  908 + <element signature="e#29079#29479#0#PHP" expanded="false" />
  909 + <element signature="e#29503#30076#0#PHP" expanded="false" />
  910 + <element signature="e#30099#30909#0#PHP" expanded="false" />
  911 + </folding>
  912 + </state>
  913 + </provider>
  914 + </entry>
853 </component> 915 </component>
854 </project> 916 </project>
@@ -135,9 +135,9 @@ class UserController extends RestBaseController @@ -135,9 +135,9 @@ class UserController extends RestBaseController
135 $user_id = $this->getUserId(); 135 $user_id = $this->getUserId();
136 $data = Db::name('user') 136 $data = Db::name('user')
137 ->where('id',$user_id) 137 ->where('id',$user_id)
138 - ->field('id,is_set') 138 + ->field('is_set')
139 ->find(); 139 ->find();
140 - $this->success('success',$data['is_set']); 140 + $this->success('success',$data);
141 } 141 }
142 142
143 /** 143 /**