Prechádzať zdrojové kódy

repair some defects in login and register

UnowHouse 6 rokov pred
rodič
commit
2a73adba31

+ 154 - 93
.idea/workspace.xml

@@ -30,18 +30,18 @@
       <file leaf-file-name="manage.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="59" column="26" lean-forward="false" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="26" />
+            <state relative-caret-position="168">
+              <caret line="30" column="12" lean-forward="true" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ManagerController.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="ManagerController.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1464">
-              <caret line="67" column="12" lean-forward="false" selection-start-line="66" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
+            <state relative-caret-position="129">
+              <caret line="64" column="5" lean-forward="true" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -52,8 +52,18 @@
       <file leaf-file-name="entrance.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="648">
-              <caret line="27" column="33" lean-forward="false" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
+            <state relative-caret-position="192">
+              <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="login_register.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="44" column="54" lean-forward="true" selection-start-line="44" selection-start-column="54" selection-end-line="44" selection-end-column="54" />
               <folding />
             </state>
           </provider>
@@ -81,21 +91,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="application.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="96">
-              <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="ManagerService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1320">
-              <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
+            <state relative-caret-position="315">
+              <caret line="62" column="19" lean-forward="true" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -103,11 +103,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ManagerMapper.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/mapper/ManagerMapper.java">
+      <file leaf-file-name="LoginInterceptor.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
-              <caret line="13" column="16" lean-forward="true" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
+            <state relative-caret-position="99">
+              <caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -115,19 +115,17 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LoginInterceptor.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java">
+      <file leaf-file-name="style.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/css/style.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="498">
-              <caret line="42" column="39" lean-forward="true" selection-start-line="42" selection-start-column="39" selection-end-line="42" selection-end-column="39" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="264">
+              <caret line="26" column="23" lean-forward="true" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WebConfig.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="WebConfig.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="159">
@@ -207,19 +205,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/ExceptionResult.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/ExceptionHandle.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/service/CourseService.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/public/css/style.css" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/pojo/Manager.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/common/ExceptionEnum.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/entrance.html" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/mapper/ManagerMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/manage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js" />
         <option value="$PROJECT_DIR$/src/main/resources/application.yml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/public/css/style.css" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/entrance.html" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/manage.html" />
+        <option value="$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java" />
       </list>
     </option>
   </component>
@@ -362,6 +360,16 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="unow" type="462c0819:PsiDirectoryNode" />
+              <item name="service" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="course-manager" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="unow" type="462c0819:PsiDirectoryNode" />
               <item name="web" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -371,6 +379,43 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="course-manager" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="course-manager" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="course-manager" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="css" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="course-manager" type="b2602c69:ProjectViewProjectNode" />
+              <item name="course-manager" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -685,7 +730,7 @@
       <workItem from="1544978183989" duration="1034000" />
       <workItem from="1545012692326" duration="941000" />
       <workItem from="1545052860026" duration="7260000" />
-      <workItem from="1545094096309" duration="1182000" />
+      <workItem from="1545094096309" duration="2779000" />
     </task>
     <servers />
   </component>
@@ -722,7 +767,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="40485000" />
+    <option name="totallyTimeSpent" value="42082000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
@@ -785,6 +830,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="840">
           <caret line="35" column="21" lean-forward="false" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -838,6 +884,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="840">
           <caret line="35" column="21" lean-forward="true" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -897,6 +944,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="768">
           <caret line="32" column="32" lean-forward="true" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -919,6 +967,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1248">
           <caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="52" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -926,6 +975,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
           <caret line="16" column="7" lean-forward="false" selection-start-line="16" selection-start-column="7" selection-end-line="16" selection-end-column="7" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -955,13 +1007,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="204">
           <caret line="80" column="11" lean-forward="true" selection-start-line="80" selection-start-column="11" selection-end-line="91" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/css/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="33" column="5" lean-forward="true" selection-start-line="33" selection-start-column="5" selection-end-line="33" selection-end-column="5" />
