productDev/dmttwebsit.git

提交次数
对比

2025-07-10

jiangping

Merge remote-tracking branch 'origin/master'

8996a3

对比 | 目录

2025-07-10

jiangping

c14da1

对比 | 目录

已修改4个文件

	admin/dmttwebsite_admin/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	admin/src/components/common/RichEditor.vue	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/dao/dto/FootDataDTO.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 admin/dmttwebsite_admin/index.html

@@ -1 +1 @@
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/dmttwebsite_admin/favicon.ico"><title>豆米跳跳官网后台管理</title><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/js/app.337d4611.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="stylesheet"><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js"></script><script src="/dmttwebsite_admin/static/js/app.337d4611.js"></script></body></html>
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/dmttwebsite_admin/favicon.ico"><title>豆米跳跳官网后台管理</title><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/js/app.036a313f.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="stylesheet"><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js"></script><script src="/dmttwebsite_admin/static/js/app.036a313f.js"></script></body></html>

 admin/src/components/common/RichEditor.vue

@@ -129,7 +129,7 @@
        MENU_CONF: {
          // 图片上传
          uploadImage: {
            server: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal?folder=',
            server: process.env.VUE_APP_API_PREFIX + '/web/public/uploadLocal?folder=',
            fieldName: 'file',
            // 单个文件的最大体积限制，默认为 2M
            maxFileSize: 10 * 1024 * 1024, // 10M
@@ -204,7 +204,7 @@
          // 视频上传
          uploadVideo: {
            fieldName: 'file',
            server: process.env.VUE_APP_API_PREFIX + '/public/upload?folder=richeditor',
            server: process.env.VUE_APP_API_PREFIX + '/web/public/upload?folder=richeditor',
            // 单个文件的最大体积限制，默认为 10M
            maxFileSize: 50 * 1024 * 1024, // 50M
            // 最多可上传几个文件，默认为 5

 server/src/main/java/com/doumee/dao/dto/FootDataDTO.java

@@ -15,6 +15,8 @@

    @ApiModelProperty(value = "foot二维码")
    private String footImgUrl;
    @ApiModelProperty(value = "foot二维码2")
    private String footImgUrl2;

    @ApiModelProperty(value = "foot文案")
    private String footWords;

 server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java

@@ -276,6 +276,11 @@
            footImgUrl.setCode(footDataDTO.getFootImgUrl());
            systemDictDataBiz.updateById(footImgUrl);
        }
        SystemDictData footImgUrl2 = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_IMGURL2);
        if (Objects.nonNull(footImgUrl2)) {
            footImgUrl2.setCode(footDataDTO.getFootImgUrl2());
            systemDictDataBiz.updateById(footImgUrl2);
        }

        SystemDictData linkPhone = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.LINK_PHONE);
        if (Objects.nonNull(linkPhone)) {
@@ -313,9 +318,9 @@
            systemDictDataBiz.updateById(wisdomSystem);
        }
        SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.HONORS);
        if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getHonors())) {
            wisdomSystem.setCode(footDataDTO.getHonors().toString());
            systemDictDataBiz.updateById(wisdomSystem);
        if (Objects.nonNull(honors)&&Objects.nonNull(footDataDTO.getHonors())) {
            honors.setCode(footDataDTO.getHonors().toString());
            systemDictDataBiz.updateById(honors);
        }
    }

			@@ -1 +1 @@
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/dmttwebsite_admin/favicon.ico"><title>豆米跳跳官网后台管理</title><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/js/app.337d4611.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="stylesheet"><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js"></script><script src="/dmttwebsite_admin/static/js/app.337d4611.js"></script></body></html>
			<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/dmttwebsite_admin/favicon.ico"><title>豆米跳跳官网后台管理</title><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="preload" as="style"><link href="/dmttwebsite_admin/static/js/app.036a313f.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js" rel="preload" as="script"><link href="/dmttwebsite_admin/static/css/chunk-vendors.ea9ff9e0.css" rel="stylesheet"><link href="/dmttwebsite_admin/static/css/app.192b2716.css" rel="stylesheet"></head><body><div id="app"></div><script src="/dmttwebsite_admin/static/js/chunk-vendors.1d398f3c.js"></script><script src="/dmttwebsite_admin/static/js/app.036a313f.js"></script></body></html>

			@@ -129,7 +129,7 @@
			MENU_CONF: {
			// 图片上传
			uploadImage: {
			server: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal?folder=',
			server: process.env.VUE_APP_API_PREFIX + '/web/public/uploadLocal?folder=',
			fieldName: 'file',
			// 单个文件的最大体积限制，默认为 2M
			maxFileSize: 10 * 1024 * 1024, // 10M
			@@ -204,7 +204,7 @@
			// 视频上传
			uploadVideo: {
			fieldName: 'file',
			server: process.env.VUE_APP_API_PREFIX + '/public/upload?folder=richeditor',
			server: process.env.VUE_APP_API_PREFIX + '/web/public/upload?folder=richeditor',
			// 单个文件的最大体积限制，默认为 10M
			maxFileSize: 50 * 1024 * 1024, // 50M
			// 最多可上传几个文件，默认为 5

			@@ -15,6 +15,8 @@

			@ApiModelProperty(value = "foot二维码")
			private String footImgUrl;
			@ApiModelProperty(value = "foot二维码2")
			private String footImgUrl2;

			@ApiModelProperty(value = "foot文案")
			private String footWords;

			@@ -276,6 +276,11 @@
			footImgUrl.setCode(footDataDTO.getFootImgUrl());
			systemDictDataBiz.updateById(footImgUrl);
			}
			SystemDictData footImgUrl2 = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FOOT_IMGURL2);
			if (Objects.nonNull(footImgUrl2)) {
			footImgUrl2.setCode(footDataDTO.getFootImgUrl2());
			systemDictDataBiz.updateById(footImgUrl2);
			}

			SystemDictData linkPhone = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.LINK_PHONE);
			if (Objects.nonNull(linkPhone)) {
			@@ -313,9 +318,9 @@
			systemDictDataBiz.updateById(wisdomSystem);
			}
			SystemDictData honors = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.HONORS);
			if (Objects.nonNull(wisdomSystem)&&Objects.nonNull(footDataDTO.getHonors())) {
			wisdomSystem.setCode(footDataDTO.getHonors().toString());
			systemDictDataBiz.updateById(wisdomSystem);
			if (Objects.nonNull(honors)&&Objects.nonNull(footDataDTO.getHonors())) {
			honors.setCode(footDataDTO.getHonors().toString());
			systemDictDataBiz.updateById(honors);
			}
			}