...
|
...
|
@@ -3,7 +3,7 @@ |
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/User.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/User.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/application/home/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Goods.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
...
|
...
|
@@ -38,11 +38,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
|
|
|
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="198">
|
|
|
<caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -65,11 +65,11 @@ |
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
|
|
|
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="26" column="85" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="85" />
|
|
|
<state relative-caret-position="289">
|
|
|
<caret line="25" column="36" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
@@ -183,10 +183,10 @@ |
|
|
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/public/head.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/view/user/authorization_view.html" />
|
|
|
<option value="$PROJECT_DIR$/application/common/controller/WechatBase.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/User.php" />
|
|
|
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
...
|
...
|
@@ -395,7 +395,7 @@ |
|
|
<component name="PropertiesComponent">
|
|
|
<property name="DefaultHtmlFileTemplate" value="HTML File" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="last_opened_file_path" value="D:/phpStudy/WWW/shengbao" />
|
|
|
<property name="last_opened_file_path" value="D:/phpStudy/WWW/新建文件夹" />
|
|
|
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
|
|
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
|
|
<property name="settings.editor.selected.configurable" value="terminal" />
|
...
|
...
|
@@ -449,7 +449,7 @@ |
|
|
<workItem from="1572223206994" duration="28857000" />
|
|
|
<workItem from="1572309778506" duration="26117000" />
|
|
|
<workItem from="1572395935540" duration="28313000" />
|
|
|
<workItem from="1572483209367" duration="12597000" />
|
|
|
<workItem from="1572483209367" duration="13984000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="数据库配置">
|
|
|
<created>1571972429395</created>
|
...
|
...
|
@@ -773,11 +773,25 @@ |
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572503340201</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="47" />
|
|
|
<task id="LOCAL-00047" summary="调试授权登录">
|
|
|
<created>1572503449879</created>
|
|
|
<option name="number" value="00047" />
|
|
|
<option name="presentableId" value="LOCAL-00047" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572503449879</updated>
|
|
|
</task>
|
|
|
<task id="LOCAL-00048" summary="调试授权登录">
|
|
|
<created>1572504815693</created>
|
|
|
<option name="number" value="00048" />
|
|
|
<option name="presentableId" value="LOCAL-00048" />
|
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1572504815693</updated>
|
|
|
</task>
|
|
|
<option name="localTasksCounter" value="49" />
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
<option name="totallyTimeSpent" value="226135000" />
|
|
|
<option name="totallyTimeSpent" value="227522000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
...
|
...
|
@@ -1175,13 +1189,6 @@ |
|
|
</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="334">
|
|
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="708">
|
...
|
...
|
@@ -1206,17 +1213,24 @@ |
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="306">
|
|
|
<caret line="26" column="85" selection-start-line="26" selection-start-column="74" selection-end-line="26" selection-end-column="85" />
|
|
|
<state relative-caret-position="300">
|
|
|
<caret line="149" column="46" selection-start-line="149" selection-start-column="35" selection-end-line="149" selection-end-column="46" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="198">
|
|
|
<caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
|
|
|
<state relative-caret-position="334">
|
|
|
<caret line="78" column="13" selection-start-line="78" selection-start-column="13" selection-end-line="78" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="289">
|
|
|
<caret line="25" column="36" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
...
|
...
|
|