+          <folding>
+            <element signature="n#!!doc" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -976,6 +1024,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="129">
           <caret line="22" column="28" lean-forward="true" selection-start-line="22" selection-start-column="28" selection-end-line="22" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1018,6 +1069,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
           <caret line="25" column="13" lean-forward="false" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="13" />
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1029,111 +1081,120 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1320">
-          <caret line="62" column="12" lean-forward="false" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
+        <state relative-caret-position="-11">
+          <caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/mapper/ManagerMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="312">
+          <caret line="13" column="16" lean-forward="true" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="81">
-          <caret line="89" column="20" lean-forward="true" selection-start-line="89" selection-start-column="20" selection-end-line="89" selection-end-column="20" />
+        <state relative-caret-position="96">
+          <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1464">
-          <caret line="67" column="12" lean-forward="false" selection-start-line="66" selection-start-column="12" selection-end-line="67" selection-end-column="12" />
+        <state relative-caret-position="240">
+          <caret line="16" column="27" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="648">
-          <caret line="27" column="33" lean-forward="false" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
-          <folding />
+        <state relative-caret-position="159">
+          <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#611#612#0" expanded="true" />
+            <element signature="e#656#657#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="59" column="26" lean-forward="false" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="26" />
-          <folding />
+        <state relative-caret-position="99">
+          <caret line="27" column="46" lean-forward="false" selection-start-line="27" selection-start-column="46" selection-end-line="27" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/mainFunction.js">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-11">
-          <caret line="34" column="8" lean-forward="true" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="8" />
+        <state relative-caret-position="264">
+          <caret line="26" column="23" lean-forward="true" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/mapper/ManagerMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/entrance.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="13" column="16" lean-forward="true" selection-start-line="13" selection-start-column="16" selection-end-line="13" selection-end-column="16" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="192">
+          <caret line="55" column="27" lean-forward="true" selection-start-line="55" selection-start-column="27" selection-end-line="55" selection-end-column="27" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/public/js/login_register.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="96">
-          <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+        <state relative-caret-position="153">
+          <caret line="44" column="54" lean-forward="true" selection-start-line="44" selection-start-column="54" selection-end-line="44" selection-end-column="54" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/CourseManagerApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="16" column="27" lean-forward="false" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="312">
+          <caret line="33" column="23" lean-forward="true" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/CourseController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/manage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="33" column="23" lean-forward="true" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+        <state relative-caret-position="168">
+          <caret line="30" column="12" lean-forward="true" selection-start-line="30" selection-start-column="12" selection-end-line="30" selection-end-column="12" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/LoginInterceptor.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/service/ManagerService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="498">
-          <caret line="42" column="39" lean-forward="true" selection-start-line="42" selection-start-column="39" selection-end-line="42" selection-end-column="39" />
+        <state relative-caret-position="315">
+          <caret line="62" column="19" lean-forward="true" selection-start-line="62" selection-start-column="19" selection-end-line="62" selection-end-column="19" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/interceptor/WebConfig.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/unow/web/ManagerController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="159">
-          <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
+        <state relative-caret-position="129">
+          <caret line="64" column="5" lean-forward="true" selection-start-line="64" selection-start-column="5" selection-end-line="64" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#611#612#0" expanded="true" />
-            <element signature="e#656#657#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 11 - 5
src/main/java/com/unow/service/ManagerService.java

