|
@@ -1,12 +1,7 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="cddaf112-838a-4ae8-b50b-ccd02170a034" name="Default" comment="更改了adminlte登陆页">
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/index.html" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/php/database_connect .php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/php/login.php" afterDir="false" />
|
|
|
- <change afterPath="$PROJECT_DIR$/BackSystem/php/server_data.php" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <list default="true" id="cddaf112-838a-4ae8-b50b-ccd02170a034" name="Default" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/BackSystem/html/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/BackSystem/html/login.html" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
@@ -24,8 +19,8 @@
|
|
|
<file leaf-file-name="login.html" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="379">
|
|
|
- <caret line="97" column="44" lean-forward="true" selection-start-line="97" selection-start-column="44" selection-end-line="97" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="275">
|
|
|
+ <caret line="98" column="35" lean-forward="true" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -181,7 +176,7 @@
|
|
|
<workItem from="1556006731644" duration="104000" />
|
|
|
<workItem from="1556010775860" duration="5006000" />
|
|
|
<workItem from="1557124704308" duration="2541000" />
|
|
|
- <workItem from="1557130259475" duration="3727000" />
|
|
|
+ <workItem from="1557130259475" duration="4087000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="添加了"有钱任性"游戏">
|
|
|
<created>1555674654664</created>
|
|
@@ -218,11 +213,18 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1557130300846</updated>
|
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="6" />
|
|
|
+ <task id="LOCAL-00006" summary="更改了adminlte登陆页逻辑代码">
|
|
|
+ <created>1557134543803</created>
|
|
|
+ <option name="number" value="00006" />
|
|
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
+ <updated>1557134543803</updated>
|
|
|
+ </task>
|
|
|
+ <option name="localTasksCounter" value="7" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="17312000" />
|
|
|
+ <option name="totallyTimeSpent" value="17672000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
|
|
@@ -259,7 +261,8 @@
|
|
|
<MESSAGE value="添加了后台测试代码" />
|
|
|
<MESSAGE value="更改了adminlte登陆页" />
|
|
|
<MESSAGE value="登陆页本地化" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="登陆页本地化" />
|
|
|
+ <MESSAGE value="更改了adminlte登陆页逻辑代码" />
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="更改了adminlte登陆页逻辑代码" />
|
|
|
</component>
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
@@ -438,24 +441,24 @@
|
|
|
<entry file="file://$PROJECT_DIR$/BackSystem/php/json.php">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/index.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/php/login.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
|
|
|
+ <state relative-caret-position="150">
|
|
|
+ <caret line="5" column="19" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/BackSystem/php/login.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/BackSystem/index.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="150">
|
|
|
- <caret line="5" column="19" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="19" />
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/BackSystem/html/login.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="379">
|
|
|
- <caret line="97" column="44" lean-forward="true" selection-start-line="97" selection-start-column="44" selection-end-line="97" selection-end-column="44" />
|
|
|
+ <state relative-caret-position="275">
|
|
|
+ <caret line="98" column="35" lean-forward="true" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|