sdad

.idea/workspace.xml

@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a4ba97bd-69fc-4549-8407-13eeec316f0f" name="Default Changelist" comment="">
-      <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/AlumniActivityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/alumni.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/alumni.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/alumni.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniHeartController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/AlumniHeartController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniNewsController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniNewsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -36,10 +33,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/AlumniHeartControllerAPI.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="25" column="66" selection-start-line="25" selection-start-column="66" selection-end-line="25" selection-end-column="66" />
+            <state relative-caret-position="240">
+              <caret line="142" column="8" lean-forward="true" selection-start-line="142" selection-start-column="8" selection-end-line="144" selection-end-column="9" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -48,58 +45,24 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertAlumniNewsRequest.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniNewsController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+            <state relative-caret-position="-4">
+              <caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/request/insertHeartRequest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="27" column="13" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="332">
-              <caret line="143" column="12" selection-start-line="143" selection-start-column="12" selection-end-line="143" selection-end-column="74" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniImageController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret line="51" column="4" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="88" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniAdminApplyMapper.xml">
+          <provider selected="true" editor-type-id="text-editor" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="640">
-              <caret line="489" column="75" selection-start-line="489" selection-start-column="75" selection-end-line="489" selection-end-column="75" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniActivity.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="50" column="19" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
+            <state relative-caret-position="299">
+              <caret line="121" column="68" lean-forward="true" selection-start-line="121" selection-start-column="68" selection-end-line="121" selection-end-column="68" />
             </state>
           </provider>
         </entry>
@@ -115,7 +78,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>report</find>
       <find>queryMyJoinActivityPages</find>
       <find>activityReportById</find>
       <find>querySigninDatasByActivityId</find>
@@ -145,6 +107,7 @@
       <find>queryClubPages</find>
       <find>queryActivityPages</find>
       <find>theme</find>
