Parcourir la source

+ 与会企业行程

chen.cheng il y a 11 mois
Parent
commit
8a190e0e6a

+ 28 - 37
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CpsContentInfoController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsContentInfoController.java

@@ -1,46 +1,47 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.cp;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.CpsContentInfo;
+import com.ruoyi.system.service.ICpsContentInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.CpsContentInfo;
-import com.ruoyi.system.service.ICpsContentInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 发布内容Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-08-14
  */
 @RestController
-@RequestMapping("/cp/contentIfon")
-public class CpsContentInfoController extends BaseController
-{
+@CrossOrigin
+@RequestMapping("/cp/contentInfo")
+@Anonymous
+public class CpsContentInfoController extends BaseController {
     @Autowired
     private ICpsContentInfoService cpsContentInfoService;
 
     /**
      * 查询发布内容列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:list')")
     @GetMapping("/list")
-    public TableDataInfo list(CpsContentInfo cpsContentInfo)
-    {
+    public TableDataInfo list(CpsContentInfo cpsContentInfo) {
         startPage();
         List<CpsContentInfo> list = cpsContentInfoService.selectCpsContentInfoList(cpsContentInfo);
         return getDataTable(list);
@@ -49,11 +50,9 @@ public class CpsContentInfoController extends BaseController
     /**
      * 导出发布内容列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:export')")
     @Log(title = "发布内容", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, CpsContentInfo cpsContentInfo)
-    {
+    public void export(HttpServletResponse response, CpsContentInfo cpsContentInfo) {
         List<CpsContentInfo> list = cpsContentInfoService.selectCpsContentInfoList(cpsContentInfo);
         ExcelUtil<CpsContentInfo> util = new ExcelUtil<CpsContentInfo>(CpsContentInfo.class);
         util.exportExcel(response, list, "发布内容数据");
@@ -62,43 +61,35 @@ public class CpsContentInfoController extends BaseController
     /**
      * 获取发布内容详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(cpsContentInfoService.selectCpsContentInfoById(id));
     }
 
     /**
      * 新增发布内容
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:add')")
     @Log(title = "发布内容", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CpsContentInfo cpsContentInfo)
-    {
+    public AjaxResult add(@RequestBody CpsContentInfo cpsContentInfo) {
         return toAjax(cpsContentInfoService.insertCpsContentInfo(cpsContentInfo));
     }
 
     /**
      * 修改发布内容
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:edit')")
     @Log(title = "发布内容", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CpsContentInfo cpsContentInfo)
-    {
+    public AjaxResult edit(@RequestBody CpsContentInfo cpsContentInfo) {
         return toAjax(cpsContentInfoService.updateCpsContentInfo(cpsContentInfo));
     }
 
     /**
      * 删除发布内容
      */
-    @PreAuthorize("@ss.hasPermi('cp:contentIfon:remove')")
     @Log(title = "发布内容", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(cpsContentInfoService.deleteCpsContentInfoByIds(ids));
     }
 }

+ 0 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsFileReviewInfoController.java

@@ -37,7 +37,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 查询cps_file_review_info预览文件列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:list')")
     @GetMapping("/list")
     public TableDataInfo list(CpsFileReviewInfo cpsFileReviewInfo)
     {
@@ -49,7 +48,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 导出cps_file_review_info预览文件列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:export')")
     @Log(title = "cps_file_review_info预览文件", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsFileReviewInfo cpsFileReviewInfo)
@@ -62,7 +60,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 获取cps_file_review_info预览文件详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 新增cps_file_review_info预览文件
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:add')")
     @Log(title = "cps_file_review_info预览文件", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsFileReviewInfo cpsFileReviewInfo)
@@ -83,7 +79,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 修改cps_file_review_info预览文件
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:edit')")
     @Log(title = "cps_file_review_info预览文件", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsFileReviewInfo cpsFileReviewInfo)
@@ -94,7 +89,6 @@ public class CpsFileReviewInfoController extends BaseController
     /**
      * 删除cps_file_review_info预览文件
      */
-    @PreAuthorize("@ss.hasPermi('cp:fileInfo:remove')")
     @Log(title = "cps_file_review_info预览文件", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 2 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CpsGlbMsgController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsGlbMsgController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.cp;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * cps_glb_msg 全局消息Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-08-14
  */
@@ -37,7 +37,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 查询cps_glb_msg 全局消息列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:list')")
     @GetMapping("/list")
     public TableDataInfo list(CpsGlbMsg cpsGlbMsg)
     {
@@ -49,7 +48,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 导出cps_glb_msg 全局消息列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:export')")
     @Log(title = "cps_glb_msg 全局消息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsGlbMsg cpsGlbMsg)
@@ -62,7 +60,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 获取cps_glb_msg 全局消息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 新增cps_glb_msg 全局消息
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:add')")
     @Log(title = "cps_glb_msg 全局消息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsGlbMsg cpsGlbMsg)
@@ -83,7 +79,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 修改cps_glb_msg 全局消息
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:edit')")
     @Log(title = "cps_glb_msg 全局消息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsGlbMsg cpsGlbMsg)
@@ -94,7 +89,6 @@ public class CpsGlbMsgController extends BaseController
     /**
      * 删除cps_glb_msg 全局消息
      */
-    @PreAuthorize("@ss.hasPermi('cp:msg:remove')")
     @Log(title = "cps_glb_msg 全局消息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 0 - 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsGlbViewCfgController.java

@@ -37,7 +37,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 查询cps_glb_view_cfg 展示配置列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:list')")
     @GetMapping("/list")
     public TableDataInfo list(CpsGlbViewCfg cpsGlbViewCfg)
     {
@@ -49,7 +48,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 导出cps_glb_view_cfg 展示配置列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:export')")
     @Log(title = "cps_glb_view_cfg 展示配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsGlbViewCfg cpsGlbViewCfg)
@@ -62,7 +60,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 获取cps_glb_view_cfg 展示配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 新增cps_glb_view_cfg 展示配置
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:add')")
     @Log(title = "cps_glb_view_cfg 展示配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsGlbViewCfg cpsGlbViewCfg)
@@ -83,7 +79,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 修改cps_glb_view_cfg 展示配置
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:edit')")
     @Log(title = "cps_glb_view_cfg 展示配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsGlbViewCfg cpsGlbViewCfg)
@@ -94,7 +89,6 @@ public class CpsGlbViewCfgController extends BaseController
     /**
      * 删除cps_glb_view_cfg 展示配置
      */
-    @PreAuthorize("@ss.hasPermi('cp:viewcfg:remove')")
     @Log(title = "cps_glb_view_cfg 展示配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 2 - 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CpsMeetingEnterpriseController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingEnterpriseController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.cp;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * cps_meeting_enterprise 与会企业Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-08-14
  */
@@ -37,7 +37,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 查询cps_meeting_enterprise 与会企业列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:list')")
     @GetMapping("/list")
     public TableDataInfo list(CpsMeetingEnterprise cpsMeetingEnterprise)
     {
@@ -49,7 +48,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 导出cps_meeting_enterprise 与会企业列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:export')")
     @Log(title = "cps_meeting_enterprise 与会企业", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsMeetingEnterprise cpsMeetingEnterprise)
@@ -62,7 +60,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 获取cps_meeting_enterprise 与会企业详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 新增cps_meeting_enterprise 与会企业
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:add')")
     @Log(title = "cps_meeting_enterprise 与会企业", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsMeetingEnterprise cpsMeetingEnterprise)
@@ -83,7 +79,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 修改cps_meeting_enterprise 与会企业
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:edit')")
     @Log(title = "cps_meeting_enterprise 与会企业", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsMeetingEnterprise cpsMeetingEnterprise)
@@ -94,7 +89,6 @@ public class CpsMeetingEnterpriseController extends BaseController
     /**
      * 删除cps_meeting_enterprise 与会企业
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterprise:remove')")
     @Log(title = "cps_meeting_enterprise 与会企业", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 15 - 21
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CpsMeetingEnterpriseTripInfoController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/cp/CpsMeetingEnterpriseTripInfoController.java

@@ -1,29 +1,29 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.cp;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.security.access.prepost.PreAuthorize;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.CpsMeetingEnterpriseTripInfo;
+import com.ruoyi.system.service.ICpsMeetingEnterpriseTripInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.CpsMeetingEnterpriseTripInfo;
-import com.ruoyi.system.service.ICpsMeetingEnterpriseTripInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * cps_meeting_enterprise_trip_info与会企业行程信息Controller
- * 
+ *
  * @author ruoyi
  * @date 2024-08-14
  */
@@ -37,7 +37,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 查询cps_meeting_enterprise_trip_info与会企业行程信息列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:list')")
     @GetMapping("/list")
     public TableDataInfo list(CpsMeetingEnterpriseTripInfo cpsMeetingEnterpriseTripInfo)
     {
@@ -49,7 +48,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 导出cps_meeting_enterprise_trip_info与会企业行程信息列表
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:export')")
     @Log(title = "cps_meeting_enterprise_trip_info与会企业行程信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, CpsMeetingEnterpriseTripInfo cpsMeetingEnterpriseTripInfo)
@@ -62,7 +60,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 获取cps_meeting_enterprise_trip_info与会企业行程信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +69,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 新增cps_meeting_enterprise_trip_info与会企业行程信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:add')")
     @Log(title = "cps_meeting_enterprise_trip_info与会企业行程信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CpsMeetingEnterpriseTripInfo cpsMeetingEnterpriseTripInfo)
@@ -83,7 +79,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 修改cps_meeting_enterprise_trip_info与会企业行程信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:edit')")
     @Log(title = "cps_meeting_enterprise_trip_info与会企业行程信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody CpsMeetingEnterpriseTripInfo cpsMeetingEnterpriseTripInfo)
@@ -94,7 +89,6 @@ public class CpsMeetingEnterpriseTripInfoController extends BaseController
     /**
      * 删除cps_meeting_enterprise_trip_info与会企业行程信息
      */
-    @PreAuthorize("@ss.hasPermi('cp:enterpriseTripInfo:remove')")
     @Log(title = "cps_meeting_enterprise_trip_info与会企业行程信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 9 - 8
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -1,5 +1,9 @@
 package com.ruoyi.framework.config;
 
+import com.ruoyi.framework.config.properties.PermitAllUrlProperties;
+import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
+import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
+import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -16,14 +20,10 @@ import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
-import com.ruoyi.framework.config.properties.PermitAllUrlProperties;
-import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
-import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
-import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
 
 /**
  * spring security配置
- * 
+ *
  * @author ruoyi
  */
 @EnableMethodSecurity(prePostEnabled = true, securedEnabled = true)
@@ -35,7 +35,7 @@ public class SecurityConfig
      */
     @Autowired
     private UserDetailsService userDetailsService;
-    
+
     /**
      * 认证失败处理类
      */
@@ -53,7 +53,7 @@ public class SecurityConfig
      */
     @Autowired
     private JwtAuthenticationTokenFilter authenticationTokenFilter;
-    
+
     /**
      * 跨域过滤器
      */
@@ -61,7 +61,8 @@ public class SecurityConfig
     private CorsFilter corsFilter;
 
     /**
-     * 允许匿名访问的地址
+     * 允许匿名访问的地址,
+     * 配合使用 @Anonymous 注解
      */
     @Autowired
     private PermitAllUrlProperties permitAllUrl;

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java

@@ -18,7 +18,7 @@ import com.ruoyi.framework.web.service.TokenService;
 
 /**
  * token过滤器 验证token有效性
- * 
+ *
  * @author ruoyi
  */
 @Component

+ 1 - 0
ruoyi-system/src/main/resources/mapper/cp/CpsContentInfoMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
             <if test="contentType != null "> and content_type = #{contentType}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectCpsContentInfoById" parameterType="Long" resultMap="CpsContentInfoResult">

+ 5 - 5
ruoyi-ui/src/api/cp/contentInfo.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询发布内容列表
 export function listContentIfon(query) {
   return request({
-    url: '/cp/contentIfon/list',
+    url: '/cp/contentInfo/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listContentIfon(query) {
 // 查询发布内容详细
 export function getContentIfon(id) {
   return request({
-    url: '/cp/contentIfon/' + id,
+    url: '/cp/contentInfo/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getContentIfon(id) {
 // 新增发布内容
 export function addContentIfon(data) {
   return request({
-    url: '/cp/contentIfon',
+    url: '/cp/contentInfo',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addContentIfon(data) {
 // 修改发布内容
 export function updateContentIfon(data) {
   return request({
-    url: '/cp/contentIfon',
+    url: '/cp/contentInfo',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateContentIfon(data) {
 // 删除发布内容
 export function delContentIfon(id) {
   return request({
-    url: '/cp/contentIfon/' + id,
+    url: '/cp/contentInfo/' + id,
     method: 'delete'
   })
 }

+ 1 - 1
ruoyi-ui/src/views/cp/fileInfo/index.vue

@@ -114,7 +114,7 @@
           <file-upload v-model="form.uri"
                        :limit="1"
                        :file-size="50"
-                       :file-type='[ "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt","pdf"]'
+                       :file-type='[ "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt","pdf", "mp4"]'
                        @input="fileInputCall" />
         </el-form-item>
         <el-form-item label="文件名称" prop="fileName">