Merge branch 'rename' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/controller/SeoKeywordsController.java

@@ -131,7 +131,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      */
     @AutoLog(value = "关键词-添加")
     @Operation(summary = "关键词-添加")
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:add')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:add')")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SeoKeywords seoKeywords) {
         //        AdwebSite siteByCode = adwebSiteService.getSiteByCode(seoKeywords.getSiteCode());
@@ -156,7 +156,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      */
     @AutoLog(value = "关键词-编辑")
     @Operation(summary = "关键词-编辑")
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:edit')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:edit')")
     @RequestMapping(
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
@@ -173,7 +173,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      */
     @AutoLog(value = "关键词-通过id删除")
     @Operation(summary = "关键词-通过id删除")
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:delete')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         seoKeywordsService.removeById(id);
@@ -188,7 +188,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      */
     @AutoLog(value = "关键词-批量删除")
     @Operation(summary = "关键词-批量删除")
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:deleteBatch')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.seoKeywordsService.removeByIds(Arrays.asList(ids.split(",")));
@@ -217,7 +217,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      *
      * @param request
      */
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:exportXls')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:exportXls')")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SeoKeywords seoKeywords) {
         return super.exportXls(request, seoKeywords, SeoKeywords.class, "关键词");
@@ -386,7 +386,7 @@ public class SeoKeywordsController extends JeecgController<SeoKeywords, ISeoKeyw
      * @param request
      * @return
      */
-    @PreAuthorize("@jps.requiresPermissions('keywords:seo_keywords:importExcel')")
+    @PreAuthorize("@jps.requiresPermissions('seo:seo_keywords:importExcel')")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request) {
         String siteCode = request.getParameter("siteCode");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/controller/SubscribePlanController.java

@@ -78,7 +78,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      */
     @AutoLog(value = "网站营销方案套餐表-添加")
     @Operation(summary = "网站营销方案套餐表-添加")
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:add')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:add')")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody SubscribePlan subscribePlan) {
 
@@ -109,7 +109,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      */
     @AutoLog(value = "网站营销方案套餐表-编辑")
     @Operation(summary = "网站营销方案套餐表-编辑")
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:edit')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:edit')")
     @RequestMapping(
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
@@ -126,7 +126,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      */
     @AutoLog(value = "网站营销方案套餐表-通过id删除")
     @Operation(summary = "网站营销方案套餐表-通过id删除")
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:delete')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         subscribePlanService.removeById(id);
@@ -141,7 +141,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      */
     @AutoLog(value = "网站营销方案套餐表-批量删除")
     @Operation(summary = "网站营销方案套餐表-批量删除")
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:deleteBatch')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.subscribePlanService.removeByIds(Arrays.asList(ids.split(",")));
@@ -171,7 +171,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      * @param request
      * @param subscribePlan
      */
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:exportXls')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:exportXls')")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, SubscribePlan subscribePlan) {
         return super.exportXls(request, subscribePlan, SubscribePlan.class, "网站营销方案套餐表");
@@ -184,7 +184,7 @@ public class SubscribePlanController extends JeecgController<SubscribePlan, ISub
      * @param response
      * @return
      */
-    @PreAuthorize("@jps.requiresPermissions('adweb:seo_market_plan:importExcel')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:subscribe_plan:importExcel')")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, SubscribePlan.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/controller/UserPlanSubscriptionController.java

@@ -33,7 +33,7 @@ import java.util.Arrays;
  */
 @Tag(name = "AdWeb套餐订购")
 @RestController
-@RequestMapping("/serp/seoPlanSubscription")
+@RequestMapping("/adweb/userPlanSubscription")
 @Slf4j
 public class UserPlanSubscriptionController
         extends JeecgController<UserPlanSubscription, IUserPlanSubscriptionService> {
@@ -71,7 +71,7 @@ public class UserPlanSubscriptionController
      */
     @AutoLog(value = "AdWeb套餐订购-添加")
     @Operation(summary = "AdWeb套餐订购-添加")
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:add')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:add')")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody UserPlanSubscription userPlanSubscription) {
         userPlanSubscriptionService.save(userPlanSubscription);
@@ -86,7 +86,7 @@ public class UserPlanSubscriptionController
      */
     @AutoLog(value = "AdWeb套餐订购-编辑")
     @Operation(summary = "AdWeb套餐订购-编辑")
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:edit')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:edit')")
     @RequestMapping(
             value = "/edit",
             method = {RequestMethod.PUT, RequestMethod.POST})
@@ -103,7 +103,7 @@ public class UserPlanSubscriptionController
      */
     @AutoLog(value = "AdWeb套餐订购-通过id删除")
     @Operation(summary = "AdWeb套餐订购-通过id删除")
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:delete')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:delete')")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         userPlanSubscriptionService.removeById(id);
@@ -118,7 +118,7 @@ public class UserPlanSubscriptionController
      */
     @AutoLog(value = "AdWeb套餐订购-批量删除")
     @Operation(summary = "AdWeb套餐订购-批量删除")
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:deleteBatch')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:deleteBatch')")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.userPlanSubscriptionService.removeByIds(Arrays.asList(ids.split(",")));
@@ -149,7 +149,7 @@ public class UserPlanSubscriptionController
      * @param request
      * @param userPlanSubscription
      */
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:exportXls')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:exportXls')")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(
             HttpServletRequest request, UserPlanSubscription userPlanSubscription) {
@@ -164,7 +164,7 @@ public class UserPlanSubscriptionController
      * @param response
      * @return
      */
-    @PreAuthorize("@jps.requiresPermissions('serp:seo_plan_subscription:importExcel')")
+    @PreAuthorize("@jps.requiresPermissions('adweb:user_plan_subscription:importExcel')")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, UserPlanSubscription.class);