18315626215 преди 5 години
родител
ревизия
44c4a8b7ba
променени са 2 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 13 7
      .idea/workspace.xml
  2. 1 1
      application/config.php

+ 13 - 7
.idea/workspace.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="0c798a10-12e9-4340-984e-11d11f343507" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
+    <list default="true" id="0c798a10-12e9-4340-984e-11d11f343507" name="Default Changelist" comment="修改了默认登录">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/config.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/public/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -21,6 +18,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="ProjectId" id="1Um3PwqsxizdOTLBw4mBJ8EzGbT" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -62,7 +60,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1575947922294</updated>
-      <workItem from="1575947923604" duration="3917000" />
+      <workItem from="1575947923604" duration="5360000" />
     </task>
     <task id="LOCAL-00001" summary="提交测试">
       <created>1575956432691</created>
@@ -71,7 +69,14 @@
       <option name="project" value="LOCAL" />
       <updated>1575956432691</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="修改了默认登录">
+      <created>1575957808325</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1575957808325</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -90,6 +95,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="提交测试" />
-    <option name="LAST_COMMIT_MESSAGE" value="提交测试" />
+    <MESSAGE value="修改了默认登录" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改了默认登录" />
   </component>
 </project>

+ 1 - 1
application/config.php

@@ -61,7 +61,7 @@ return [
     // 默认控制器名
     'default_controller'     => 'Index',
     // 默认操作名
-    'default_action'         => 'login',
+    'default_action'         => 'index',
     // 默认验证器
     'default_validate'       => '',
     // 默认的空控制器名