作者 xiaohu thinkpad

统计学时问题修复

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/app/user/controller/ProfileController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/ProfileController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/public/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.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" />
@@ -102,11 +102,29 @@ @@ -102,11 +102,29 @@
102 </provider> 102 </provider>
103 </entry> 103 </entry>
104 </file> 104 </file>
105 - <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="true"> 105 + <file leaf-file-name="ProfileController.php" pinned="false" current-in-tab="false">
106 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 106 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
107 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
108 - <state relative-caret-position="693">  
109 - <caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" /> 108 + <state relative-caret-position="525">
  109 + <caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="47" selection-end-column="46" />
  110 + </state>
  111 + </provider>
  112 + </entry>
  113 + </file>
  114 + <file leaf-file-name="student.html" pinned="false" current-in-tab="false">
  115 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
  116 + <provider selected="true" editor-type-id="text-editor">
  117 + <state relative-caret-position="567">
  118 + <caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
  119 + </state>
  120 + </provider>
  121 + </entry>
  122 + </file>
  123 + <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
  124 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  125 + <provider selected="true" editor-type-id="text-editor">
  126 + <state relative-caret-position="775">
  127 + <caret line="2102" column="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
110 </state> 128 </state>
111 </provider> 129 </provider>
112 </entry> 130 </entry>
@@ -125,11 +143,11 @@ @@ -125,11 +143,11 @@
125 </provider> 143 </provider>
126 </entry> 144 </entry>
127 </file> 145 </file>
128 - <file leaf-file-name="index.php" pinned="false" current-in-tab="false"> 146 + <file leaf-file-name="index.php" pinned="false" current-in-tab="true">
129 <entry file="file://$PROJECT_DIR$/public/index.php"> 147 <entry file="file://$PROJECT_DIR$/public/index.php">
130 <provider selected="true" editor-type-id="text-editor"> 148 <provider selected="true" editor-type-id="text-editor">
131 - <state relative-caret-position="252">  
132 - <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" /> 149 + <state relative-caret-position="126">
  150 + <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
133 </state> 151 </state>
134 </provider> 152 </provider>
135 </entry> 153 </entry>
@@ -152,6 +170,7 @@ @@ -152,6 +170,7 @@
152 <find>imageUrlPrefix</find> 170 <find>imageUrlPrefix</find>
153 <find>$otherid</find> 171 <find>$otherid</find>
154 <find>commente1</find> 172 <find>commente1</find>
  173 + <find>id_xueshi</find>
155 </findStrings> 174 </findStrings>
156 <dirStrings> 175 <dirStrings>
157 <dir>$PROJECT_DIR$/../07-08-voyager/your-project-name</dir> 176 <dir>$PROJECT_DIR$/../07-08-voyager/your-project-name</dir>
@@ -164,7 +183,6 @@ @@ -164,7 +183,6 @@
164 <component name="IdeDocumentHistory"> 183 <component name="IdeDocumentHistory">
165 <option name="CHANGED_PATHS"> 184 <option name="CHANGED_PATHS">
166 <list> 185 <list>
167 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/style.css" />  
168 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" /> 186 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/xinwen_acticle.htm" />
169 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" /> 187 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
170 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" /> 188 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
@@ -208,13 +226,14 @@ @@ -208,13 +226,14 @@
208 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" /> 226 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController.php" />
209 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" /> 227 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [8].php" />
210 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 228 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
211 - <option value="$PROJECT_DIR$/public/index.php" />  
212 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 229 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
213 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" /> 230 <option value="$PROJECT_DIR$/app/user/controller/CommentController.php" />
214 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" /> 231 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php" />
215 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" /> 232 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [4].php" />
216 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" /> 233 <option value="$USER_HOME$/Desktop/开发资料/temp/22.html" />
217 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" /> 234 <option value="$PROJECT_DIR$/app/user/controller/ProfileController.php" />
  235 + <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
  236 + <option value="$PROJECT_DIR$/public/index.php" />
