1、前后端接口权限重新分配

ruoyi-ui/src/layout/components/Navbar.vue

@@ -9,8 +9,8 @@
 
     <div class="right-menu">
 
-      <el-badge :value="warnData.count" class=" hover-effect share-button">
+      <el-badge :value="warnData.count" class=" hover-effect share-button" v-hasPermi="['warning:warning:handle']">
-        <el-popover
+        <el-popover v-hasPermi="['warning:warning:handle']"
           placement="bottom"
           width="220"
           v-model="visible">
@@ -27,7 +27,6 @@
 
       </el-badge>
 
-
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item"/>
 
@@ -39,7 +38,6 @@
 
       </template>
 
-
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
@@ -138,7 +136,9 @@ export default {
           if (json.id !== undefined) {
             handleWarning(json.id).then(res => {
               this.$modal.msgSuccess("处理成功");
-              this.warnData.data= "{}"
+              this.warnData.data = "{}"
+              this.visible = false
+              this.warnData.count = this.warnData.count - 1
             });
           }
         }

ruoyi-ui/src/views/business/openapi/copywriting/index.vue

@@ -56,7 +56,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['openapi:copywriting:delete']"
+          v-hasPermi="['openapi:copywriting:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -77,7 +77,7 @@
           icon="el-icon-delete"
           size="mini"
           @click="delRepeatCopyWriting"
-          v-hasPermi="['openapi:copywriting:delete']"
+          v-hasPermi="['openapi:copywriting:remove']"
         >删除重复文案</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -109,7 +109,7 @@
             type="danger"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['openapi:copywriting:delete']"
+            v-hasPermi="['openapi:copywriting:remove']"
           ></el-button>
           </el-tooltip>
         </template>

xjs-business/xjs-business-english/src/main/java/com/xjs/word/controller/EnglishWordController.java

@@ -12,6 +12,8 @@ import com.xjs.validation.UpdateGroup;
 import com.xjs.web.MyBaseController;
 import com.xjs.word.domain.EnglishWord;
 import com.xjs.word.service.IEnglishWordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/word")
