Merge branch 'main' of http://122.51.230.86:3000/dianliang/school_website

ruoyi-admin/src/main/java/com/ruoyi/cms/api/BaseInfoApi.java

@@ -1,9 +1,6 @@
 package com.ruoyi.cms.api;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.cms.domain.BaseInfo;
 import com.ruoyi.cms.service.IBaseInfoService;
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +8,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Anonymous
 @RestController
 @RequestMapping("/api/baseInfo")
 public class BaseInfoApi extends BaseController {

ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSCategoryAPI.java

@@ -4,13 +4,11 @@ import com.ruoyi.cms.domain.CmsCategory;
 import com.ruoyi.cms.query.CmsCategoryQuery;
 import com.ruoyi.cms.query.CmsContentQuery;
 import com.ruoyi.cms.service.ICmsCategoryService;
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-@Anonymous
 @RequestMapping("/api/category")
 @RestController
 public class CMSCategoryAPI extends BaseController {

ruoyi-admin/src/main/java/com/ruoyi/cms/api/CMSContentAPI.java

@@ -1,14 +1,12 @@
 package com.ruoyi.cms.api;
 
 import com.ruoyi.cms.service.ICmsContentService;
-import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 
-@Anonymous
 @RestController
 @RequestMapping("/api/content")
 public class CMSContentAPI extends BaseController {

ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitCompetitionAPI.java

@@ -22,7 +22,6 @@ import java.util.List;
  * @author 点亮信息
  * @date 2024-07-26
  */
-@Anonymous
 @RestController
 @RequestMapping("/api/competition")
 public class HitCompetitionAPI extends BaseController

ruoyi-admin/src/main/java/com/ruoyi/cms/api/HitRegistrationStudentInfoAPI.java

@@ -29,7 +29,6 @@ import java.util.stream.Collectors;
  * @author 点亮信息
  * @date 2024-07-26
  */
-@Anonymous
 @RestController
 @RequestMapping("/api/registerStudent")
 public class HitRegistrationStudentInfoAPI extends BaseController

ruoyi-admin/src/main/java/com/ruoyi/cms/controller/UeditorController.java

@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-@Anonymous
 @RestController
 @RequestMapping("/ueditor")
 public class UeditorController {

ruoyi-admin/src/main/resources/config/ueditor/config.json

@@ -7,7 +7,7 @@
   "imageCompressEnable": true, /* 是否压缩图片,默认是true */
   "imageCompressBorder": 1600, /* 图片压缩最长边限制 */
   "imageInsertAlign": "none", /* 插入的图片浮动方式 */
-  "imageUrlPrefix": "http://localhost:8080", /* 图片访问路径前缀 */
+  "imageUrlPrefix": "https://f382b38516.zicp.fun", /* 图片访问路径前缀 */
   "imagePathFormat": "image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
   /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
   /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
@@ -43,7 +43,7 @@
   "videoActionName": "uploadvideo", /* 执行上传视频的action名称 */
   "videoFieldName": "upfile", /* 提交的视频表单名称 */
   "videoPathFormat": "video/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-  "videoUrlPrefix": "http://localhost:8080", /* 视频访问路径前缀 */
+  "videoUrlPrefix": "https://f382b38516.zicp.fun", /* 视频访问路径前缀 */
   "videoMaxSize": 102400000, /* 上传大小限制，单位B，默认100MB */
   "videoAllowFiles": [        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid"], /* 上传视频格式显示 */
   /* 上传文件配置 */
@@ -52,7 +52,7 @@
   "filePathFormat": "file/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
   "fileUrlPrefix": "", /* 文件访问路径前缀 */
   "fileMaxSize": 51200000, /* 上传大小限制，单位B，默认50MB */
-  "fileAllowFiles": [        ".png", ".jpg", ".jpeg", ".gif", ".bmp",        ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"    ], /* 上传文件格式显示 */
+  "fileAllowFiles": [        ".png", ".jpg", ".jpeg", ".gif", ".bmp", ".flv", ".swf", ".mkv", ".avi", ".rm", ".rmvb", ".mpeg", ".mpg",        ".ogg", ".ogv", ".mov", ".wmv", ".mp4", ".webm", ".mp3", ".wav", ".mid",        ".rar", ".zip", ".tar", ".gz", ".7z", ".bz2", ".cab", ".iso",        ".doc", ".docx", ".xls", ".xlsx", ".ppt", ".pptx", ".pdf", ".txt", ".md", ".xml"    ], /* 上传文件格式显示 */
   /* 列出指定目录下的图片 */
   "imageManagerActionName": "listimage", /* 执行图片管理的action名称 */
   "imageManagerListPath": "image/", /* 指定要列出图片的目录 */

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -115,6 +115,7 @@ public class SecurityConfig
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                    .antMatchers("/api/**", "/ueditor/**").permitAll()
                         // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })

ruoyi-ui/src/views/cms/editor/index.vue

@@ -244,7 +244,7 @@ export default {
     },
     //保存
     handlerSaveBefore(){
-      this.form.status = this.form.id !== null ? "3" : "0"
+      this.form.status = this.form.id === "" ? "0" : "3"
       this.handleSave();
     },
     // 新增
@@ -288,12 +288,19 @@ export default {
       if (this.form.accessoryUrl !== null && this.form.accessoryUrl.length !== 0) {
         this.form.isAccessory = "1"
         this.form.accessoryUrl = this.StrToArr(this.form.accessoryUrl)
+      }else {
+        this.form.isAccessory = "0";
+        this.form.accessoryUrl = [];
       }
       if (this.form.imageUrl !== null && this.form.imageUrl.length !== 0) {
         this.form.imageUrl = this.StrToArr(this.form.imageUrl)
+      }else {
+        this.form.imageUrl = []
       }
       if (this.form.videoUrl !== null && this.form.videoUrl.length !== 0) {
         this.form.videoUrl = this.StrToArr(this.form.videoUrl)
+      }else {
+        this.form.videoUrl = []
       }
     },
     formatTimer: function(value) {

ruoyi-ui/src/views/dashboard/shortcut/index.vue

@@ -34,7 +34,6 @@ export default {
   methods: {
     loadShortcuts() {
       getHomeShortcuts().then(response => {
-        console.log(response)
         this.shortcuts = response.data;
       })
     },

ruoyi-ui/src/views/hit/registrationStudentInfo/index.vue

@@ -286,7 +286,6 @@ export default {
       listHitRegistrationStudentInfo(this.queryParams).then(response => {
         this.HitRegistrationStudentInfoList = response.rows;
         this.HitRegistrationStudentInfoList.forEach(item => {
-          console.log(item)
           if (item.leaderNames !== null) item.leaderNames = item.leaderNames.join(",");
           if (item.guideNames !== null) item.guideNames = item.guideNames.join(",");
         })