218 </list> 237 </list>
219 </option> 238 </option>
220 </component> 239 </component>
@@ -286,6 +305,11 @@ @@ -286,6 +305,11 @@
286 <path> 305 <path>
287 <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" /> 306 <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
288 <item name="dm161xueche" type="462c0819:PsiDirectoryNode" /> 307 <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
  308 + <item name="public" type="462c0819:PsiDirectoryNode" />
  309 + </path>
  310 + <path>
  311 + <item name="dm161xueche" type="b2602c69:ProjectViewProjectNode" />
  312 + <item name="dm161xueche" type="462c0819:PsiDirectoryNode" />
289 <item name="simplewind" type="462c0819:PsiDirectoryNode" /> 313 <item name="simplewind" type="462c0819:PsiDirectoryNode" />
290 </path> 314 </path>
291 <path> 315 <path>
@@ -352,21 +376,7 @@ @@ -352,21 +376,7 @@
352 <workItem from="1536326693570" duration="30018000" /> 376 <workItem from="1536326693570" duration="30018000" />
353 <workItem from="1536496471879" duration="16852000" /> 377 <workItem from="1536496471879" duration="16852000" />
354 <workItem from="1536677895835" duration="7811000" /> 378 <workItem from="1536677895835" duration="7811000" />
355 - <workItem from="1536940132237" duration="2280000" />  
356 - </task>  
357 - <task id="LOCAL-00016" summary="ceshi wode jiaolian">  
358 - <created>1535546965523</created>  
359 - <option name="number" value="00016" />  
360 - <option name="presentableId" value="LOCAL-00016" />  
361 - <option name="project" value="LOCAL" />  
362 - <updated>1535546965523</updated>  
363 - </task>  
364 - <task id="LOCAL-00017" summary="ceshi wode jiaolian">  
365 - <created>1535547118071</created>  
366 - <option name="number" value="00017" />  
367 - <option name="presentableId" value="LOCAL-00017" />  
368 - <option name="project" value="LOCAL" />  
369 - <updated>1535547118071</updated> 379 + <workItem from="1536940132237" duration="3578000" />
370 </task> 380 </task>
371 <task id="LOCAL-00018" summary="ceshi wode jiaolian"> 381 <task id="LOCAL-00018" summary="ceshi wode jiaolian">
372 <created>1535548842017</created> 382 <created>1535548842017</created>
@@ -697,11 +707,25 @@ @@ -697,11 +707,25 @@
697 <option name="project" value="LOCAL" /> 707 <option name="project" value="LOCAL" />
698 <updated>1536679162719</updated> 708 <updated>1536679162719</updated>
699 </task> 709 </task>
700 - <option name="localTasksCounter" value="65" /> 710 + <task id="LOCAL-00065" summary="统计学时问题修复">
  711 + <created>1536976333614</created>
  712 + <option name="number" value="00065" />
  713 + <option name="presentableId" value="LOCAL-00065" />
  714 + <option name="project" value="LOCAL" />
  715 + <updated>1536976333615</updated>
  716 + </task>
  717 + <task id="LOCAL-00066" summary="统计学时问题修复">
  718 + <created>1536977008226</created>
  719 + <option name="number" value="00066" />
  720 + <option name="presentableId" value="LOCAL-00066" />
  721 + <option name="project" value="LOCAL" />
  722 + <updated>1536977008226</updated>
  723 + </task>
  724 + <option name="localTasksCounter" value="67" />
701 <servers /> 725 <servers />
702 </component> 726 </component>
703 <component name="TimeTrackingManager"> 727 <component name="TimeTrackingManager">
704 - <option name="totallyTimeSpent" value="141862000" /> 728 + <option name="totallyTimeSpent" value="143160000" />
705 </component> 729 </component>
706 <component name="ToolWindowManager"> 730 <component name="ToolWindowManager">
707 <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" /> 731 <frame x="1912" y="-152" width="1936" height="1056" extended-state="6" />
@@ -768,7 +792,8 @@ @@ -768,7 +792,8 @@
768 <MESSAGE value="我的订单详情标题" /> 792 <MESSAGE value="我的订单详情标题" />
769 <MESSAGE value="登录处理" /> 793 <MESSAGE value="登录处理" />
770 <MESSAGE value="预约时间错误" /> 794 <MESSAGE value="预约时间错误" />
771 - <option name="LAST_COMMIT_MESSAGE" value="预约时间错误" /> 795 + <MESSAGE value="统计学时问题修复" />
  796 + <option name="LAST_COMMIT_MESSAGE" value="统计学时问题修复" />