+@Api(tags = "业务模块-英语管理")
 public class EnglishWordController extends MyBaseController {
     @Autowired
     private IEnglishWordService englishWordService;
@@ -38,6 +41,8 @@ public class EnglishWordController extends MyBaseController {
      */
     @RequiresPermissions("english:word:collect")
     @GetMapping("collect")
+    @Log(title = "查看单词夹")
+    @ApiOperation("英语单词收藏夹")
     public AjaxResult collect() {
         IPage<EnglishWord> englishWordList=englishWordService.getEnglishWordByCollect(startPageMP());
         return AjaxResult.success(englishWordList);
@@ -47,8 +52,8 @@ public class EnglishWordController extends MyBaseController {
     /**
      * 获取英语单词详细信息RPC
      */
-    @RequiresPermissions("english:word:query")
     @GetMapping(value = "/rpc/{id}")
+    @ApiOperation("获取英语单词详细信息RPC")
     public AjaxResult getInfoRPC(@PathVariable("id") Long id) {
         return AjaxResult.success(englishWordService.selectEnglishWordToRPC(id));
     }
@@ -58,6 +63,7 @@ public class EnglishWordController extends MyBaseController {
      */
     @RequiresPermissions("english:word:query")
     @GetMapping(value = "/{id}")
+    @ApiOperation("获取英语单词详细信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(englishWordService.selectById(id));
     }
@@ -70,6 +76,7 @@ public class EnglishWordController extends MyBaseController {
      */
     @RequiresPermissions("english:word:list")
     @GetMapping("/list")
+    @ApiOperation("查询英语单词列表")
     public TableDataInfo list(EnglishWord englishWord) {
         startPage();
         List<EnglishWord> list = englishWordService.selectEnglishWordList(englishWord);
@@ -80,6 +87,7 @@ public class EnglishWordController extends MyBaseController {
      * 导出英语单词列表
      */
     @RequiresPermissions("english:word:export")
+    @ApiOperation("导出英语单词列表")
     @Log(title = "英语单词", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, EnglishWord englishWord) {
@@ -94,6 +102,7 @@ public class EnglishWordController extends MyBaseController {
      * 新增英语单词
      */
     @RequiresPermissions("english:word:add")
+    @ApiOperation("新增英语单词")
     @Log(title = "英语单词", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated({AddGroup.class}) @RequestBody EnglishWord englishWord) {
@@ -104,6 +113,7 @@ public class EnglishWordController extends MyBaseController {
      * 修改英语单词
      */
     @RequiresPermissions("english:word:edit")
+    @ApiOperation("修改英语单词")
     @Log(title = "英语单词", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated({UpdateGroup.class}) @RequestBody EnglishWord englishWord) {
@@ -114,6 +124,7 @@ public class EnglishWordController extends MyBaseController {
      * 删除英语单词
      */
     @RequiresPermissions("english:word:remove")
+    @ApiOperation("删除英语单词")
     @Log(title = "英语单词", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {

xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/controller/ApiLogController.java

@@ -10,7 +10,6 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.apilog.domain.ApiLog;
 import com.xjs.apilog.service.IApiLogService;
-import com.xjs.business.api.domain.CopyWriting;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

xjs-business/xjs-business-monitor/src/main/java/com/xjs/redismonitor/RedisCacheController.java

@@ -1,7 +1,9 @@
 package com.xjs.redismonitor;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisCallback;
@@ -18,12 +20,14 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("redismonitor")
+@Api(tags = "业务模块-Redis监控")
 public class RedisCacheController {
     @Autowired
     private RedisTemplate<String, String> redisTemplate;
 
     @GetMapping()
-    @RequiresLogin
+    @RequiresPermissions("monitor:redis:list")
+    @ApiOperation("获取Redis监控信息")
     public AjaxResult getInfo() {
         Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
         Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));

xjs-business/xjs-business-monitor/src/main/java/com/xjs/servicemonitor/controller/ServiceMonitorController.java

@@ -1,10 +1,12 @@
 package com.xjs.servicemonitor.controller;
 
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.servicemonitor.domain.ServiceMonitorInfo;
 import com.xjs.servicemonitor.service.JvmMonitorService;
 import com.xjs.servicemonitor.service.SystemOSService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
  */
 @RestController
 @RequestMapping("servicemonitor")
+@Api(tags = "业务模块-服务监控")
 public class ServiceMonitorController {
     @Autowired
     private JvmMonitorService jvmMonitorService;
@@ -27,7 +30,8 @@ public class ServiceMonitorController {
     private SystemOSService systemOSService;
 
     @GetMapping
-    @RequiresLogin
+    @RequiresPermissions("monitor:service:list")
+    @ApiOperation("获取服务监控信息")
     public AjaxResult getServiceMonitor(HttpServletRequest request) {
         ServiceMonitorInfo serviceMonitorInfo = new ServiceMonitorInfo();
         //获取客户端信息

xjs-business/xjs-business-openapi/src/main/java/com/xjs/copywriting/controller/CopyWritingController.java

@@ -71,7 +71,7 @@ public class CopyWritingController extends BaseController {
 
     @DeleteMapping("Repeat")
     @ApiOperation("删除重复文案内容")
-    @RequiresPermissions("openapi:copywriting:delete")
+    @RequiresPermissions("openapi:copywriting:remove")
     @Log(title = "删除重复文案", businessType = BusinessType.DELETE)
     public AjaxResult deleteRepeatData() {
         int count = copyWritingService.deleteRepeatData();

xjs-business/xjs-business-openapi/src/main/java/com/xjs/oneenglish/controller/ApiEnglishController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresLogin;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.oneenglish.domain.ApiEnglish;
 import com.xjs.oneenglish.domain.RequestBody;
@@ -34,9 +35,10 @@ public class ApiEnglishController extends BaseController {
     @Autowired
     private OneEnglishFactory tianXingOneEnglishFactory;
 
-    @RequiresPermissions("openapi:oneenglish:list")
+    @RequiresLogin
     @GetMapping("/getOneEnglish")
     @ApiOperation("英语一言接口")
+    @Log(title = "获取英语一言")
     public AjaxResult getOneEnglish() {
         ApiEnglish oneEnglish = tianXingOneEnglishFactory.getOneEnglish(new RequestBody());
         return AjaxResult.success(oneEnglish);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/topsearch/controller/ApiTopSearchController.java

@@ -3,13 +3,12 @@ package com.xjs.topsearch.controller;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.topsearch.domain.*;
 import com.xjs.topsearch.factory.TopserachFactory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +50,7 @@ public class ApiTopSearchController {
     @GetMapping("getTopsearch")
     @ApiOperation("热搜榜接口")
     @Log(title = "获取热搜榜")
-    @RequiresLogin
+    @RequiresPermissions("openapi:topsearch:list")
     public AjaxResult topSearch() {
         if (redisService.hasKey(HOT)) {
             Map<String, List> cacheObject = redisService.getCacheObject(HOT);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/controller/TranDictController.java

@@ -1,7 +1,6 @@
 package com.xjs.translation.controller;
 
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.RequiresLogin;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
 import com.xjs.translation.factory.TranslationFactory;
@@ -27,7 +26,6 @@ public class TranDictController {
     private TranslationFactory tianXingTranDictFactory;
 
     @GetMapping("tranDictForRPC")
-    @RequiresLogin
     public R<TranslationVo> tranDict(String content) {
         TranslationQo translationQo = new TranslationQo();
         translationQo.setQ(content);

xjs-business/xjs-business-openapi/src/main/java/com/xjs/translation/controller/TranslationController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.RandomUtil;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.security.annotation.RequiresLogin;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.xjs.translation.domain.qo.translation.TranslationQo;
 import com.xjs.translation.domain.vo.translation.TranslationVo;
@@ -41,7 +40,6 @@ public class TranslationController {
     @PostMapping
     @ApiOperation("翻译接口")
     @Log(title = "获取翻译")
-    @RequiresLogin
     @RequiresPermissions("openapi:translation:api")
     public AjaxResult translation(@Validated @RequestBody TranslationQo translationQo) {
         TranslationVo translationVo = new TranslationVo();

xjs-business/xjs-business-warning/src/main/java/com/xjs/controller/ApiWarningController.java

@@ -15,6 +15,8 @@ import com.xjs.domain.ApiRecord;
 import com.xjs.domain.ApiWarning;
 import com.xjs.server.WebSocketServer;
 import com.xjs.service.ApiWarningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -36,6 +38,7 @@ import static com.xjs.consts.RedisConst.WEBSOCKET;
  */
 @RestController
 @RequestMapping("apiwarning")
+@Api(tags = "业务模块-预警管理")
 public class ApiWarningController extends BaseController {
 
     @Autowired
@@ -50,6 +53,7 @@ public class ApiWarningController extends BaseController {
      * @return apiRecord
      */
     @PostMapping
+    @ApiOperation("远程保存预警信息")
     public R<ApiRecord> saveApiRecordForRPC(@RequestBody ApiRecord apiRecord) {
         return apiWarningService.saveApiRecord(apiRecord) ? R.ok() : R.fail();
     }
@@ -61,6 +65,7 @@ public class ApiWarningController extends BaseController {
      * @return ApiRecord
      */
     @PutMapping
+    @ApiOperation("远程修改预警信息")
     public R<ApiRecord> updateApiRecordForRPC(@RequestBody ApiRecord apiRecord) {
         return apiWarningService.updateApiRecordByUrl(apiRecord) ? R.ok() : R.fail();
     }
@@ -72,6 +77,7 @@ public class ApiWarningController extends BaseController {
      * @return R<List < ApiRecord>>
      */
     @GetMapping
+    @ApiOperation("远程查询预警信息")
     public R<List<ApiRecord>> selectApiRecordListForRPC(ApiRecord apiRecord) {
         List<ApiRecord> apiRecords = apiWarningService.selectApiRecordListByUrl(apiRecord);
         return R.ok(apiRecords);
@@ -83,7 +89,9 @@ public class ApiWarningController extends BaseController {
      * @return R
      */
     @PutMapping("handle/{id}")
-    //@RequiresPermissions("warning:apiwarning:list")
+    @RequiresPermissions("warning:warning:handle")
+    @ApiOperation("处理预警单个预警")
+    @Log(title = "处理单个预警")
     public R<Object> handleWarning(@PathVariable("id") Long id) {
         ApiWarning apiWarning = new ApiWarning();
         apiWarning.setId(id);
@@ -99,6 +107,7 @@ public class ApiWarningController extends BaseController {
      */
     @PostMapping("saveApiwarningForRPC")
     @Transactional
+    @ApiOperation("远程保存api预警信息并websocket推送")
     public R<ApiWarning> saveApiWarningForRPC(@RequestBody ApiWarning apiWarning) {
         boolean save = apiWarningService.save(apiWarning);
 
@@ -135,6 +144,7 @@ public class ApiWarningController extends BaseController {
      */
     @RequiresPermissions("warning:warning:list")
     @GetMapping("/apiwarnlist")
+    @ApiOperation("查询api预警列表")
     public TableDataInfo list(ApiWarning apiWarning) {
         startPage();
         List<ApiWarning> list = apiWarningService.list(new QueryWrapper<ApiWarning>()
@@ -149,6 +159,7 @@ public class ApiWarningController extends BaseController {
     @RequiresPermissions("warning:warning:export")
     @Log(title = "api预警", businessType = BusinessType.EXPORT)
     @PostMapping("/apiwarnexport")
+    @ApiOperation("导出api预警列表")
     public void export(HttpServletResponse response, ApiWarning apiWarning) {
         List<ApiWarning> list = apiWarningService.list(new QueryWrapper<ApiWarning>()
                 .like(Objects.nonNull(apiWarning.getApiName()),"api_name", apiWarning.getApiName()));
@@ -165,6 +176,7 @@ public class ApiWarningController extends BaseController {
      */
     @RequiresPermissions("warning:apiwarning:list")
     @GetMapping("/list")
+    @ApiOperation("查询API预警信息列表")
     public TableDataInfo list(ApiRecord apiRecord) {
         startPage();
         List<ApiRecord> list = apiWarningService.selectApiRecordList(apiRecord);
@@ -177,6 +189,7 @@ public class ApiWarningController extends BaseController {
     @RequiresPermissions("warning:apiwarning:export")
     @Log(title = "API预警", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
+    @ApiOperation("导出API预警信息列表")
     public void export(HttpServletResponse response, ApiRecord apiRecord) {
         List<ApiRecord> list = apiWarningService.selectApiRecordList(apiRecord);
         ExcelUtil<ApiRecord> util = new ExcelUtil<ApiRecord>(ApiRecord.class);
@@ -188,6 +201,7 @@ public class ApiWarningController extends BaseController {
      */
     @RequiresPermissions("warning:apiwarning:query")
     @GetMapping(value = "/{id}")
+    @ApiOperation("获取API预警详细信息信息")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(apiWarningService.selectApiRecordById(id));
     }
@@ -198,6 +212,7 @@ public class ApiWarningController extends BaseController {
     @RequiresPermissions("warning:apiwarning:edit")
     @Log(title = "API预警", businessType = BusinessType.UPDATE)
     @PutMapping("edit")
+    @ApiOperation("修改API预警信息")
     public AjaxResult edit(@RequestBody ApiRecord apiRecord) {
         return toAjax(apiWarningService.updateApiRecord(apiRecord));
     }

xjs-business/xjs-business-warning/src/main/java/com/xjs/domain/ApiWarning.java

@@ -45,7 +45,7 @@ public class ApiWarning implements Serializable {
     private String realValue;
 
     /** 是否处理 1 处理 2未处理 */
-    @Excel(name = "是否处理",readConverterExp=" 1=处理,2=未处理")
+    @Excel(name = "是否处理",readConverterExp=" 1=已处理,2=未处理")
     private Integer handle;
 
     @Excel(name = "创建时间", dateFormat = "yyyy-MM-dd HH:mm:ss")