From cd25bd4b8d7e46d4835d28d767f8daa4ef2c624a Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Tue, 23 Mar 2021 16:18:45 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + ruoyi-content/pom.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 ruoyi-content/pom.xml diff --git a/pom.xml b/pom.xml index 78cefbe3f..195228065 100644 --- a/pom.xml +++ b/pom.xml @@ -231,6 +231,7 @@ ruoyi-quartz ruoyi-generator ruoyi-common + ruoyi-content pom diff --git a/ruoyi-content/pom.xml b/ruoyi-content/pom.xml new file mode 100644 index 000000000..a5c6c22e5 --- /dev/null +++ b/ruoyi-content/pom.xml @@ -0,0 +1,28 @@ + + + + ruoyi + com.ruoyi + 4.6.0 + + 4.0.0 + + ruoyi-content + + + 内容中心模块 + + + + + + + com.ruoyi + ruoyi-common + + + + + \ No newline at end of file From ca3924520dc21ba45b6b0eaa36cf428793b22534 Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Tue, 23 Mar 2021 16:28:06 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdvertisementController.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java new file mode 100644 index 000000000..952ba2da3 --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -0,0 +1,16 @@ +package com.ruoyi.content.controller; + +import com.ruoyi.common.core.controller.BaseController; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +/** + * @program: ruoyi->AdvertisementController + * @description: 广告 + * @author: LiuShenlu + * @create: 2021-03-23 16:26 + **/ +@Controller +@RequestMapping("advert") +public class AdvertisementController extends BaseController { +} From c178a662fe26a96f85ef5bb0acbd3560cbec793c Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Tue, 23 Mar 2021 16:29:49 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/content/controller/AdvertisementController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java index 952ba2da3..2459583d3 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -11,6 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping; * @create: 2021-03-23 16:26 **/ @Controller -@RequestMapping("advert") +@RequestMapping("adverts") public class AdvertisementController extends BaseController { } From f3550bd4b88c12170b275c0e02e047f89d3f78f0 Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Tue, 23 Mar 2021 18:19:39 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 + ruoyi-admin/pom.xml | 6 + .../content/domain/CmsArticleAdInfo.java | 235 ++++++++++++++++++ .../mapper/CmsArticleAdInfoMapper.java | 63 +++++ .../service/ICmsArticleAdInfoService.java | 61 +++++ .../impl/CmsArticleAdInfoServiceImpl.java | 97 ++++++++ .../mapper.content/CmsArticleAdInfoMapper.xml | 132 ++++++++++ .../main/resources/templates/adverts/add.html | 115 +++++++++ .../resources/templates/adverts/adverts.html | 212 ++++++++++++++++ .../resources/templates/adverts/edit.html | 116 +++++++++ 10 files changed, 1044 insertions(+) create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsArticleAdInfo.java create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java create mode 100644 ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml create mode 100644 ruoyi-content/src/main/resources/templates/adverts/add.html create mode 100644 ruoyi-content/src/main/resources/templates/adverts/adverts.html create mode 100644 ruoyi-content/src/main/resources/templates/adverts/edit.html diff --git a/pom.xml b/pom.xml index 195228065..6891d9920 100644 --- a/pom.xml +++ b/pom.xml @@ -221,6 +221,13 @@ ${ruoyi.version} + + + com.ruoyi + ruoyi-content + ${ruoyi.version} + + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 58df34fc3..a0f7ea690 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -79,6 +79,12 @@ ruoyi-generator + + + com.ruoyi + ruoyi-content + + diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsArticleAdInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsArticleAdInfo.java new file mode 100644 index 000000000..b34d2a7b2 --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsArticleAdInfo.java @@ -0,0 +1,235 @@ +package com.ruoyi.content.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 文章广告对象 cms_article_ad_info + * + * @author ruoyi + * @date 2021-03-23 + */ +public class CmsArticleAdInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long adId; + + /** 公司id */ + @Excel(name = "公司id") + private String companyId; + + /** 广告类型 */ + @Excel(name = "广告类型") + private String adType; + + /** 广告类型名 */ + @Excel(name = "广告类型名") + private String adTypeName; + + /** 广告跳转地址 */ + @Excel(name = "广告跳转地址") + private String adLinkUrl; + + /** 广告标题 */ + @Excel(name = "广告标题") + private String adTitle; + + /** 广告名称 */ + @Excel(name = "广告名称") + private String adName; + + /** 广告简介 */ + @Excel(name = "广告简介") + private String adSummary; + + /** 广告背景颜色 */ + @Excel(name = "广告背景颜色") + private String adColorType; + + /** 广告图片地址 */ + @Excel(name = "广告图片地址") + private String adImageUrl; + + /** 广告状态 0：展示 1：不可用 */ + @Excel(name = "广告状态 0：展示 1：不可用") + private String adState; + + /** */ + @Excel(name = "") + private String createDate; + + /** 广告创建者 */ + @Excel(name = "广告创建者") + private String createUser; + + /** */ + @Excel(name = "") + private String updateUser; + + /** */ + @Excel(name = "") + private String updateDate; + + public void setAdId(Long adId) + { + this.adId = adId; + } + + public Long getAdId() + { + return adId; + } + public void setCompanyId(String companyId) + { + this.companyId = companyId; + } + + public String getCompanyId() + { + return companyId; + } + public void setAdType(String adType) + { + this.adType = adType; + } + + public String getAdType() + { + return adType; + } + public void setAdTypeName(String adTypeName) + { + this.adTypeName = adTypeName; + } + + public String getAdTypeName() + { + return adTypeName; + } + public void setAdLinkUrl(String adLinkUrl) + { + this.adLinkUrl = adLinkUrl; + } + + public String getAdLinkUrl() + { + return adLinkUrl; + } + public void setAdTitle(String adTitle) + { + this.adTitle = adTitle; + } + + public String getAdTitle() + { + return adTitle; + } + public void setAdName(String adName) + { + this.adName = adName; + } + + public String getAdName() + { + return adName; + } + public void setAdSummary(String adSummary) + { + this.adSummary = adSummary; + } + + public String getAdSummary() + { + return adSummary; + } + public void setAdColorType(String adColorType) + { + this.adColorType = adColorType; + } + + public String getAdColorType() + { + return adColorType; + } + public void setAdImageUrl(String adImageUrl) + { + this.adImageUrl = adImageUrl; + } + + public String getAdImageUrl() + { + return adImageUrl; + } + public void setAdState(String adState) + { + this.adState = adState; + } + + public String getAdState() + { + return adState; + } + public void setCreateDate(String createDate) + { + this.createDate = createDate; + } + + public String getCreateDate() + { + return createDate; + } + public void setCreateUser(String createUser) + { + this.createUser = createUser; + } + + public String getCreateUser() + { + return createUser; + } + public void setUpdateUser(String updateUser) + { + this.updateUser = updateUser; + } + + public String getUpdateUser() + { + return updateUser; + } + public void setUpdateDate(String updateDate) + { + this.updateDate = updateDate; + } + + public String getUpdateDate() + { + return updateDate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("adId", getAdId()) + .append("companyId", getCompanyId()) + .append("adType", getAdType()) + .append("adTypeName", getAdTypeName()) + .append("adLinkUrl", getAdLinkUrl()) + .append("adTitle", getAdTitle()) + .append("adName", getAdName()) + .append("adSummary", getAdSummary()) + .append("adColorType", getAdColorType()) + .append("adImageUrl", getAdImageUrl()) + .append("adState", getAdState()) + .append("createDate", getCreateDate()) + .append("createTime", getCreateTime()) + .append("createUser", getCreateUser()) + .append("updateUser", getUpdateUser()) + .append("updateDate", getUpdateDate()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java new file mode 100644 index 000000000..69c5a61e6 --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.content.mapper; + + +import com.ruoyi.content.domain.CmsArticleAdInfo; + +import java.util.List; + +/** + * 文章广告Mapper接口 + * + * @author ruoyi + * @date 2021-03-23 + */ +public interface CmsArticleAdInfoMapper +{ + /** + * 查询文章广告 + * + * @param adId 文章广告ID + * @return 文章广告 + */ + public CmsArticleAdInfo selectCmsArticleAdInfoById(Long adId); + + /** + * 查询文章广告列表 + * + * @param cmsArticleAdInfo 文章广告 + * @return 文章广告集合 + */ + public List selectCmsArticleAdInfoList(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 新增文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + public int insertCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 修改文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 删除文章广告 + * + * @param adId 文章广告ID + * @return 结果 + */ + public int deleteCmsArticleAdInfoById(Long adId); + + /** + * 批量删除文章广告 + * + * @param adIds 需要删除的数据ID + * @return 结果 + */ + public int deleteCmsArticleAdInfoByIds(String[] adIds); +} diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java new file mode 100644 index 000000000..b241ed85b --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.content.service; + +import java.util.List; +import com.ruoyi.content.domain.CmsArticleAdInfo; + +/** + * 文章广告Service接口 + * + * @author ruoyi + * @date 2021-03-23 + */ +public interface ICmsArticleAdInfoService +{ + /** + * 查询文章广告 + * + * @param adId 文章广告ID + * @return 文章广告 + */ + public CmsArticleAdInfo selectCmsArticleAdInfoById(Long adId); + + /** + * 查询文章广告列表 + * + * @param cmsArticleAdInfo 文章广告 + * @return 文章广告集合 + */ + public List selectCmsArticleAdInfoList(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 新增文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + public int insertCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 修改文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo); + + /** + * 批量删除文章广告 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteCmsArticleAdInfoByIds(String ids); + + /** + * 删除文章广告信息 + * + * @param adId 文章广告ID + * @return 结果 + */ + public int deleteCmsArticleAdInfoById(Long adId); +} diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java new file mode 100644 index 000000000..5f6dc6b36 --- /dev/null +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.content.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.content.mapper.CmsArticleAdInfoMapper; +import com.ruoyi.content.domain.CmsArticleAdInfo; +import com.ruoyi.content.service.ICmsArticleAdInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 文章广告Service业务层处理 + * + * @author ruoyi + * @date 2021-03-23 + */ +@Service +public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService +{ + @Autowired + private CmsArticleAdInfoMapper cmsArticleAdInfoMapper; + + /** + * 查询文章广告 + * + * @param adId 文章广告ID + * @return 文章广告 + */ + @Override + public CmsArticleAdInfo selectCmsArticleAdInfoById(Long adId) + { + return cmsArticleAdInfoMapper.selectCmsArticleAdInfoById(adId); + } + + /** + * 查询文章广告列表 + * + * @param cmsArticleAdInfo 文章广告 + * @return 文章广告 + */ + @Override + public List selectCmsArticleAdInfoList(CmsArticleAdInfo cmsArticleAdInfo) + { + return cmsArticleAdInfoMapper.selectCmsArticleAdInfoList(cmsArticleAdInfo); + } + + /** + * 新增文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + @Override + public int insertCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) + { + cmsArticleAdInfo.setCreateTime(DateUtils.getNowDate()); + return cmsArticleAdInfoMapper.insertCmsArticleAdInfo(cmsArticleAdInfo); + } + + /** + * 修改文章广告 + * + * @param cmsArticleAdInfo 文章广告 + * @return 结果 + */ + @Override + public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) + { + cmsArticleAdInfo.setUpdateTime(DateUtils.getNowDate()); + return cmsArticleAdInfoMapper.updateCmsArticleAdInfo(cmsArticleAdInfo); + } + + /** + * 删除文章广告对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteCmsArticleAdInfoByIds(String ids) + { + return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除文章广告信息 + * + * @param adId 文章广告ID + * @return 结果 + */ + @Override + public int deleteCmsArticleAdInfoById(Long adId) + { + return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoById(adId); + } +} diff --git a/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml new file mode 100644 index 000000000..edc0eac1c --- /dev/null +++ b/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + select AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from cms_article_ad_info + + + + + + + + insert into cms_article_ad_info + + COMPANY_ID, + AD_TYPE, + AD_TYPE_NAME, + AD_LINK_URL, + AD_TITLE, + AD_NAME, + AD_SUMMARY, + AD_COLOR_TYPE, + AD_IMAGE_URL, + AD_STATE, + CREATE_DATE, + CREATE_TIME, + CREATE_USER, + UPDATE_USER, + UPDATE_DATE, + UPDATE_TIME, + + + #{companyId}, + #{adType}, + #{adTypeName}, + #{adLinkUrl}, + #{adTitle}, + #{adName}, + #{adSummary}, + #{adColorType}, + #{adImageUrl}, + #{adState}, + #{createDate}, + #{createTime}, + #{createUser}, + #{updateUser}, + #{updateDate}, + #{updateTime}, + + + + + update cms_article_ad_info + + COMPANY_ID = #{companyId}, + AD_TYPE = #{adType}, + AD_TYPE_NAME = #{adTypeName}, + AD_LINK_URL = #{adLinkUrl}, + AD_TITLE = #{adTitle}, + AD_NAME = #{adName}, + AD_SUMMARY = #{adSummary}, + AD_COLOR_TYPE = #{adColorType}, + AD_IMAGE_URL = #{adImageUrl}, + AD_STATE = #{adState}, + CREATE_DATE = #{createDate}, + CREATE_TIME = #{createTime}, + CREATE_USER = #{createUser}, + UPDATE_USER = #{updateUser}, + UPDATE_DATE = #{updateDate}, + UPDATE_TIME = #{updateTime}, + + where AD_ID = #{adId} + + + + delete from cms_article_ad_info where AD_ID = #{adId} + + + + delete from cms_article_ad_info where AD_ID in + + #{adId} + + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/adverts/add.html b/ruoyi-content/src/main/resources/templates/adverts/add.html new file mode 100644 index 000000000..a2473fd48 --- /dev/null +++ b/ruoyi-content/src/main/resources/templates/adverts/add.html @@ -0,0 +1,115 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/adverts/adverts.html new file mode 100644 index 000000000..4f3767c5a --- /dev/null +++ b/ruoyi-content/src/main/resources/templates/adverts/adverts.html @@ -0,0 +1,212 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/adverts/edit.html b/ruoyi-content/src/main/resources/templates/adverts/edit.html new file mode 100644 index 000000000..ce97d35b3 --- /dev/null +++ b/ruoyi-content/src/main/resources/templates/adverts/edit.html @@ -0,0 +1,116 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file From 7752a981ed431d6bb03947b1fb830953bf11ed5a Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 09:36:41 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/content/controller/AdvertisementController.java | 5 +++++ .../main/resources/templates/{ => content}/adverts/add.html | 0 .../resources/templates/{ => content}/adverts/adverts.html | 0 .../main/resources/templates/{ => content}/adverts/edit.html | 0 4 files changed, 5 insertions(+) rename ruoyi-content/src/main/resources/templates/{ => content}/adverts/add.html (100%) rename ruoyi-content/src/main/resources/templates/{ => content}/adverts/adverts.html (100%) rename ruoyi-content/src/main/resources/templates/{ => content}/adverts/edit.html (100%) diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java index 2459583d3..2429c3b28 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -13,4 +13,9 @@ import org.springframework.web.bind.annotation.RequestMapping; @Controller @RequestMapping("adverts") public class AdvertisementController extends BaseController { + + private String prefix = "adverts"; + + + } diff --git a/ruoyi-content/src/main/resources/templates/adverts/add.html b/ruoyi-content/src/main/resources/templates/content/adverts/add.html similarity index 100% rename from ruoyi-content/src/main/resources/templates/adverts/add.html rename to ruoyi-content/src/main/resources/templates/content/adverts/add.html diff --git a/ruoyi-content/src/main/resources/templates/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html similarity index 100% rename from ruoyi-content/src/main/resources/templates/adverts/adverts.html rename to ruoyi-content/src/main/resources/templates/content/adverts/adverts.html diff --git a/ruoyi-content/src/main/resources/templates/adverts/edit.html b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html similarity index 100% rename from ruoyi-content/src/main/resources/templates/adverts/edit.html rename to ruoyi-content/src/main/resources/templates/content/adverts/edit.html From b9437e3e8c07cd403fd04d3344107f42d7bb14fb Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 10:09:27 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdvertisementController.java | 108 ++++++++++++-- .../mapper/CmsArticleAdInfoMapper.java | 19 +-- .../impl/CmsArticleAdInfoServiceImpl.java | 37 +++-- .../mapper.content/CmsArticleAdInfoMapper.xml | 132 ------------------ .../templates/content/adverts/adverts.html | 10 +- 5 files changed, 130 insertions(+), 176 deletions(-) delete mode 100644 ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java index 2429c3b28..be716afd1 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -1,21 +1,113 @@ package com.ruoyi.content.controller; -import com.ruoyi.common.core.controller.BaseController; +import java.util.List; + +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +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.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.content.domain.CmsArticleAdInfo; +import com.ruoyi.content.service.ICmsArticleAdInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; /** - * @program: ruoyi->AdvertisementController - * @description: 广告 - * @author: LiuShenlu - * @create: 2021-03-23 16:26 - **/ + * 文章广告Controller + * + * @author ruoyi + * @date 2021-03-23 + */ @Controller -@RequestMapping("adverts") +@RequestMapping("/content/adverts") public class AdvertisementController extends BaseController { - private String prefix = "adverts"; + private String prefix = "content/adverts"; + @Autowired + private ICmsArticleAdInfoService cmsArticleAdInfoService; + @RequiresPermissions("content:adverts:view") + @GetMapping() + public String adverts() { + return prefix + "/adverts"; + } + /** + * 查询文章广告列表 + */ + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(CmsArticleAdInfo cmsArticleAdInfo) { + startPage(); + List list = cmsArticleAdInfoService.selectCmsArticleAdInfoList(cmsArticleAdInfo); + return getDataTable(list); + } + + /** + * 导出文章广告列表 + */ + @Log(title = "文章广告", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(CmsArticleAdInfo cmsArticleAdInfo) { + List list = cmsArticleAdInfoService.selectCmsArticleAdInfoList(cmsArticleAdInfo); + ExcelUtil util = new ExcelUtil(CmsArticleAdInfo.class); + return util.exportExcel(list, "adverts"); + } + + /** + * 新增文章广告 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存文章广告 + */ + @Log(title = "文章广告", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(CmsArticleAdInfo cmsArticleAdInfo) { + return toAjax(cmsArticleAdInfoService.insertCmsArticleAdInfo(cmsArticleAdInfo)); + } + + /** + * 修改文章广告 + */ + public String edit(@PathVariable("adId") Long adId, ModelMap mmap) { + CmsArticleAdInfo cmsArticleAdInfo = cmsArticleAdInfoService.selectCmsArticleAdInfoById(adId); + mmap.put("cmsArticleAdInfo", cmsArticleAdInfo); + return prefix + "/edit"; + } + + /** + * 修改保存文章广告 + */ + @Log(title = "文章广告", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(CmsArticleAdInfo cmsArticleAdInfo) { + return toAjax(cmsArticleAdInfoService.updateCmsArticleAdInfo(cmsArticleAdInfo)); + } + + /** + * 删除文章广告 + */ + @Log(title = "文章广告", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(cmsArticleAdInfoService.deleteCmsArticleAdInfoByIds(ids)); + } } diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java index 69c5a61e6..f3af767b5 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java @@ -2,20 +2,21 @@ package com.ruoyi.content.mapper; import com.ruoyi.content.domain.CmsArticleAdInfo; +import org.springframework.stereotype.Repository; import java.util.List; /** * 文章广告Mapper接口 - * + * * @author ruoyi * @date 2021-03-23 */ -public interface CmsArticleAdInfoMapper -{ +@Repository +public interface CmsArticleAdInfoMapper { /** * 查询文章广告 - * + * * @param adId 文章广告ID * @return 文章广告 */ @@ -23,7 +24,7 @@ public interface CmsArticleAdInfoMapper /** * 查询文章广告列表 - * + * * @param cmsArticleAdInfo 文章广告 * @return 文章广告集合 */ @@ -31,7 +32,7 @@ public interface CmsArticleAdInfoMapper /** * 新增文章广告 - * + * * @param cmsArticleAdInfo 文章广告 * @return 结果 */ @@ -39,7 +40,7 @@ public interface CmsArticleAdInfoMapper /** * 修改文章广告 - * + * * @param cmsArticleAdInfo 文章广告 * @return 结果 */ @@ -47,7 +48,7 @@ public interface CmsArticleAdInfoMapper /** * 删除文章广告 - * + * * @param adId 文章广告ID * @return 结果 */ @@ -55,7 +56,7 @@ public interface CmsArticleAdInfoMapper /** * 批量删除文章广告 - * + * * @param adIds 需要删除的数据ID * @return 结果 */ diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java index 5f6dc6b36..0a034be41 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.content.service.impl; import java.util.List; + import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,87 +12,81 @@ import com.ruoyi.common.core.text.Convert; /** * 文章广告Service业务层处理 - * + * * @author ruoyi * @date 2021-03-23 */ @Service -public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService -{ +public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService { + @Autowired private CmsArticleAdInfoMapper cmsArticleAdInfoMapper; /** * 查询文章广告 - * + * * @param adId 文章广告ID * @return 文章广告 */ @Override - public CmsArticleAdInfo selectCmsArticleAdInfoById(Long adId) - { + public CmsArticleAdInfo selectCmsArticleAdInfoById(Long adId) { return cmsArticleAdInfoMapper.selectCmsArticleAdInfoById(adId); } /** * 查询文章广告列表 - * + * * @param cmsArticleAdInfo 文章广告 * @return 文章广告 */ @Override - public List selectCmsArticleAdInfoList(CmsArticleAdInfo cmsArticleAdInfo) - { + public List selectCmsArticleAdInfoList(CmsArticleAdInfo cmsArticleAdInfo) { return cmsArticleAdInfoMapper.selectCmsArticleAdInfoList(cmsArticleAdInfo); } /** * 新增文章广告 - * + * * @param cmsArticleAdInfo 文章广告 * @return 结果 */ @Override - public int insertCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) - { + public int insertCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) { cmsArticleAdInfo.setCreateTime(DateUtils.getNowDate()); return cmsArticleAdInfoMapper.insertCmsArticleAdInfo(cmsArticleAdInfo); } /** * 修改文章广告 - * + * * @param cmsArticleAdInfo 文章广告 * @return 结果 */ @Override - public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) - { + public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) { cmsArticleAdInfo.setUpdateTime(DateUtils.getNowDate()); return cmsArticleAdInfoMapper.updateCmsArticleAdInfo(cmsArticleAdInfo); } /** * 删除文章广告对象 - * + * * @param ids 需要删除的数据ID * @return 结果 */ @Override - public int deleteCmsArticleAdInfoByIds(String ids) - { + public int deleteCmsArticleAdInfoByIds(String ids) { return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoByIds(Convert.toStrArray(ids)); } /** * 删除文章广告信息 - * + * * @param adId 文章广告ID * @return 结果 */ @Override - public int deleteCmsArticleAdInfoById(Long adId) - { + public int deleteCmsArticleAdInfoById(Long adId) { return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoById(adId); } } diff --git a/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml deleted file mode 100644 index edc0eac1c..000000000 --- a/ruoyi-content/src/main/resources/mapper.content/CmsArticleAdInfoMapper.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - select AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from cms_article_ad_info - - - - - - - - insert into cms_article_ad_info - - COMPANY_ID, - AD_TYPE, - AD_TYPE_NAME, - AD_LINK_URL, - AD_TITLE, - AD_NAME, - AD_SUMMARY, - AD_COLOR_TYPE, - AD_IMAGE_URL, - AD_STATE, - CREATE_DATE, - CREATE_TIME, - CREATE_USER, - UPDATE_USER, - UPDATE_DATE, - UPDATE_TIME, - - - #{companyId}, - #{adType}, - #{adTypeName}, - #{adLinkUrl}, - #{adTitle}, - #{adName}, - #{adSummary}, - #{adColorType}, - #{adImageUrl}, - #{adState}, - #{createDate}, - #{createTime}, - #{createUser}, - #{updateUser}, - #{updateDate}, - #{updateTime}, - - - - - update cms_article_ad_info - - COMPANY_ID = #{companyId}, - AD_TYPE = #{adType}, - AD_TYPE_NAME = #{adTypeName}, - AD_LINK_URL = #{adLinkUrl}, - AD_TITLE = #{adTitle}, - AD_NAME = #{adName}, - AD_SUMMARY = #{adSummary}, - AD_COLOR_TYPE = #{adColorType}, - AD_IMAGE_URL = #{adImageUrl}, - AD_STATE = #{adState}, - CREATE_DATE = #{createDate}, - CREATE_TIME = #{createTime}, - CREATE_USER = #{createUser}, - UPDATE_USER = #{updateUser}, - UPDATE_DATE = #{updateDate}, - UPDATE_TIME = #{updateTime}, - - where AD_ID = #{adId} - - - - delete from cms_article_ad_info where AD_ID = #{adId} - - - - delete from cms_article_ad_info where AD_ID in - - #{adId} - - - - \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html index 4f3767c5a..0a425bfe2 100644 --- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html +++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html @@ -90,16 +90,16 @@ @@ -110,8 +110,6 @@ + + \ No newline at end of file diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html index 0a425bfe2..1c702ea07 100644 --- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html +++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html @@ -3,6 +3,20 @@ +
@@ -10,76 +24,10 @@
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
  •  搜索  重置 @@ -93,15 +41,9 @@ 添加 - - 修改 - 删除 - - 导出 -
@@ -128,22 +70,6 @@ title: '', visible: false }, - { - field: 'companyId', - title: '公司id' - }, - { - field: 'adType', - title: '广告类型' - }, - { - field: 'adTypeName', - title: '广告类型名' - }, - { - field: 'adLinkUrl', - title: '广告跳转地址' - }, { field: 'adTitle', title: '广告标题' @@ -152,53 +78,60 @@ field: 'adName', title: '广告名称' }, + { + field: 'adTypeName', + title: '广告类型名' + }, + { + field: 'adLinkUrl', + title: '跳转地址', + formatter: function(value, row, index) { + var actions = []; + actions.push('展示 '); + return actions.join(''); + } + }, { field: 'adSummary', - title: '广告简介' + title: '简介', + width: '20', + widthUnit: '%' }, { field: 'adColorType', - title: '广告背景颜色' + title: '背景颜色', + formatter: function(value, row, index) { + var actions = []; + if (row.adColorType === '1') { + actions.push('
'); + } + if (row.adColorType === '2') { + actions.push('
'); + } + if (row.adColorType === '3') { + actions.push('
'); + } + return actions.join(''); + } }, { field: 'adImageUrl', - title: '广告图片地址' - }, - { - field: 'adState', - title: '广告状态 0：展示 1：不可用' - }, - { - field: 'createDate', - title: '' - }, - { - field: 'createTime', - title: '' - }, - { - field: 'createUser', - title: '广告创建者' - }, - { - field: 'updateUser', - title: '' - }, - { - field: 'updateDate', - title: '' - }, - { - field: 'updateTime', - title: '' + title: '广告图片', + width: '10', + widthUnit: 'px', + formatter: function(value, row, index) { + var actions = []; + actions.push(' '); + return actions.join(''); + } }, { title: '操作', align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('删除'); + actions.push('编辑 '); + actions.push('删除'); return actions.join(''); } }] From 85abaf69569aaf566be0dd0515d73d28b1d53fba Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 16:37:11 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0oss=20redis=20jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index fbbcb6371..9b8f27aa5 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -101,11 +101,18 @@ javax.servlet-api + com.aliyun.oss aliyun-sdk-oss + + + org.springframework.boot + spring-boot-starter-data-redis + + \ No newline at end of file From 1ffa14d01af5da033eaa605df6f9842cb04362b0 Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 16:37:47 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B9=BF=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AdvertisementController.java | 3 +- .../templates/content/adverts/add.html | 56 +++++++++++++------ 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java index 05b0d61e8..5e514be86 100644 --- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java +++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java @@ -72,7 +72,7 @@ public class AdvertisementController extends BaseController { * 新增保存文章广告 */ @Log(title = "文章广告", businessType = BusinessType.INSERT) - @PostMapping("/add") + @RequestMapping("/add") @ResponseBody public AjaxResult addSave(@RequestParam("addImg") MultipartFile[] files, CmsArticleAdInfo cmsArticleAdInfo) { MultipartFile file = files[0]; @@ -82,6 +82,7 @@ public class AdvertisementController extends BaseController { /** * 修改文章广告 */ + @RequestMapping("/edit/{adId}") public String edit(@PathVariable("adId") Long adId, ModelMap mmap) { CmsArticleAdInfo cmsArticleAdInfo = cmsArticleAdInfoService.selectCmsArticleAdInfoById(adId); mmap.put("cmsArticleAdInfo", cmsArticleAdInfo); diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/add.html b/ruoyi-content/src/main/resources/templates/content/adverts/add.html index 3f2a9b9ae..eb6cb0e26 100644 --- a/ruoyi-content/src/main/resources/templates/content/adverts/add.html +++ b/ruoyi-content/src/main/resources/templates/content/adverts/add.html @@ -1,5 +1,6 @@ + @@ -19,17 +20,17 @@
- +
- +
- +
@@ -49,23 +50,23 @@
- +
- +
- + - + - +
@@ -78,26 +79,20 @@
- +
+ - \ No newline at end of file From 3ed20009d7c389e132503ca0f61486bf0c006d73 Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 16:46:01 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0redis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d343a8e02..36a97d340 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -54,4 +54,17 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true + # redis配置 + redis: + database: 5 + host: db.sinosoftec.com + port: 6379 + password: sinosoft@ec~123 + timeout: 6000ms # 连接超时时长（毫秒） + lettuce: + pool: + max-active: 1000 # 连接池最大连接数（使用负值表示没有限制） + max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 5 # 连接池中的最小空闲连接 \ No newline at end of file From bdd597895ebfe87fa882d0739cdae9f66600ff6e Mon Sep 17 00:00:00 2001 From: zkr_liushenlu Date: Wed, 24 Mar 2021 16:56:26 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0commons-pool2.jar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++++++++ ruoyi-common/pom.xml | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index a3b761809..1f63ada78 100644 --- a/pom.xml +++ b/pom.xml @@ -29,6 +29,7 @@ 5.7.0 2.5 1.3.3 + 2.6.2 4.1.2 1.7 @@ -146,6 +147,13 @@ + + org.apache.commons + commons-pool2 + ${commons.pool.version} + + + commons-io commons-io diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 9b8f27aa5..97db55059 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -59,6 +59,12 @@ commons-lang3 + + + org.apache.commons + commons-pool2 + + com.fasterxml.jackson.core From d06cb2007a0b41383ba152886aa71202b8c17e9b Mon Sep 17 00:00:00 2001 From: wanghuayue Date: Wed, 31 Mar 2021 16:02:21 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E4=BA=92=E8=81=94=E7=BD=91=E8=90=A5?= =?UTF-8?q?=E9=94=80=E5=B9=B3=E5=8F=B0title=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 365bbba2d..832b70f5b 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -4,7 +4,7 @@ - 互联网营销平台首页 + 互联网营销平台