+      <find>cretat_time</find>
     </findStrings>
     <replaceStrings>
       <replace>FIND_IN_SET($</replace>
@@ -158,7 +121,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/FileController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/ActivityReportMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/pojo/AlumniCategory.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/model/vo/HomeClubVo.java" />
@@ -206,9 +168,10 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniCategoryMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniImageMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniUserMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/template/controller/AlumniNewsController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml" />
       </list>
     </option>
   </component>
@@ -239,9 +202,8 @@
   <component name="MavenRunner">
     <option name="skipTests" value="true" />
   </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-14" />
-    <option name="y" value="121" />
+  <component name="ProjectFrameBounds">
+    <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
   </component>
@@ -303,6 +265,21 @@
               <item name="template" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="school_ecology_houtai" type="b2602c69:ProjectViewProjectNode" />
+              <item name="school_ecology_houtai" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="school_ecology_houtai" type="b2602c69:ProjectViewProjectNode" />
+              <item name="school_ecology_houtai" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="template" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -432,12 +409,12 @@
       <workItem from="1736754601843" duration="731000" />
       <workItem from="1736755888424" duration="8028000" />
       <workItem from="1736841755601" duration="4418000" />
-      <workItem from="1736900483921" duration="26526000" />
+      <workItem from="1736900483921" duration="26760000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="190444000" />
+    <option name="totallyTimeSpent" value="190678000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -526,13 +503,6 @@
     <SUITE FILE_PATH="coverage/school_ecology_houtai$MybatisPlusApplication.ic" NAME="MybatisPlusApplication Coverage Results" MODIFIED="1737017042490" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/services/AlumniNewsService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="506">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/model/enumModel/eTopType.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -685,9 +655,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/ActivitySigninMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniAdminApplyMapper.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniCategoryImageMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -759,13 +726,6 @@
     <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/WxAccessTokenMapper.xml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="462">
-          <caret line="56" column="87" selection-start-line="56" selection-start-column="87" selection-end-line="56" selection-end-column="87" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/api/AlumniNewsControllerAPI.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="253">
@@ -797,16 +757,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="332">
-          <caret line="143" column="12" selection-start-line="143" selection-start-column="12" selection-end-line="143" selection-end-column="74" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniImageController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -830,8 +780,35 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniActivityController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="640">
-          <caret line="489" column="75" selection-start-line="489" selection-start-column="75" selection-end-line="489" selection-end-column="75" />
+        <state relative-caret-position="-12424">
+          <caret line="209" column="39" selection-start-line="209" selection-start-column="39" selection-end-line="209" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniHeartController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="240">
+          <caret line="142" column="8" lean-forward="true" selection-start-line="142" selection-start-column="8" selection-end-line="144" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/template/controller/AlumniNewsController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4">
+          <caret line="111" column="23" selection-start-line="111" selection-start-column="23" selection-end-line="111" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniAdminApplyMapper.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/template/AlumniActivityMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="121" column="68" lean-forward="true" selection-start-line="121" selection-start-column="68" selection-end-line="121" selection-end-column="68" />
         </state>
       </provider>
     </entry>

src/main/java/com/template/controller/AlumniActivityController.java

@@ -129,7 +129,8 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
         aa.setOrgId(iar.getOrgId());
         aa.setOrgName(iar.getOrgName());
         aa.setTheme(iar.getTheme());
-        aa.setThemeDetail(iar.getThemeDetail());
+        String contentd = StringEscapeUtils.escapeHtml4(iar.getThemeDetail());
+        aa.setThemeDetail(contentd);
         aa.setStartTime(TimeExchange.StringToDate(iar.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
         aa.setEndTime(TimeExchange.StringToDate(iar.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
         aa.setPoster(iar.getPoster());
@@ -205,7 +206,8 @@ public class AlumniActivityController implements AlumniActivityControllerAPI {
         oldData.setOrgId(uar.getOrgId());
         oldData.setOrgName(uar.getOrgName());
         oldData.setTheme(uar.getTheme());
-        oldData.setThemeDetail(uar.getThemeDetail());
+        String contentd = StringEscapeUtils.escapeHtml4(uar.getThemeDetail());
+        oldData.setThemeDetail(contentd);
         oldData.setStartTime(TimeExchange.StringToDate(uar.getStartTime(), "yyyy-MM-dd HH:mm:ss"));
         oldData.setEndTime(TimeExchange.StringToDate(uar.getEndTime(), "yyyy-MM-dd HH:mm:ss"));
         oldData.setPoster(uar.getPoster());

src/main/java/com/template/controller/AlumniNewsController.java

@@ -13,6 +13,7 @@ import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.NewsPageVo;
 import com.template.services.AlumniNewsService;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 
@@ -48,7 +49,8 @@ public class AlumniNewsController implements AlumniNewsControllerAPI {
 
         AlumniNews an = new AlumniNews();
         an.setTheme(ianr.getTheme());
-        an.setContent(ianr.getContent());
+        String content = StringEscapeUtils.escapeHtml4(ianr.getContent());
+        an.setContent(content);
         an.setCategoryId(ianr.getCategoryId());
         an.setCategoryName(ianr.getCategoryName());
         an.setUserId(ianr.getUserId());
@@ -75,7 +77,8 @@ public class AlumniNewsController implements AlumniNewsControllerAPI {
 
         AlumniNews an = alumniNewsService.queryDataById(uanr.getId());
         an.setTheme(uanr.getTheme());
-        an.setContent(uanr.getContent());
+        String content = StringEscapeUtils.escapeHtml4(uanr.getContent());
+        an.setContent(content);
         an.setCategoryId(uanr.getCategoryId());
         an.setCategoryName(uanr.getCategoryName());
         an.setUserId(uanr.getUserId());
@@ -106,7 +109,9 @@ public class AlumniNewsController implements AlumniNewsControllerAPI {
     @Override
     public CommonResult queryAlumniNewsPage(int currentPage, int pageCount, String userName, String theme, String startTime, String endTime) {
         PageUtils<AlumniNews> result = alumniNewsService.queryPageList(currentPage, pageCount, theme, userName, startTime, endTime);
-
+        for (AlumniNews r : result.getList()) {
+            r.setContent(StringEscapeUtils.unescapeHtml4(r.getContent()));
+        }
         return CommonResult.ok(result);
     }
 

src/main/resources/mapper/template/AlumniActivityMapper.xml

@@ -128,7 +128,7 @@
         <if test="userId != null and userId != 0">
             and FIND_IN_SET(${userId},aa.apply_user)
         </if>
-        order by aa.cretat_time desc
+        order by aa.create_time desc
     </select>
 
 

target/classes/mapper/template/AlumniActivityMapper.xml

@@ -128,7 +128,7 @@
         <if test="userId != null and userId != 0">
             and FIND_IN_SET(${userId},aa.apply_user)
         </if>
-        order by aa.cretat_time desc
+        order by aa.create_time desc
     </select>