...
|
...
|
@@ -2,8 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/application/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/config.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/public/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/adminbackground.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -29,11 +29,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="459">
|
|
|
<caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
|
|
|
<state relative-caret-position="425">
|
|
|
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -47,11 +47,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="470">
|
|
|
<caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
|
|
|
<state relative-caret-position="402">
|
|
|
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -122,11 +122,11 @@ |
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
|
|
<option value="$PROJECT_DIR$/application/database.php" />
|
|
|
<option value="$PROJECT_DIR$/application/config.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -268,7 +268,7 @@ |
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1571368480027</updated>
|
|
|
<workItem from="1571368481262" duration="23015000" />
|
|
|
<workItem from="1571618159935" duration="3735000" />
|
|
|
<workItem from="1571618159935" duration="4441000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
|
|
<created>1571621636094</created>
|
...
|
...
|
@@ -277,11 +277,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571621636094</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="2" />
|
|
|
<task id="LOCAL-00002" summary="修改后台登录地址">
|
|
|
<created>1571621921776</created>
|
|
|
<option name="number" value="00002" />
|
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571621921776</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00003" summary="修改后台登录地址">
|
|
|
<created>1571622157692</created>
|
|
|
<option name="number" value="00003" />
|
|
|
<option name="presentableId" value="LOCAL-00003" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571622157692</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="4" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="26750000" />
|
|
|
<option name="totallyTimeSpent" value="27456000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -319,7 +333,8 @@ |
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="自动部署与数据可配置" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="自动部署与数据可配置" />
|
|
|
<MESSAGE value="修改后台登录地址" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="修改后台登录地址" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
...
|
...
|
@@ -576,13 +591,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="470">
|
|
|
<caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/database.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="544">
|
...
|
...
|
@@ -609,8 +617,15 @@ |
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="459">
|
|
|
<caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
|
|
|
<state relative-caret-position="425">
|
|
|
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="402">
|
|
|
<caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|