From c14da121eb41234a0a9016596b07592a564a212b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 七月 2025 08:58:50 +0800
Subject: [PATCH] ss
---
admin/src/components/common/RichEditor.vue | 4 ++--
admin/dmttwebsite_admin/index.html | 2 +-
server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java | 11 ++++++++---
server/src/main/java/com/doumee/dao/dto/FootDataDTO.java | 2 ++
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/admin/dmttwebsite_admin/index.html b/admin/dmttwebsite_admin/index.html
index 3e85dad..74e5b29 100644
--- a/admin/dmttwebsite_admin/index.html
+++ b/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>
\ No newline at end of file
+<!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>
\ No newline at end of file
diff --git a/admin/src/components/common/RichEditor.vue b/admin/src/components/common/RichEditor.vue
index 33b44f0..10cfeaa 100644
--- a/admin/src/components/common/RichEditor.vue
+++ b/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
diff --git a/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java b/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
index 23ad669..7496a19 100644
--- a/server/src/main/java/com/doumee/dao/dto/FootDataDTO.java
+++ b/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;
diff --git a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
index bc78a4b..f9f95de 100644
--- a/server/src/main/java/com/doumee/service/business/impl/CarouselServiceImpl.java
+++ b/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);
}
}
--
Gitblit v1.9.3