...
|
...
|
@@ -2,8 +2,8 @@ |
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
|
|
<change afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
|
|
|
<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/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/adminbackground.php" 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=".gitlab-ci.yml" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
|
|
<file leaf-file-name="config.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="136">
|
|
|
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
<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>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -118,7 +118,6 @@ |
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
|
|
<option value="$PROJECT_DIR$/application/config.php" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
|
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
...
|
...
|
@@ -126,6 +125,8 @@ |
|
|
<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" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -205,6 +206,16 @@ |
|
|
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
...
|
...
|
@@ -257,12 +268,20 @@ |
|
|
<option name="presentableId" value="Default" />
|
|
|
<updated>1571368480027</updated>
|
|
|
<workItem from="1571368481262" duration="23015000" />
|
|
|
<workItem from="1571618159935" duration="3254000" />
|
|
|
<workItem from="1571618159935" duration="3735000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
|
|
<created>1571621636094</created>
|
|
|
<option name="number" value="00001" />
|
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1571621636094</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="2" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="26269000" />
|
|
|
<option name="totallyTimeSpent" value="26750000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -298,6 +317,10 @@ |
|
|
<component name="VcsContentAnnotationSettings">
|
|
|
<option name="myLimit" value="2678400000" />
|
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="自动部署与数据可配置" />
|
|
|
<option name="LAST_COMMIT_MESSAGE" value="自动部署与数据可配置" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
...
|
...
|
@@ -491,13 +514,6 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="935">
|
|
|
<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/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="810">
|
...
|
...
|
@@ -567,6 +583,20 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/database.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="544">
|
|
|
<caret line="40" column="31" lean-forward="true" selection-start-line="40" selection-start-column="31" selection-end-line="40" selection-end-column="31" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="136">
|
|
|
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="578">
|
...
|
...
|
@@ -577,10 +607,10 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
|
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="136">
|
|
|
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
<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>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|