wfansh 1 개월 전
부모
커밋
6b82c18939

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/ISeoPlanSubscriptionService.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
 
 /**
  * @Description: seo套餐订购

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoKeywordsRankServiceImpl.java

@@ -31,8 +31,8 @@ import org.jeecg.modules.adweb.seo.vo.SeoRankInfoVO;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
 import org.jeecg.modules.adweb.site.service.IAdwebSiteService;
 import org.jeecg.modules.adweb.site.service.ISiteUserPermissionService;
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
-import org.jeecg.modules.adweb.subscribePlan.mapper.SubscribePlanMapper;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.mapper.SubscribePlanMapper;
 import org.jeecg.modules.adweb.system.service.SysAdwebApi;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/seo/service/impl/SeoPlanSubscriptionServiceImpl.java

@@ -14,8 +14,8 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
 import org.jeecg.modules.adweb.seo.mapper.SeoPlanSubscriptionMapper;
 import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
-import org.jeecg.modules.adweb.subscribePlan.service.ISubscribePlanService;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/site/service/SelfWebSiteServiceCommon.java

@@ -13,8 +13,8 @@ import org.jeecg.modules.adweb.enquiry.constant.EnquiryDistributeTypeConstant;
 import org.jeecg.modules.adweb.seo.entity.SeoPlanSubscription;
 import org.jeecg.modules.adweb.seo.service.ISeoPlanSubscriptionService;
 import org.jeecg.modules.adweb.site.entity.AdwebSite;
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
-import org.jeecg.modules.adweb.subscribePlan.service.ISubscribePlanService;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
 import org.jeecg.modules.adweb.theme.entity.AdwebTheme;
 import org.jeecg.modules.adweb.theme.service.IAdwebThemeService;
 import org.jeecg.modules.system.service.ISysUserTenantService;

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

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.subscribePlan.controller;
+package org.jeecg.modules.adweb.subscription.controller;
 
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -14,8 +14,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
-import org.jeecg.modules.adweb.subscribePlan.service.ISubscribePlanService;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/entity/SubscribePlan.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/entity/SubscribePlan.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.adweb.subscribePlan.entity;
+package org.jeecg.modules.adweb.subscription.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/mapper/SubscribePlanMapper.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/SubscribePlanMapper.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.adweb.subscribePlan.mapper;
+package org.jeecg.modules.adweb.subscription.mapper;
 
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/mapper/xml/SubscribePlanMapper.xml → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/mapper/xml/SubscribePlanMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.adweb.subscribePlan.mapper.SubscribePlanMapper">
+<mapper namespace="org.jeecg.modules.adweb.subscription.mapper.SubscribePlanMapper">
 
     <select id="getSubscribePlanBySiteId"
-            resultType="org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan">
+            resultType="org.jeecg.modules.adweb.subscription.entity.SubscribePlan">
         SELECT
         t1.id, t1.plan_name, target, specify_keyword, long_tail_keyword, external_links, article
         from

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/service/ISubscribePlanService.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/service/ISubscribePlanService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.adweb.subscribePlan.service;
+package org.jeecg.modules.adweb.subscription.service;
 
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

+ 4 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscribePlan/service/impl/SubscribePlanServiceImpl.java → jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/subscription/service/impl/SubscribePlanServiceImpl.java

@@ -1,10 +1,10 @@
-package org.jeecg.modules.adweb.subscribePlan.service.impl;
+package org.jeecg.modules.adweb.subscription.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
-import org.jeecg.modules.adweb.subscribePlan.entity.SubscribePlan;
-import org.jeecg.modules.adweb.subscribePlan.mapper.SubscribePlanMapper;
-import org.jeecg.modules.adweb.subscribePlan.service.ISubscribePlanService;
+import org.jeecg.modules.adweb.subscription.entity.SubscribePlan;
+import org.jeecg.modules.adweb.subscription.mapper.SubscribePlanMapper;
+import org.jeecg.modules.adweb.subscription.service.ISubscribePlanService;
 import org.springframework.stereotype.Service;
 
 /**