wupengfei 2 years ago
parent
commit
ccb09b517b
2 changed files with 11 additions and 6 deletions
  1. 5 5
      .idea/workspace.xml
  2. 6 1
      application/index/controller/Index.php

+ 5 - 5
.idea/workspace.xml

@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" 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/api/controller/Task.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/api/controller/Task.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/index/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/index/controller/Index.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -121,7 +121,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../xianglian_test_api" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -208,7 +208,7 @@
       <workItem from="1671065604459" duration="7662000" />
       <workItem from="1671152221434" duration="19086000" />
       <workItem from="1672793409629" duration="408000" />
-      <workItem from="1672793834653" duration="682000" />
+      <workItem from="1672793834653" duration="2765000" />
     </task>
     <servers />
   </component>
@@ -338,10 +338,10 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="283" y="145" width="1942" height="1088" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1672710223633" />
-    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1672708362621">
+    <state x="1418" y="514" key="FileChooserDialogImpl" timestamp="1672798457280">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1672708362621" />
+    <state x="1418" y="514" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1672798457280" />
     <state x="1051" y="472" key="MultipleFileMergeDialog" timestamp="1671416392056">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

+ 6 - 1
application/index/controller/Index.php

@@ -29,6 +29,11 @@ class Index extends Controller
      */
     public function index()
     {
-        $this->redirect('@admin/login');
+        //$this->redirect('@admin/login');
+        if(strpos(input('server.HTTP_REFERER'), 'admin') === false){
+             $this->redirect('/dist');
+        } else{
+            $this->redirect('@admin/login');
+        }
     }
 }