|
@@ -2,8 +2,8 @@ |
|
@@ -2,8 +2,8 @@ |
2
|
<project version="4">
|
2
|
<project version="4">
|
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
4
|
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
|
5
|
- <change afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
|
|
|
6
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
5
|
+ <change beforePath="$PROJECT_DIR$/application/config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/config.php" afterDir="false" />
|
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/public/admin.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/adminbackground.php" afterDir="false" />
|
7
|
</list>
|
7
|
</list>
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -29,11 +29,11 @@ |
|
@@ -29,11 +29,11 @@ |
29
|
</provider>
|
29
|
</provider>
|
30
|
</entry>
|
30
|
</entry>
|
31
|
</file>
|
31
|
</file>
|
32
|
- <file leaf-file-name=".gitlab-ci.yml" pinned="false" current-in-tab="true">
|
|
|
33
|
- <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
32
|
+ <file leaf-file-name="config.php" pinned="false" current-in-tab="true">
|
|
|
33
|
+ <entry file="file://$PROJECT_DIR$/application/config.php">
|
34
|
<provider selected="true" editor-type-id="text-editor">
|
34
|
<provider selected="true" editor-type-id="text-editor">
|
35
|
- <state relative-caret-position="136">
|
|
|
36
|
- <caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
35
|
+ <state relative-caret-position="459">
|
|
|
36
|
+ <caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
|
37
|
</state>
|
37
|
</state>
|
38
|
</provider>
|
38
|
</provider>
|
39
|
</entry>
|
39
|
</entry>
|
|
@@ -118,7 +118,6 @@ |
|
@@ -118,7 +118,6 @@ |
118
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
118
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
|
119
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
119
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
120
|
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
|
121
|
- <option value="$PROJECT_DIR$/application/config.php" />
|
|
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
121
|
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
124
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
|
@@ -126,6 +125,8 @@ |
|
@@ -126,6 +125,8 @@ |
126
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
125
|
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
127
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
126
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
128
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
127
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
|
|
128
|
+ <option value="$PROJECT_DIR$/application/database.php" />
|
|
|
129
|
+ <option value="$PROJECT_DIR$/application/config.php" />
|
129
|
</list>
|
130
|
</list>
|
130
|
</option>
|
131
|
</option>
|
131
|
</component>
|
132
|
</component>
|
|
@@ -205,6 +206,16 @@ |
|
@@ -205,6 +206,16 @@ |
205
|
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
206
|
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
206
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
207
|
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
207
|
</path>
|
208
|
</path>
|
|
|
209
|
+ <path>
|
|
|
210
|
+ <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
211
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
212
|
+ <item name="application" type="462c0819:PsiDirectoryNode" />
|
|
|
213
|
+ </path>
|
|
|
214
|
+ <path>
|
|
|
215
|
+ <item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
|
|
|
216
|
+ <item name="adverh5" type="462c0819:PsiDirectoryNode" />
|
|
|
217
|
+ <item name="public" type="462c0819:PsiDirectoryNode" />
|
|
|
218
|
+ </path>
|
208
|
</expand>
|
219
|
</expand>
|
209
|
<select />
|
220
|
<select />
|
210
|
</subPane>
|
221
|
</subPane>
|
|
@@ -257,12 +268,20 @@ |
|
@@ -257,12 +268,20 @@ |
257
|
<option name="presentableId" value="Default" />
|
268
|
<option name="presentableId" value="Default" />
|
258
|
<updated>1571368480027</updated>
|
269
|
<updated>1571368480027</updated>
|
259
|
<workItem from="1571368481262" duration="23015000" />
|
270
|
<workItem from="1571368481262" duration="23015000" />
|
260
|
- <workItem from="1571618159935" duration="3254000" />
|
271
|
+ <workItem from="1571618159935" duration="3735000" />
|
|
|
272
|
+ </task>
|
|
|
273
|
+ <task id="LOCAL-00001" summary="自动部署与数据可配置">
|
|
|
274
|
+ <created>1571621636094</created>
|
|
|
275
|
+ <option name="number" value="00001" />
|
|
|
276
|
+ <option name="presentableId" value="LOCAL-00001" />
|
|
|
277
|
+ <option name="project" value="LOCAL" />
|
|
|
278
|
+ <updated>1571621636094</updated>
|
261
|
</task>
|
279
|
</task>
|
|
|
280
|
+ <option name="localTasksCounter" value="2" />
|
262
|
<servers />
|
281
|
<servers />
|
263
|
</component>
|
282
|
</component>
|
264
|
<component name="TimeTrackingManager">
|
283
|
<component name="TimeTrackingManager">
|
265
|
- <option name="totallyTimeSpent" value="26269000" />
|
284
|
+ <option name="totallyTimeSpent" value="26750000" />
|
266
|
</component>
|
285
|
</component>
|
267
|
<component name="ToolWindowManager">
|
286
|
<component name="ToolWindowManager">
|
268
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
287
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -298,6 +317,10 @@ |
|
@@ -298,6 +317,10 @@ |
298
|
<component name="VcsContentAnnotationSettings">
|
317
|
<component name="VcsContentAnnotationSettings">
|
299
|
<option name="myLimit" value="2678400000" />
|
318
|
<option name="myLimit" value="2678400000" />
|
300
|
</component>
|
319
|
</component>
|
|
|
320
|
+ <component name="VcsManagerConfiguration">
|
|
|
321
|
+ <MESSAGE value="自动部署与数据可配置" />
|
|
|
322
|
+ <option name="LAST_COMMIT_MESSAGE" value="自动部署与数据可配置" />
|
|
|
323
|
+ </component>
|
301
|
<component name="editorHistoryManager">
|
324
|
<component name="editorHistoryManager">
|
302
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
325
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
303
|
<provider selected="true" editor-type-id="text-editor">
|
326
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -491,13 +514,6 @@ |
|
@@ -491,13 +514,6 @@ |
491
|
</state>
|
514
|
</state>
|
492
|
</provider>
|
515
|
</provider>
|
493
|
</entry>
|
516
|
</entry>
|
494
|
- <entry file="file://$PROJECT_DIR$/application/config.php">
|
|
|
495
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
496
|
- <state relative-caret-position="935">
|
|
|
497
|
- <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
|
|
|
498
|
- </state>
|
|
|
499
|
- </provider>
|
|
|
500
|
- </entry>
|
|
|
501
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
517
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
|
502
|
<provider selected="true" editor-type-id="text-editor">
|
518
|
<provider selected="true" editor-type-id="text-editor">
|
503
|
<state relative-caret-position="810">
|
519
|
<state relative-caret-position="810">
|
|
@@ -567,6 +583,20 @@ |
|
@@ -567,6 +583,20 @@ |
567
|
</state>
|
583
|
</state>
|
568
|
</provider>
|
584
|
</provider>
|
569
|
</entry>
|
585
|
</entry>
|
|
|
586
|
+ <entry file="file://$PROJECT_DIR$/application/database.php">
|
|
|
587
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
588
|
+ <state relative-caret-position="544">
|
|
|
589
|
+ <caret line="40" column="31" lean-forward="true" selection-start-line="40" selection-start-column="31" selection-end-line="40" selection-end-column="31" />
|
|
|
590
|
+ </state>
|
|
|
591
|
+ </provider>
|
|
|
592
|
+ </entry>
|
|
|
593
|
+ <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
|
|
594
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
595
|
+ <state relative-caret-position="136">
|
|
|
596
|
+ <caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
|
|
597
|
+ </state>
|
|
|
598
|
+ </provider>
|
|
|
599
|
+ </entry>
|
570
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
600
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
571
|
<provider selected="true" editor-type-id="text-editor">
|
601
|
<provider selected="true" editor-type-id="text-editor">
|
572
|
<state relative-caret-position="578">
|
602
|
<state relative-caret-position="578">
|
|
@@ -577,10 +607,10 @@ |
|
@@ -577,10 +607,10 @@ |
577
|
</state>
|
607
|
</state>
|
578
|
</provider>
|
608
|
</provider>
|
579
|
</entry>
|
609
|
</entry>
|
580
|
- <entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
|
610
|
+ <entry file="file://$PROJECT_DIR$/application/config.php">
|
581
|
<provider selected="true" editor-type-id="text-editor">
|
611
|
<provider selected="true" editor-type-id="text-editor">
|
582
|
- <state relative-caret-position="136">
|
|
|
583
|
- <caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
|
612
|
+ <state relative-caret-position="459">
|
|
|
613
|
+ <caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
|
584
|
</state>
|
614
|
</state>
|
585
|
</provider>
|
615
|
</provider>
|
586
|
</entry>
|
616
|
</entry>
|