夏文涛 пре 1 година
родитељ
комит
87825868ad
2 измењених фајлова са 12 додато и 29 уклоњено
  1. 11 27
      .idea/workspace.xml
  2. 1 2
      src/main/java/com/template/controller/SystemMenuController.java

+ 11 - 27
.idea/workspace.xml

@@ -2,23 +2,7 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="">
     <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-16.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-17.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-18.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-19.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-20.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-21.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-23.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-24.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-25.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-26.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-27.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-30.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2024-12-31.log" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/logs/smart-2025-01-16.log" beforeDir="false" afterPath="$PROJECT_DIR$/logs/smart-2025-01-16.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/ActivitySigninController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/ActivitySigninController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SysCaptchaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SysCaptchaController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -115,8 +99,8 @@
       <file pinned="false" current-in-tab="true">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="322">
-              <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+            <state relative-caret-position="92">
+              <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -193,7 +177,6 @@
   <component name="IdeDocumentHistory">
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
     <option name="CHANGED_PATHS">
       <list>
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/ClubListDataVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/AlumniActivityControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/api/AlumniActivityControllerAPI.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/aop/LoggingAspect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/aop/LoggingAspect.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniUserServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/services/impl/AlumniUserServiceImpl.java" />
@@ -244,6 +227,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ActivityReportController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ActivitySigninController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/ActivitySigninController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SysCaptchaController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SysCaptchaController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -274,7 +258,7 @@
   <component name="MavenRunner">
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
     <option name="skipTests" value="true" />
   </component>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
+  <component name="ProjectFrameBounds">
     <option name="x" value="-7" />
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
     <option name="height" value="1039" />
@@ -481,12 +465,12 @@
       <workItem from="1736754601843" duration="731000" />
       <workItem from="1736754601843" duration="731000" />
       <workItem from="1736755888424" duration="8028000" />
       <workItem from="1736755888424" duration="8028000" />
       <workItem from="1736841755601" duration="4418000" />
       <workItem from="1736841755601" duration="4418000" />
-      <workItem from="1736900483921" duration="28423000" />
+      <workItem from="1736900483921" duration="28521000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="192341000" />
+    <option name="totallyTimeSpent" value="192439000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -498,10 +482,10 @@
     </todo-panel>
     </todo-panel>
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1048" extended-state="6" />
+    <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
     <editor active="true" />
     <editor active="true" />
     <layout>
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17377399" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.35667396" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="JRebel" order="2" side_tool="true" />
       <window_info id="JRebel" order="2" side_tool="true" />
       <window_info id="Image Layers" order="3" />
       <window_info id="Image Layers" order="3" />
@@ -874,8 +858,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/SystemMenuController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="322">
-          <caret line="28" column="13" selection-start-line="28" selection-start-column="13" selection-end-line="28" selection-end-column="13" />
+        <state relative-caret-position="92">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>

+ 1 - 2
src/main/java/com/template/controller/SystemMenuController.java

@@ -1,15 +1,14 @@
 package com.template.controller;
 package com.template.controller;
 
 
 
 
+import com.template.annotation.PassToken;
 import com.template.api.SystemMenuControllerAPI;
 import com.template.api.SystemMenuControllerAPI;
 import com.template.model.pojo.SystemMenu;
 import com.template.model.pojo.SystemMenu;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.SystemMenuTreeVo;
 import com.template.model.vo.SystemMenuTreeVo;
 import com.template.model.vo.SystemMenuVo;
 import com.template.model.vo.SystemMenuVo;
 import com.template.services.SystemMenuService;
 import com.template.services.SystemMenuService;
-import com.template.annotation.PassToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;