|
@@ -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 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" />
|
5
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
6
|
+ <change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" 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="config.php" pinned="false" current-in-tab="true">
|
32
|
+ <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
|
33
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
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="459">
|
|
|
36
|
- <caret line="59" column="48" selection-start-line="59" selection-start-column="48" selection-end-line="59" selection-end-column="48" />
|
35
|
+ <state relative-caret-position="425">
|
|
|
36
|
+ <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
|
37
|
</state>
|
37
|
</state>
|
38
|
</provider>
|
38
|
</provider>
|
39
|
</entry>
|
39
|
</entry>
|
|
@@ -47,11 +47,11 @@ |
|
@@ -47,11 +47,11 @@ |
47
|
</provider>
|
47
|
</provider>
|
48
|
</entry>
|
48
|
</entry>
|
49
|
</file>
|
49
|
</file>
|
50
|
- <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
|
50
|
+ <file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
51
|
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
52
|
<provider selected="true" editor-type-id="text-editor">
|
53
|
- <state relative-caret-position="470">
|
|
|
54
|
- <caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
|
53
|
+ <state relative-caret-position="402">
|
|
|
54
|
+ <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
55
|
</state>
|
55
|
</state>
|
56
|
</provider>
|
56
|
</provider>
|
57
|
</entry>
|
57
|
</entry>
|
|
@@ -122,11 +122,11 @@ |
|
@@ -122,11 +122,11 @@ |
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
122
|
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
123
|
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
|
124
|
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
|
124
|
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
|
125
|
- <option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
|
|
126
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
125
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
127
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
126
|
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
|
128
|
<option value="$PROJECT_DIR$/application/database.php" />
|
127
|
<option value="$PROJECT_DIR$/application/database.php" />
|
129
|
<option value="$PROJECT_DIR$/application/config.php" />
|
128
|
<option value="$PROJECT_DIR$/application/config.php" />
|
|
|
129
|
+ <option value="$PROJECT_DIR$/application/home/view/index/login.html" />
|
130
|
</list>
|
130
|
</list>
|
131
|
</option>
|
131
|
</option>
|
132
|
</component>
|
132
|
</component>
|
|
@@ -268,7 +268,7 @@ |
|
@@ -268,7 +268,7 @@ |
268
|
<option name="presentableId" value="Default" />
|
268
|
<option name="presentableId" value="Default" />
|
269
|
<updated>1571368480027</updated>
|
269
|
<updated>1571368480027</updated>
|
270
|
<workItem from="1571368481262" duration="23015000" />
|
270
|
<workItem from="1571368481262" duration="23015000" />
|
271
|
- <workItem from="1571618159935" duration="3735000" />
|
271
|
+ <workItem from="1571618159935" duration="4441000" />
|
272
|
</task>
|
272
|
</task>
|
273
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
273
|
<task id="LOCAL-00001" summary="自动部署与数据可配置">
|
274
|
<created>1571621636094</created>
|
274
|
<created>1571621636094</created>
|
|
@@ -277,11 +277,25 @@ |
|
@@ -277,11 +277,25 @@ |
277
|
<option name="project" value="LOCAL" />
|
277
|
<option name="project" value="LOCAL" />
|
278
|
<updated>1571621636094</updated>
|
278
|
<updated>1571621636094</updated>
|
279
|
</task>
|
279
|
</task>
|
280
|
- <option name="localTasksCounter" value="2" />
|
280
|
+ <task id="LOCAL-00002" summary="修改后台登录地址">
|
|
|
281
|
+ <created>1571621921776</created>
|
|
|
282
|
+ <option name="number" value="00002" />
|
|
|
283
|
+ <option name="presentableId" value="LOCAL-00002" />
|
|
|
284
|
+ <option name="project" value="LOCAL" />
|
|
|
285
|
+ <updated>1571621921776</updated>
|
|
|
286
|
+ </task>
|
|
|
287
|
+ <task id="LOCAL-00003" summary="修改后台登录地址">
|
|
|
288
|
+ <created>1571622157692</created>
|
|
|
289
|
+ <option name="number" value="00003" />
|
|
|
290
|
+ <option name="presentableId" value="LOCAL-00003" />
|
|
|
291
|
+ <option name="project" value="LOCAL" />
|
|
|
292
|
+ <updated>1571622157692</updated>
|
|
|
293
|
+ </task>
|
|
|
294
|
+ <option name="localTasksCounter" value="4" />
|
281
|
<servers />
|
295
|
<servers />
|
282
|
</component>
|
296
|
</component>
|
283
|
<component name="TimeTrackingManager">
|
297
|
<component name="TimeTrackingManager">
|
284
|
- <option name="totallyTimeSpent" value="26750000" />
|
298
|
+ <option name="totallyTimeSpent" value="27456000" />
|
285
|
</component>
|
299
|
</component>
|
286
|
<component name="ToolWindowManager">
|
300
|
<component name="ToolWindowManager">
|
287
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
301
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -319,7 +333,8 @@ |
|
@@ -319,7 +333,8 @@ |
319
|
</component>
|
333
|
</component>
|
320
|
<component name="VcsManagerConfiguration">
|
334
|
<component name="VcsManagerConfiguration">
|
321
|
<MESSAGE value="自动部署与数据可配置" />
|
335
|
<MESSAGE value="自动部署与数据可配置" />
|
322
|
- <option name="LAST_COMMIT_MESSAGE" value="自动部署与数据可配置" />
|
336
|
+ <MESSAGE value="修改后台登录地址" />
|
|
|
337
|
+ <option name="LAST_COMMIT_MESSAGE" value="修改后台登录地址" />
|
323
|
</component>
|
338
|
</component>
|
324
|
<component name="editorHistoryManager">
|
339
|
<component name="editorHistoryManager">
|
325
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
340
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
@@ -576,13 +591,6 @@ |
|
@@ -576,13 +591,6 @@ |
576
|
</state>
|
591
|
</state>
|
577
|
</provider>
|
592
|
</provider>
|
578
|
</entry>
|
593
|
</entry>
|
579
|
- <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
580
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
581
|
- <state relative-caret-position="470">
|
|
|
582
|
- <caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
|
|
|
583
|
- </state>
|
|
|
584
|
- </provider>
|
|
|
585
|
- </entry>
|
|
|
586
|
<entry file="file://$PROJECT_DIR$/application/database.php">
|
594
|
<entry file="file://$PROJECT_DIR$/application/database.php">
|
587
|
<provider selected="true" editor-type-id="text-editor">
|
595
|
<provider selected="true" editor-type-id="text-editor">
|
588
|
<state relative-caret-position="544">
|
596
|
<state relative-caret-position="544">
|
|
@@ -609,8 +617,15 @@ |
|
@@ -609,8 +617,15 @@ |
609
|
</entry>
|
617
|
</entry>
|
610
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
618
|
<entry file="file://$PROJECT_DIR$/application/config.php">
|
611
|
<provider selected="true" editor-type-id="text-editor">
|
619
|
<provider selected="true" editor-type-id="text-editor">
|
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" />
|
620
|
+ <state relative-caret-position="425">
|
|
|
621
|
+ <caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
|
|
|
622
|
+ </state>
|
|
|
623
|
+ </provider>
|
|
|
624
|
+ </entry>
|
|
|
625
|
+ <entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
|
|
|
626
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
627
|
+ <state relative-caret-position="402">
|
|
|
628
|
+ <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
|
614
|
</state>
|
629
|
</state>
|
615
|
</provider>
|
630
|
</provider>
|
616
|
</entry>
|
631
|
</entry>
|