@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpSession;
+import java.util.HashMap;
+import java.util.Map;
 
 /*
  *  @项目名:  course-manager 
@@ -29,11 +31,11 @@ public class ManagerService {
         if(manager == null){
             throw new MyException(ExceptionEnum.ERROR_LOGIN);
         }
-        session.setAttribute("user",manager.getUsername());
+        session.setAttribute("user",manager.getSickname());
     }
 
 
-    public void registerService(String username, String password) {
+    public void registerService(String username, String password,String sickname) {
 
         Manager manager = new Manager();
         manager.setUsername(username);
@@ -42,6 +44,7 @@ public class ManagerService {
             throw new MyException(ExceptionEnum.ERROR_REGISTER);
         }
         manager.setPassword(password);
+        manager.setSickname(sickname);
         int insert = managerMapper.insert(manager);
         if(insert != 1){
             throw new MyException(ExceptionEnum.ERROR_INSERT_MANAGER);
@@ -49,12 +52,15 @@ public class ManagerService {
 
     }
 
-    public void isLogin(HttpSession session) {
+    public Map<String,String> isLogin(HttpSession session) {
 
-        String username = (String) session.getAttribute("user");
-        if(username == null){
+        String sickname = (String) session.getAttribute("user");
+        if(sickname == null){
             throw new MyException(ExceptionEnum.NOT_LOGIN);
         }
+        Map<String,String> map = new HashMap<>();
+        map.put("user",sickname);
+        return map;
 
     }
 

+ 7 - 5
src/main/java/com/unow/web/ManagerController.java

@@ -7,6 +7,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpSession;
+import java.util.Map;
 
 /*
  *  @项目名:  course-manager 
@@ -46,8 +47,9 @@ public class ManagerController {
      */
     @PostMapping("register")
     public ResponseEntity<Void> register(@RequestParam(name = "username")String username,
-                                         @RequestParam(name = "password")String password){
-        managerService.registerService(username,password);
+                                         @RequestParam(name = "password")String password,
+                                         @RequestParam(name = "sickname",defaultValue = "小明")String sickname){
+        managerService.registerService(username,password,sickname);
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 
@@ -57,9 +59,9 @@ public class ManagerController {
      * @return
      */
     @GetMapping("isLogin")
-    public ResponseEntity<String> detectLogin(HttpSession session){
-        managerService.isLogin(session);
-        return ResponseEntity.status(HttpStatus.OK).build();
+    public ResponseEntity<Map<String,String>> detectLogin(HttpSession session){
+        Map<String, String> user = managerService.isLogin(session);
+        return ResponseEntity.ok(user);
     }
 
     /**

+ 4 - 0
src/main/resources/static/entrance.html

@@ -54,6 +54,10 @@
                         <div class="line"></div>
                     </label>
                     <label>
+                        <span>昵称</span><input type="text" name="sickName" id="register_sickname" class="input reg_input">
+                        <div class="line"></div>
+                    </label>
+                    <label>
                         <span>密码</span><input type="password" name="userPassword" id="register_password" class="input reg_input">
                         <div class="line"></div>
                     </label>

+ 10 - 1
src/main/resources/static/manage.html

@@ -27,10 +27,14 @@
     <!--bootstrap基础引用 start-->
   <script type="text/javascript" src="public/bootstrap/jquery-3.1.1.min.js"></script>
   <script>
+    var sickname;
     $.ajax({
       url:'manager/isLogin',
       type:'get',
       async:false,
+      success:function(data){
+        sickname=data.user;
+      },
       error:function(){
           window.location.href='entrance.html'
       }
@@ -56,7 +60,7 @@
           <ul class="nav navbar-nav navbar-right">
   <!--           <li><a href="#">Dashboard</a></li>
             <li><a href="#">Settings</a></li> -->
-            <li><a href="#">about me</a></li>
+            <li><a id="sickname" href="#">about me</a></li>
             <li id="logout"><a href="javascript:void(0)">退出</a></li>
           </ul>
         </div>
@@ -247,6 +251,11 @@
     <!-- mainFunction.js start-->
     <script type="text/javascript" src="public/js/mainFunction.js"></script>
     <!-- mainFunction.js end-->
+    <script>
+      $("#sickname").click(function(){
+        $("#sickname").text(sickname);
+      })
+    </script>
   </body>
 
 </html>

+ 1 - 1
src/main/resources/static/public/css/style.css

@@ -20,7 +20,7 @@ a {
     display: flex;
     background:#fff;
     width: 450px;
-    height: 500px;
+    height: 600px;
     overflow: auto;
     box-shadow: 2px 1px 6px #CC9999;
     flex-direction: column;

+ 1 - 0
src/main/resources/static/public/js/login_register.js

@@ -42,6 +42,7 @@ $("#reg_btn").click(function () {
             data:{
                 username:$("#register_username").val(),
                 password:$("#register_password").val(),
+                sickname:$("#register_sickname").val()
             },
             success:function(data){
                 alert("注册成功!")

BIN
target/classes/com/unow/service/ManagerService.class


BIN
target/classes/com/unow/web/ManagerController.class


+ 4 - 0
target/classes/static/entrance.html

@@ -54,6 +54,10 @@
                         <div class="line"></div>
                     </label>
                     <label>
+                        <span>昵称</span><input type="text" name="sickName" id="register_sickname" class="input reg_input">
+                        <div class="line"></div>
+                    </label>
+                    <label>
                         <span>密码</span><input type="password" name="userPassword" id="register_password" class="input reg_input">
                         <div class="line"></div>
                     </label>

+ 10 - 1
target/classes/static/manage.html

@@ -27,10 +27,14 @@
     <!--bootstrap基础引用 start-->
   <script type="text/javascript" src="public/bootstrap/jquery-3.1.1.min.js"></script>
   <script>
+    var sickname;
     $.ajax({
       url:'manager/isLogin',
       type:'get',
       async:false,
+      success:function(data){
+        sickname=data.user;
+      },
       error:function(){
           window.location.href='entrance.html'
       }
@@ -56,7 +60,7 @@
           <ul class="nav navbar-nav navbar-right">
   <!--           <li><a href="#">Dashboard</a></li>
             <li><a href="#">Settings</a></li> -->
-            <li><a href="#">about me</a></li>
+            <li><a id="sickname" href="#">about me</a></li>
             <li id="logout"><a href="javascript:void(0)">退出</a></li>
           </ul>
         </div>
@@ -247,6 +251,11 @@
     <!-- mainFunction.js start-->
     <script type="text/javascript" src="public/js/mainFunction.js"></script>
     <!-- mainFunction.js end-->
+    <script>
+      $("#sickname").click(function(){
+        $("#sickname").text(sickname);
+      })
+    </script>
   </body>
 
 </html>

+ 1 - 1
target/classes/static/public/css/style.css

@@ -20,7 +20,7 @@ a {
     display: flex;
     background:#fff;
     width: 450px;
-    height: 500px;
+    height: 600px;
     overflow: auto;
     box-shadow: 2px 1px 6px #CC9999;
     flex-direction: column;

+ 1 - 0
target/classes/static/public/js/login_register.js

@@ -42,6 +42,7 @@ $("#reg_btn").click(function () {
             data:{
                 username:$("#register_username").val(),
                 password:$("#register_password").val(),
+                sickname:$("#register_sickname").val()
             },
             success:function(data){
                 alert("注册成功!")