外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 afaaaa21c615f5294a12e7dddbd9add5589b62fe 1 个父辈 15dcacfa

登录处理

内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 25 行删除
@@ -61,8 +61,8 @@ @@ -61,8 +61,8 @@
61 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false"> 61 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
62 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 62 <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
63 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="321">  
65 - <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" /> 64 + <state relative-caret-position="105">
  65 + <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="13" />
66 </state> 66 </state>
67 </provider> 67 </provider>
68 </entry> 68 </entry>
@@ -75,8 +75,8 @@ @@ -75,8 +75,8 @@
75 <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true"> 75 <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
76 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> 76 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
77 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="84">  
79 - <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> 78 + <state relative-caret-position="315">
  79 + <caret line="23" column="84" selection-start-line="23" selection-start-column="84" selection-end-line="23" selection-end-column="84" />
80 </state> 80 </state>
81 </provider> 81 </provider>
82 </entry> 82 </entry>
@@ -84,8 +84,8 @@ @@ -84,8 +84,8 @@
84 <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false"> 84 <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
85 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> 85 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
86 <provider selected="true" editor-type-id="text-editor"> 86 <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="153">  
88 - <caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" /> 87 + <state relative-caret-position="468">
  88 + <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
89 </state> 89 </state>
90 </provider> 90 </provider>
91 </entry> 91 </entry>
@@ -270,7 +270,7 @@ @@ -270,7 +270,7 @@
270 <workItem from="1535514127808" duration="727000" /> 270 <workItem from="1535514127808" duration="727000" />
271 <workItem from="1535532970259" duration="2527000" /> 271 <workItem from="1535532970259" duration="2527000" />
272 <workItem from="1535546044129" duration="20814000" /> 272 <workItem from="1535546044129" duration="20814000" />
273 - <workItem from="1535633001243" duration="3381000" /> 273 + <workItem from="1535633001243" duration="3749000" />
274 </task> 274 </task>
275 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 275 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
276 <created>1535458170068</created> 276 <created>1535458170068</created>
@@ -531,11 +531,25 @@ @@ -531,11 +531,25 @@
531 <option name="project" value="LOCAL" /> 531 <option name="project" value="LOCAL" />
532 <updated>1535636670545</updated> 532 <updated>1535636670545</updated>
533 </task> 533 </task>
534 - <option name="localTasksCounter" value="38" /> 534 + <task id="LOCAL-00038" summary="登录处理">
  535 + <created>1535636892256</created>
  536 + <option name="number" value="00038" />
  537 + <option name="presentableId" value="LOCAL-00038" />
  538 + <option name="project" value="LOCAL" />
  539 + <updated>1535636892256</updated>
  540 + </task>
  541 + <task id="LOCAL-00039" summary="登录处理">
  542 + <created>1535636993426</created>
  543 + <option name="number" value="00039" />
  544 + <option name="presentableId" value="LOCAL-00039" />
  545 + <option name="project" value="LOCAL" />
  546 + <updated>1535636993426</updated>
  547 + </task>
  548 + <option name="localTasksCounter" value="40" />
535 <servers /> 549 <servers />
536 </component> 550 </component>
537 <component name="TimeTrackingManager"> 551 <component name="TimeTrackingManager">
538 - <option name="totallyTimeSpent" value="57833000" /> 552 + <option name="totallyTimeSpent" value="58201000" />
539 </component> 553 </component>
540 <component name="ToolWindowManager"> 554 <component name="ToolWindowManager">
541 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 555 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -829,26 +843,12 @@ @@ -829,26 +843,12 @@
829 </state> 843 </state>
830 </provider> 844 </provider>
831 </entry> 845 </entry>
832 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">  
833 - <provider selected="true" editor-type-id="text-editor">  
834 - <state relative-caret-position="321">  
835 - <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />  
836 - </state>  
837 - </provider>  
838 - </entry>  
839 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 846 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
840 <provider selected="true" editor-type-id="text-editor" /> 847 <provider selected="true" editor-type-id="text-editor" />
841 </entry> 848 </entry>
842 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php"> 849 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
843 <provider selected="true" editor-type-id="text-editor" /> 850 <provider selected="true" editor-type-id="text-editor" />
844 </entry> 851 </entry>
845 - <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">  
846 - <provider selected="true" editor-type-id="text-editor">  
847 - <state relative-caret-position="153">  
848 - <caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" />  
849 - </state>  
850 - </provider>  
851 - </entry>  
852 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 852 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
853 <provider selected="true" editor-type-id="text-editor"> 853 <provider selected="true" editor-type-id="text-editor">
854 <state relative-caret-position="660"> 854 <state relative-caret-position="660">
@@ -868,10 +868,24 @@ @@ -868,10 +868,24 @@
868 </state> 868 </state>
869 </provider> 869 </provider>
870 </entry> 870 </entry>
  871 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state relative-caret-position="105">
  874 + <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="13" />
  875 + </state>
  876 + </provider>
  877 + </entry>
  878 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
  879 + <provider selected="true" editor-type-id="text-editor">
  880 + <state relative-caret-position="468">
  881 + <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
  882 + </state>
  883 + </provider>
  884 + </entry>
871 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> 885 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
872 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
873 - <state relative-caret-position="84">  
874 - <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> 887 + <state relative-caret-position="315">
  888 + <caret line="23" column="84" selection-start-line="23" selection-start-column="84" selection-end-line="23" selection-end-column="84" />
875 </state> 889 </state>
876 </provider> 890 </provider>
877 </entry> 891 </entry>
@@ -21,6 +21,7 @@ class UserBaseController extends HomeBaseController @@ -21,6 +21,7 @@ class UserBaseController extends HomeBaseController
21 $login_info = Db::name('user')->where(['id'=>session('user.id')])->find(); 21 $login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
22 if(!$login_info){ 22 if(!$login_info){
23 session('user.id',''); 23 session('user.id','');
  24 + return redirect($this->request->root() . '/user/profile/percenter');
24 } 25 }
25 } 26 }
26 27