772 </component> 797 </component>
773 <component name="XDebuggerManager"> 798 <component name="XDebuggerManager">
774 <breakpoint-manager> 799 <breakpoint-manager>
@@ -776,7 +801,6 @@ @@ -776,7 +801,6 @@
776 </breakpoint-manager> 801 </breakpoint-manager>
777 </component> 802 </component>
778 <component name="editorHistoryManager"> 803 <component name="editorHistoryManager">
779 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/kemu.html" />  
780 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" /> 804 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit [2].html" />
781 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" /> 805 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_edit.html" />
782 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" /> 806 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/data_addpic.html" />
@@ -829,13 +853,6 @@ @@ -829,13 +853,6 @@
829 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" /> 853 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/HomeBaseController.php" />
830 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" /> 854 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [10].php" />
831 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" /> 855 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/PublicController [2].php" />
832 - <entry file="file://$PROJECT_DIR$/public/index.php">  
833 - <provider selected="true" editor-type-id="text-editor">  
834 - <state relative-caret-position="252">  
835 - <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />  
836 - </state>  
837 - </provider>  
838 - </entry>  
839 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 856 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
840 <provider selected="true" editor-type-id="text-editor"> 857 <provider selected="true" editor-type-id="text-editor">
841 <state relative-caret-position="468"> 858 <state relative-caret-position="468">
@@ -898,13 +915,6 @@ @@ -898,13 +915,6 @@
898 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php"> 915 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/common.php">
899 <provider selected="true" editor-type-id="text-editor" /> 916 <provider selected="true" editor-type-id="text-editor" />
900 </entry> 917 </entry>
901 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
902 - <provider selected="true" editor-type-id="text-editor">  
903 - <state relative-caret-position="-40608">  
904 - <caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />  
905 - </state>  
906 - </provider>  
907 - </entry>  
908 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 918 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
909 <provider selected="true" editor-type-id="text-editor"> 919 <provider selected="true" editor-type-id="text-editor">
910 <state relative-caret-position="2314"> 920 <state relative-caret-position="2314">
@@ -931,10 +941,31 @@ @@ -931,10 +941,31 @@
931 </state> 941 </state>
932 </provider> 942 </provider>
933 </entry> 943 </entry>
  944 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/student.html">
  945 + <provider selected="true" editor-type-id="text-editor">
  946 + <state relative-caret-position="567">
  947 + <caret line="43" column="29" lean-forward="true" selection-start-line="43" selection-start-column="29" selection-end-line="43" selection-end-column="29" />
  948 + </state>
  949 + </provider>
  950 + </entry>
934 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php"> 951 <entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
935 <provider selected="true" editor-type-id="text-editor"> 952 <provider selected="true" editor-type-id="text-editor">
936 - <state relative-caret-position="693">  
937 - <caret line="47" column="46" selection-start-line="47" selection-start-column="46" selection-end-line="47" selection-end-column="46" /> 953 + <state relative-caret-position="525">
  954 + <caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="47" selection-end-column="46" />
  955 + </state>
  956 + </provider>
  957 + </entry>
  958 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  959 + <provider selected="true" editor-type-id="text-editor">
  960 + <state relative-caret-position="775">
  961 + <caret line="2102" column="17" selection-start-line="2102" selection-start-column="17" selection-end-line="2102" selection-end-column="17" />
  962 + </state>
  963 + </provider>
  964 + </entry>
  965 + <entry file="file://$PROJECT_DIR$/public/index.php">
  966 + <provider selected="true" editor-type-id="text-editor">
  967 + <state relative-caret-position="126">
  968 + <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
938 </state> 969 </state>
939 </provider> 970 </provider>
940 </entry> 971 </entry>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 // [ 入口文件 ] 10 // [ 入口文件 ]
11 date_default_timezone_set('Asia/Shanghai'); 11 date_default_timezone_set('Asia/Shanghai');
12 // 调试模式开关 12 // 调试模式开关
13 -define("APP_DEBUG", 0); 13 +define("APP_DEBUG", 1);
14 14
15 // 定义CMF根目录,可更改此目录 15 // 定义CMF根目录,可更改此目录
16 define('CMF_ROOT', __DIR__ . '/../'); 16 define('CMF_ROOT', __DIR__ . '/../');