diff --git a/CatmDogd-Mall-Front-test/src/api/marketing/AppletOrderBanner.js b/CatmDogd-Mall-Front-test/src/api/marketing/AppletOrderBanner.js new file mode 100644 index 0000000..01c11fa --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/api/marketing/AppletOrderBanner.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询轮播图列表 +export function listAppletBanner(query) { + return request({ + url: '/model/order/banner/list', + method: 'get', + params: query + }) +} + +// 查询轮播图详细 +export function getAppletBanner(id) { + return request({ + url: '/model/order/banner/' + id, + method: 'get' + }) +} + +// 新增轮播图 +export function addAppletBanner(data) { + return request({ + url: '/model/order/banner', + method: 'post', + data: data + }) +} + +// 修改轮播图 +export function updateAppletBanner(data) { + return request({ + url: '/model/order/banner', + method: 'put', + data: data + }) +} + +// 删除轮播图 +export function delAppletBanner(id) { + return request({ + url: '/model/order/banner/' + id, + method: 'delete' + }) +} diff --git a/CatmDogd-Mall-Front-test/src/views/marketing/AppletOrderBanner/index.vue b/CatmDogd-Mall-Front-test/src/views/marketing/AppletOrderBanner/index.vue new file mode 100644 index 0000000..1cb659c --- /dev/null +++ b/CatmDogd-Mall-Front-test/src/views/marketing/AppletOrderBanner/index.vue @@ -0,0 +1,291 @@ + + + diff --git a/ruoyi-admin/src/main/resources/application-druid-root-prod.yml b/ruoyi-admin/src/main/resources/application-druid-root-prod.yml index 4833c78..7ab02d6 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root-prod.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root-prod.yml @@ -45,12 +45,12 @@ scheduling: enabled: false #操作oss需要的一些参数 aliyun: - accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE # 阿里云的accessKeyId - secretAccessKey: cClMLIzTkYW5cxyY3iuz8InIECujMC # accessKey 密码 + accessKeyId: LTAI5tD3bjTBDvgmgXLTKL5X # 阿里云的accessKeyId + secretAccessKey: wCPlCO5nnnqBekd3wxAPU6CSUto6fQ # accessKey 密码 oss: - endPoint: oss-cn-shenzhen.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint - bucketName: hanhaiimage # bucket 名称 - cdnName: image.hhlm1688.com + endPoint: oss-cn-shanghai.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint + bucketName: catmdogf # bucket 名称 + cdnName: cdn.catmdogd.com wechat: enabled: true appId: wxd1a6ba7b5e17a5b6 diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml index d2ad983..63bd736 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true master: -# url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true - url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true + url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true +# url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true username: root password: Qweruiop@123 # 从库数据源 @@ -45,12 +45,12 @@ scheduling: enabled: false #操作oss需要的一些参数 aliyun: - accessKeyId: LTAI5tESEdx8bQjkSC9UHnmE # 阿里云的accessKeyId - secretAccessKey: cClMLIzTkYW5cxyY3iuz8InIECujMC # accessKey 密码 + accessKeyId: LTAI5tD3bjTBDvgmgXLTKL5X # 阿里云的accessKeyId + secretAccessKey: wCPlCO5nnnqBekd3wxAPU6CSUto6fQ # accessKey 密码 oss: - endPoint: oss-cn-shenzhen.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint - bucketName: hanhaiimage # bucket 名称 - cdnName: image.hhlm1688.com + endPoint: oss-cn-shanghai.aliyuncs.com # Endpoint:在阿里云oss控制台查看自己使用的endpoint + bucketName: catmdogf # bucket 名称 + cdnName: cdn.catmdogd.com wechat: enabled: true appId: wxd1a6ba7b5e17a5b6 @@ -58,8 +58,8 @@ wechat: merchantId: 1665639691 # privateKeyPath: /data/software/app/key/apiclient_key.pem - privateKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem -# privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem +# privateKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem + privateKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem # privateKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem # privateKeyPath: /root/pem/apiclient_key.pem # privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem @@ -79,8 +79,8 @@ wechat: staffAppId: wx01f0f43759922fda staffSecret: b0a5617e6e4c387262a32af2b355c8b6 publicKeyId: PUB_KEY_ID_0116656396912025062400291558001601 - publicKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem -# publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem +# publicKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem + publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: /data/software/app/key/pub_key.pem pay: @@ -141,8 +141,8 @@ wechat-admin: staffAppId: wx01f0f43759922fda staffSecret: b0a5617e6e4c387262a32af2b355c8b6 # publicKeyPath: /root/pem/pub_key.pem - publicKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem -# publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem +# publicKeyPath: E:\\git_java\\api_java\\pet-admin\\pet-admin\\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem + publicKeyPath: E:\\file\\2025\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: E:\\file\\2025\\project\\1\pet-admin\\ruoyi-admin\\src\\main\\resources\\pub_key.pem # publicKeyPath: /data/software/app/key/pub_key.pem publicKeyId: PUB_KEY_ID_0116656396912025062400291558001601 diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderBannerController.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderBannerController.java new file mode 100644 index 0000000..8f0d2aa --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderBannerController.java @@ -0,0 +1,40 @@ +package com.ruoyi.applet.contoller; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.model.domain.AppletOrderBanner; +import com.ruoyi.model.service.AppletOrderBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; + +@RestController +@RequestMapping("/applet/order/banner") +public class ApiAppletOrderBannerController extends BaseController { + + @Autowired + private AppletOrderBannerService appletOrderBannerService; + + /** + * 查询轮播图列表 + */ + @GetMapping("/list") + public AjaxResult list(AppletOrderBanner appBanner, + @RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize) + { + Page page = appletOrderBannerService + .lambdaQuery() + .orderByDesc(AppletOrderBanner::getSort) + .like(StringUtils.isNotBlank(appBanner.getUrl()), AppletOrderBanner::getUrl, appBanner.getUrl()) + .eq(appBanner.getId() != null, AppletOrderBanner::getId, appBanner.getId()) + .page(new Page<>(pageNum, pageSize)); + return AjaxResult.success(page); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppOrderBannerController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppOrderBannerController.java new file mode 100644 index 0000000..d20b472 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppOrderBannerController.java @@ -0,0 +1,99 @@ +package com.ruoyi.model.controller; + +import com.baomidou.mybatisplus.extension.api.R; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.model.domain.AppBanner; +import com.ruoyi.model.domain.AppletOrderBanner; +import com.ruoyi.model.service.AppletOrderBannerService; +import com.ruoyi.model.service.IAppBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + +@RestController +@RequestMapping("/model/order/banner") +public class AppOrderBannerController extends BaseController { + + @Autowired + private AppletOrderBannerService appletOrderBannerService; + + /** + * 查询轮播图列表 + */ + @GetMapping("/list") + public AjaxResult list(AppletOrderBanner appBanner, + @RequestParam(defaultValue = "1") Integer pageNum, + @RequestParam(defaultValue = "10") Integer pageSize) + { + Page page = appletOrderBannerService + .lambdaQuery() + .orderByDesc(AppletOrderBanner::getSort) + .like(StringUtils.isNotBlank(appBanner.getUrl()), AppletOrderBanner::getUrl, appBanner.getUrl()) + .eq(appBanner.getId() != null, AppletOrderBanner::getId, appBanner.getId()) + .page(new Page<>(pageNum, pageSize)); + return AjaxResult.success(page); + } + + /** + * 导出轮播图列表 + */ +// @Log(title = "轮播图", businessType = BusinessType.EXPORT) +// @PostMapping("/export") +// public void export(HttpServletResponse response, AppletOrderBanner appBanner) throws IOException { +// List list = appletOrderBannerService.selectAppBannerList(appBanner); +// ExcelUtil util = new ExcelUtil(AppBanner.class); +// util.exportExcel(response, list, "轮播图数据"); +// } + + /** + * 获取轮播图详细信息 + */ + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(appletOrderBannerService.getById(id)); + } + + /** + * 新增轮播图 + */ + @Log(title = "轮播图", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody AppletOrderBanner appBanner) + { + return toAjax(appletOrderBannerService.save(appBanner)); + } + + /** + * 修改轮播图 + */ + @Log(title = "轮播图", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody AppletOrderBanner appBanner) + { + return toAjax(appletOrderBannerService.updateById(appBanner)); + } + + /** + * 删除轮播图 + */ + @Log(title = "轮播图", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(appletOrderBannerService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderBanner.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderBanner.java new file mode 100644 index 0000000..9052cdd --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrderBanner.java @@ -0,0 +1,28 @@ +package com.ruoyi.model.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 下单端轮播图对象 + * + * @author ruoyi + * @date 2025-03-30 + */ +@Data +public class AppletOrderBanner extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + private Long id; + + @Excel(name = "轮播图图片 ") + private String image; + + @Excel(name = "跳转链接") + private String url; + + @Excel(name = "排序") + private Integer sort; +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderBannerMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderBannerMapper.java new file mode 100644 index 0000000..365cf04 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderBannerMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.model.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.model.domain.AppletOrderBanner; + +public interface AppletOrderBannerMapper extends BaseMapper { +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/AppletOrderBannerService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/AppletOrderBannerService.java new file mode 100644 index 0000000..d1fa6fe --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/AppletOrderBannerService.java @@ -0,0 +1,7 @@ +package com.ruoyi.model.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.model.domain.AppletOrderBanner; + +public interface AppletOrderBannerService extends IService { +} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderBannerServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderBannerServiceImpl.java new file mode 100644 index 0000000..e36fab2 --- /dev/null +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderBannerServiceImpl.java @@ -0,0 +1,11 @@ +package com.ruoyi.model.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.model.domain.AppletOrderBanner; +import com.ruoyi.model.mapper.AppletOrderBannerMapper; +import com.ruoyi.model.service.AppletOrderBannerService; +import org.springframework.stereotype.Service; + +@Service +public class AppletOrderBannerServiceImpl extends ServiceImpl implements AppletOrderBannerService { +}