From 015d10b3b528c719cb142622e84d12eb29351300 Mon Sep 17 00:00:00 2001 From: xiao12feng8 <16507319+xiao12feng8@user.noreply.gitee.com> Date: Fri, 30 Jan 2026 18:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ry-study-ui-README.md | 6 +- Study-Vue-redis/pom.xml | 12 +- .../controller/common/CaptchaController.java | 4 +- .../controller/common/CommonController.java | 10 +- .../study/StudyScreenMonitorController.java | 6 +- .../study/StudyVoiceEvaluationController.java | 20 +- .../controller/system/SysIndexController.java | 6 +- .../system/SysProfileController.java | 6 +- .../ddnai/web/core/config/SwaggerConfig.java | 8 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/banner.txt | 2 +- .../{RuoYiConfig.java => AppConfig.java} | 10 +- .../common/utils/file/FileTypeUtils.java | 4 +- .../common/utils/file/FileUploadUtils.java | 6 +- .../ddnai/common/utils/file/FileUtils.java | 8 +- .../ddnai/common/utils/file/ImageUtils.java | 4 +- .../common/utils/file/VideoDurationUtils.java | 6 +- .../ddnai/common/utils/ip/AddressUtils.java | 4 +- .../com/ddnai/common/utils/poi/ExcelUtil.java | 4 +- .../framework/config/ResourcesConfig.java | 4 +- .../web/service/PermissionService.java | 2 +- .../generator/controller/GenController.java | 2 +- .../com/ddnai/generator/util/GenUtils.java | 2 +- .../ddnai/quartz/config/ScheduleConfig.java | 4 +- .../impl/study/StudyUserAuditServiceImpl.java | 2 +- .../voice/VoiceEvaluationServiceImpl.java | 2 +- .../ry-study-ui/src/api/system/user.js | 2 +- .../ry-study-ui/src/assets/styles/app.scss | 288 ++++++++++++++++++ .../src/layout/components/Navbar.vue | 14 +- Study-Vue-redis/ry-study-ui/src/main.js | 4 +- .../ry-study-ui/src/plugins/download.js | 2 +- .../ry-study-ui/src/store/modules/user.js | 2 +- Study-Vue-redis/ry-study-ui/src/utils/app.js | 268 ++++++++++++++++ .../ry-study-ui/src/utils/dict/Dict.js | 2 +- .../ry-study-ui/src/utils/dict/DictMeta.js | 2 +- .../ry-study-ui/src/utils/dict/DictOptions.js | 2 +- .../ry-study-ui/src/utils/index.js | 2 +- .../ry-study-ui/src/utils/request.js | 2 +- .../src/views/monitor/job/index.vue | 2 +- .../src/views/study/courseware/index.vue | 2 +- .../src/views/study/score/detail.vue | 2 +- .../src/views/study/screenStream/index.vue | 2 +- .../src/views/study/voiceEvaluation/index.vue | 2 +- .../views/system/user/profile/userAvatar.vue | 2 +- .../src/views/tool/gen/genInfoForm.vue | 2 +- .../ry-study-ui/src/views/tool/gen/index.vue | 2 +- fronted_uniapp/pages/register/register.vue | 2 +- fronted_uniapp/utils/auth.js | 10 +- fronted_uniapp/utils/request.js | 10 +- 49 files changed, 659 insertions(+), 115 deletions(-) rename Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/{RuoYiConfig.java => AppConfig.java} (90%) create mode 100644 Study-Vue-redis/ry-study-ui/src/assets/styles/app.scss create mode 100644 Study-Vue-redis/ry-study-ui/src/utils/app.js diff --git a/Archive/Study-Vue-redis_docs/ry-study-ui-README.md b/Archive/Study-Vue-redis_docs/ry-study-ui-README.md index 4f3c2de..dc1bac3 100644 --- a/Archive/Study-Vue-redis_docs/ry-study-ui-README.md +++ b/Archive/Study-Vue-redis_docs/ry-study-ui-README.md @@ -31,7 +31,7 @@ npm run build:prod ## 说明 -本项目基于RuoYi-Vue框架定制开发，已进行以下定制化改造： -- 项目包名：com.ruoyi.* → com.ddnai.* -- 模块命名：ruoyi-* → ry-study-* +本项目基于通用后台管理框架定制开发，已进行以下定制化改造： +- 项目包名：com.example.* → com.ddnai.* +- 模块命名：framework-* → ry-study-* - 品牌标识：全面更换为"国语教育平台" \ No newline at end of file diff --git a/Study-Vue-redis/pom.xml b/Study-Vue-redis/pom.xml index 03f4858..d632f97 100644 --- a/Study-Vue-redis/pom.xml +++ b/Study-Vue-redis/pom.xml @@ -13,7 +13,7 @@ 国语教育平台 - 1.0.0 + 1.0.0 UTF-8 UTF-8 1.8 @@ -187,35 +187,35 @@ com.ddnai ry-study-quartz - ${ruoyi.version} + ${app.version} com.ddnai ry-study-generator - ${ruoyi.version} + ${app.version} com.ddnai ry-study-framework - ${ruoyi.version} + ${app.version} com.ddnai ry-study-system - ${ruoyi.version} + ${app.version} com.ddnai ry-study-common - ${ruoyi.version} + ${app.version} diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CaptchaController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CaptchaController.java index 91f2ffb..6b6cd5b 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CaptchaController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CaptchaController.java @@ -11,7 +11,7 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.CacheConstants; import com.ddnai.common.constant.Constants; import com.ddnai.common.core.domain.AjaxResult; @@ -61,7 +61,7 @@ public class CaptchaController BufferedImage image = null; // 生成验证码 - String captchaType = RuoYiConfig.getCaptchaType(); + String captchaType = AppConfig.getCaptchaType(); if ("math".equals(captchaType)) { String capText = captchaProducerMath.createText(); diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CommonController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CommonController.java index d3e286e..c34db9e 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CommonController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/common/CommonController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.core.domain.AjaxResult; import com.ddnai.common.utils.StringUtils; import com.ddnai.common.utils.file.FileUploadUtils; @@ -52,7 +52,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = AppConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -77,7 +77,7 @@ public class CommonController try { // 上传文件路径（必须带/upload，否则数据库路径会错误） - String filePath = RuoYiConfig.getProfile() + "/upload"; + String filePath = AppConfig.getProfile() + "/upload"; // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String baseUrl = serverConfig.getUrl(); @@ -111,7 +111,7 @@ public class CommonController try { // 上传文件路径（必须带/upload，否则数据库路径会错误） - String filePath = RuoYiConfig.getProfile() + "/upload"; + String filePath = AppConfig.getProfile() + "/upload"; String baseUrl = serverConfig.getUrl(); // 移除 /api 前缀，文件访问不应该通过 /api 路径 if (baseUrl.endsWith("/api")) @@ -159,7 +159,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = AppConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + FileUtils.stripPrefix(resource); // 下载名称 diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyScreenMonitorController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyScreenMonitorController.java index 1b0cbde..99062d9 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyScreenMonitorController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyScreenMonitorController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import com.ddnai.common.annotation.Log; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.core.controller.BaseController; import com.ddnai.common.core.domain.AjaxResult; import com.ddnai.common.core.page.TableDataInfo; @@ -59,8 +59,8 @@ public class StudyScreenMonitorController extends BaseController Long studentId = getUserId(); - // 使用RuoYi的文件上传工具 - String uploadPath = RuoYiConfig.getProfile() + "/upload/screenshots"; + // 使用系统文件上传工具 + String uploadPath = AppConfig.getProfile() + "/upload/screenshots"; String fileName = FileUploadUtils.upload(uploadPath, file, MimeTypeUtils.IMAGE_EXTENSION); String baseUrl = serverConfig.getUrl(); // 移除 /api 前缀，文件访问不应该通过 /api 路径 diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyVoiceEvaluationController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyVoiceEvaluationController.java index b76878d..96fda14 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyVoiceEvaluationController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/study/StudyVoiceEvaluationController.java @@ -79,7 +79,7 @@ public class StudyVoiceEvaluationController extends BaseController // 第1步：保存上传的文件 testLog.append("【步骤1】保存上传文件... "); - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/test"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/test"; String[] audioExtensions = { "mp3", "m4a", "aac" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); @@ -87,7 +87,7 @@ public class StudyVoiceEvaluationController extends BaseController testLog.append(" 上传返回路径: ").append(fileName).append("\n"); // 处理路径：FileUploadUtils返回格式如 /profile/upload/xxx 或绝对路径 - String profilePath = com.ddnai.common.config.RuoYiConfig.getProfile(); + String profilePath = com.ddnai.common.config.AppConfig.getProfile(); String fullPath; if (fileName.startsWith("/profile/")) { // 相对路径，需要替换/profile为实际路径 @@ -329,7 +329,7 @@ public class StudyVoiceEvaluationController extends BaseController } // 上传音频文件 - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/voice"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/voice"; String[] audioExtensions = { "mp3", "wav", "wma", "m4a", "aac" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); @@ -495,7 +495,7 @@ public class StudyVoiceEvaluationController extends BaseController logger.info("✓ 音频格式: {}", format); // 上传音频文件 - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/voice"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/voice"; // 扩展支持的音频格式，包含pcm String[] audioExtensions = { "mp3", "wav", "wma", "m4a", "aac", "pcm" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); @@ -622,7 +622,7 @@ public class StudyVoiceEvaluationController extends BaseController if (StringUtils.isEmpty(voiceEvaluation.getAudioPath())) { // 上传音频文件 - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/voice"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/voice"; String[] audioExtensions = { "mp3", "wav", "wma", "m4a", "aac" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); voiceEvaluation.setAudioPath(fileName); @@ -632,7 +632,7 @@ public class StudyVoiceEvaluationController extends BaseController { // 如果已有音频路径，可以选择覆盖或提示 // 这里选择覆盖，如果需要保留原音频，可以注释掉下面的代码 - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/voice"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/voice"; String[] audioExtensions = { "mp3", "wav", "wma", "m4a", "aac" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); voiceEvaluation.setAudioPath(fileName); @@ -721,7 +721,7 @@ public class StudyVoiceEvaluationController extends BaseController } // 上传音频文件 - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/voice"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/voice"; String[] audioExtensions = { "mp3", "wav", "wma", "m4a", "aac" }; String originalFileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); @@ -731,7 +731,7 @@ public class StudyVoiceEvaluationController extends BaseController String fileNameForRecognition = originalFileName; // 🔄 自动转换音频格式为WAV（百度API需要WAV格式） - String profilePath = com.ddnai.common.config.RuoYiConfig.getProfile(); + String profilePath = com.ddnai.common.config.AppConfig.getProfile(); String fullPath; if (originalFileName.startsWith("/profile/")) { fullPath = profilePath + originalFileName.substring(8); @@ -882,11 +882,11 @@ public class StudyVoiceEvaluationController extends BaseController // 步骤1：保存上传的文件 testLog.append("【步骤1】保存上传文件... "); - String uploadPath = com.ddnai.common.config.RuoYiConfig.getProfile() + "/upload/test"; + String uploadPath = com.ddnai.common.config.AppConfig.getProfile() + "/upload/test"; String[] audioExtensions = { "mp3", "m4a", "aac" }; String fileName = FileUploadUtils.upload(uploadPath, file, audioExtensions); - String profilePath = com.ddnai.common.config.RuoYiConfig.getProfile(); + String profilePath = com.ddnai.common.config.AppConfig.getProfile(); String fullPath; if (fileName.startsWith("/profile/")) { fullPath = profilePath + fileName.substring(8); diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java index 2b72487..7877a3f 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java @@ -3,7 +3,7 @@ package com.ddnai.web.controller.system; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.utils.StringUtils; /** @@ -16,7 +16,7 @@ public class SysIndexController { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private AppConfig appConfig; /** * 访问首页，提示语 @@ -24,7 +24,7 @@ public class SysIndexController @RequestMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("{}服务运行正常，当前版本：v{}。", appConfig.getName(), appConfig.getVersion()); } } diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java index 432334a..b571260 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import com.ddnai.common.annotation.Log; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.core.controller.BaseController; import com.ddnai.common.core.domain.AjaxResult; import com.ddnai.common.core.domain.entity.SysUser; @@ -127,13 +127,13 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); + String avatar = FileUploadUtils.upload(AppConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); if (userService.updateUserAvatar(loginUser.getUserId(), avatar)) { String oldAvatar = loginUser.getUser().getAvatar(); if (StringUtils.isNotEmpty(oldAvatar)) { - FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); + FileUtils.deleteFile(AppConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); } AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", avatar); diff --git a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java index a9b7cf7..6158244 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java +++ b/Study-Vue-redis/ry-study-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import io.swagger.annotations.ApiOperation; import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; @@ -32,7 +32,7 @@ public class SwaggerConfig { /** 系统基础配置 */ @Autowired - private RuoYiConfig ruoyiConfig; + private AppConfig appConfig; /** 是否开启swagger */ @Value("${swagger.enabled}") @@ -117,9 +117,9 @@ public class SwaggerConfig // 描述 .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) + .contact(new Contact(appConfig.getName(), null, null)) // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) + .version("版本号:" + appConfig.getVersion()) .build(); } } diff --git a/Study-Vue-redis/ry-study-admin/src/main/resources/application.yml b/Study-Vue-redis/ry-study-admin/src/main/resources/application.yml index abebd7a..41efce4 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/resources/application.yml +++ b/Study-Vue-redis/ry-study-admin/src/main/resources/application.yml @@ -1,5 +1,5 @@ # 项目相关配置 -ruoyi: +app: # 名称 name: 国语教育平台 # 版本 diff --git a/Study-Vue-redis/ry-study-admin/src/main/resources/banner.txt b/Study-Vue-redis/ry-study-admin/src/main/resources/banner.txt index 5d38850..0da71a3 100644 --- a/Study-Vue-redis/ry-study-admin/src/main/resources/banner.txt +++ b/Study-Vue-redis/ry-study-admin/src/main/resources/banner.txt @@ -1,3 +1,3 @@ -Application Version: ${ruoyi.version} +Application Version: ${app.version} Spring Boot Version: ${spring-boot.version} // 国语教育平台 永不宕机 永无BUG // \ No newline at end of file diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/AppConfig.java similarity index 90% rename from Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java rename to Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/AppConfig.java index 5f4dacc..3b10fc0 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/config/AppConfig.java @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; * @author ddnai */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "app") +public class AppConfig { /** 项目名称 */ private String name; @@ -67,7 +67,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + AppConfig.profile = profile; } public static boolean isAddressEnabled() @@ -77,7 +77,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + AppConfig.addressEnabled = addressEnabled; } public static String getCaptchaType() { @@ -85,7 +85,7 @@ public class RuoYiConfig } public void setCaptchaType(String captchaType) { - RuoYiConfig.captchaType = captchaType; + AppConfig.captchaType = captchaType; } /** diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java index affc41b..88b873b 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java @@ -13,7 +13,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: example.txt, 返回: txt * * @param file 文件名 * @return 后缀（不含".") @@ -30,7 +30,7 @@ public class FileTypeUtils /** * 获取文件类型 *

- * 例如: ruoyi.txt, 返回: txt + * 例如: example.txt, 返回: txt * * @param fileName 文件名 * @return 后缀（不含".") diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java index 452c31e..1f64d11 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java @@ -6,7 +6,7 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.Constants; import com.ddnai.common.exception.file.FileNameLengthLimitExceededException; import com.ddnai.common.exception.file.FileSizeLimitExceededException; @@ -36,7 +36,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = AppConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -170,7 +170,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = AppConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java index c2b2840..f460394 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.Constants; import com.ddnai.common.utils.DateUtils; import com.ddnai.common.utils.StringUtils; @@ -74,7 +74,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, AppConfig.getImportPath()); } /** @@ -268,7 +268,7 @@ public class FileUtils } /** - * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png + * 获取文件名称 /profile/upload/2022/04/16/example.png -- example.png * * @param fileName 路径名称 * @return 没有文件路径的名称 @@ -286,7 +286,7 @@ public class FileUtils } /** - * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi + * 获取不带后缀文件名称 /profile/upload/2022/04/16/example.png -- example * * @param fileName 路径名称 * @return 没有文件路径和后缀的名称 diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java index 621047f..7771233 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java @@ -9,7 +9,7 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.Constants; import com.ddnai.common.utils.StringUtils; @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = AppConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/VideoDurationUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/VideoDurationUtils.java index 75453d2..24221d1 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/VideoDurationUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/file/VideoDurationUtils.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.utils.StringUtils; /** @@ -195,10 +195,10 @@ public class VideoDurationUtils } // 获取上传目录 - String uploadPath = RuoYiConfig.getUploadPath(); + String uploadPath = AppConfig.getUploadPath(); if (StringUtils.isEmpty(uploadPath)) { - uploadPath = RuoYiConfig.getProfile(); + uploadPath = AppConfig.getProfile(); } // 构建绝对路径 diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java index fff1e34..5a13ca1 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.Constants; import com.ddnai.common.utils.StringUtils; import com.ddnai.common.utils.http.HttpUtils; @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (AppConfig.isAddressEnabled()) { try { diff --git a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java index e888e97..0507d4e 100644 --- a/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java +++ b/Study-Vue-redis/ry-study-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java @@ -74,7 +74,7 @@ import com.ddnai.common.annotation.Excel; import com.ddnai.common.annotation.Excel.ColumnType; import com.ddnai.common.annotation.Excel.Type; import com.ddnai.common.annotation.Excels; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.core.domain.AjaxResult; import com.ddnai.common.core.text.Convert; import com.ddnai.common.exception.UtilException; @@ -1459,7 +1459,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = AppConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java b/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java index 08761fe..a017293 100644 --- a/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java +++ b/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java @@ -11,7 +11,7 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ddnai.common.config.RuoYiConfig; +import com.ddnai.common.config.AppConfig; import com.ddnai.common.constant.Constants; import com.ddnai.framework.interceptor.RepeatSubmitInterceptor; @@ -31,7 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 - 使用自定义解析器兼容 /upload/ 和无 /upload/ 两种路径 */ // 如果profile配置包含upload目录，需要回退到父目录 - String profilePath = RuoYiConfig.getProfile(); + String profilePath = AppConfig.getProfile(); if (profilePath.endsWith("upload") || profilePath.endsWith("upload/") || profilePath.endsWith("upload\\")) { profilePath = profilePath.substring(0, profilePath.lastIndexOf("upload")); } diff --git a/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java b/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java index fe4618a..cf83d66 100644 --- a/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java +++ b/Study-Vue-redis/ry-study-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java @@ -11,7 +11,7 @@ import com.ddnai.common.utils.StringUtils; import com.ddnai.framework.security.context.PermissionContextHolder; /** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * 自定义权限实现，ss取自SpringSecurity首字母 * * @author ddnai */ diff --git a/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/controller/GenController.java b/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/controller/GenController.java index 740d585..70ffbaf 100644 --- a/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/controller/GenController.java +++ b/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/controller/GenController.java @@ -255,7 +255,7 @@ public class GenController extends BaseController response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"code.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IOUtils.write(data, response.getOutputStream()); diff --git a/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/util/GenUtils.java b/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/util/GenUtils.java index b24ada7..6595395 100644 --- a/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/util/GenUtils.java +++ b/Study-Vue-redis/ry-study-generator/src/main/java/com/ddnai/generator/util/GenUtils.java @@ -215,7 +215,7 @@ public class GenUtils */ public static String replaceText(String text) { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); + return RegExUtils.replaceAll(text, "(?:表)", ""); } /** diff --git a/Study-Vue-redis/ry-study-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java b/Study-Vue-redis/ry-study-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java index 35a2ff5..fdc94eb 100644 --- a/Study-Vue-redis/ry-study-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java +++ b/Study-Vue-redis/ry-study-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java @@ -22,7 +22,7 @@ // // // quartz参数 // Properties prop = new Properties(); -// prop.put("org.quartz.scheduler.instanceName", "RuoyiScheduler"); +// prop.put("org.quartz.scheduler.instanceName", "AppScheduler"); // prop.put("org.quartz.scheduler.instanceId", "AUTO"); // // 线程池配置 // prop.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); @@ -42,7 +42,7 @@ // prop.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); // factory.setQuartzProperties(prop); // -// factory.setSchedulerName("RuoyiScheduler"); +// factory.setSchedulerName("AppScheduler"); // // 延时启动 // factory.setStartupDelay(1); // factory.setApplicationContextSchedulerContextKey("applicationContextKey"); diff --git a/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/study/StudyUserAuditServiceImpl.java b/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/study/StudyUserAuditServiceImpl.java index 67e0827..c3bb05e 100644 --- a/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/study/StudyUserAuditServiceImpl.java +++ b/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/study/StudyUserAuditServiceImpl.java @@ -357,7 +357,7 @@ public class StudyUserAuditServiceImpl implements IStudyUserAuditService com.ddnai.common.core.domain.entity.SysDept rootDept = new com.ddnai.common.core.domain.entity.SysDept(); rootDept.setParentId(0L); List rootDepts = deptService.selectDeptList(rootDept); - Long parentId = 100L; // 默认父部门ID（RuoYi默认根部门ID） + Long parentId = 100L; // 默认父部门ID（默认根部门ID） if (rootDepts != null && !rootDepts.isEmpty()) { parentId = rootDepts.get(0).getDeptId(); diff --git a/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/voice/VoiceEvaluationServiceImpl.java b/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/voice/VoiceEvaluationServiceImpl.java index 6296e6d..48fd491 100644 --- a/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/voice/VoiceEvaluationServiceImpl.java +++ b/Study-Vue-redis/ry-study-system/src/main/java/com/ddnai/system/service/impl/voice/VoiceEvaluationServiceImpl.java @@ -222,7 +222,7 @@ public class VoiceEvaluationServiceImpl implements IVoiceEvaluationService */ private String convertToRealPath(String dbPath) { // 如果已经是绝对路径（包含盘符或以profile路径开头），直接返回 - String profilePath = com.ddnai.common.config.RuoYiConfig.getProfile(); + String profilePath = com.ddnai.common.config.AppConfig.getProfile(); // Windows绝对路径判断：包含冒号（如 D:） if (dbPath.contains(":") || dbPath.startsWith(profilePath)) { diff --git a/Study-Vue-redis/ry-study-ui/src/api/system/user.js b/Study-Vue-redis/ry-study-ui/src/api/system/user.js index b5e3edd..ffc3972 100644 --- a/Study-Vue-redis/ry-study-ui/src/api/system/user.js +++ b/Study-Vue-redis/ry-study-ui/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { parseStrEmpty } from "@/utils/ruoyi"; +import { parseStrEmpty } from "@/utils/app"; // 查询用户列表 export function listUser(query) { diff --git a/Study-Vue-redis/ry-study-ui/src/assets/styles/app.scss b/Study-Vue-redis/ry-study-ui/src/assets/styles/app.scss new file mode 100644 index 0000000..da5c3af --- /dev/null +++ b/Study-Vue-redis/ry-study-ui/src/assets/styles/app.scss @@ -0,0 +1,288 @@ +/** +* 通用css样式布局处理 +* 国语教育平台 +* Copyright (c) 2025 DDNAI +*/ + +/** 基础通用 **/ +.pt5 { + padding-top: 5px; +} + +.pr5 { + padding-right: 5px; +} + +.pb5 { + padding-bottom: 5px; +} + +.mt5 { + margin-top: 5px; +} + +.mr5 { + margin-right: 5px; +} + +.mb5 { + margin-bottom: 5px; +} + +.mb8 { + margin-bottom: 8px; +} + +.ml5 { + margin-left: 5px; +} + +.mt10 { + margin-top: 10px; +} + +.mr10 { + margin-right: 10px; +} + +.mb10 { + margin-bottom: 10px; +} +.ml10 { + margin-left: 10px; +} + +.mt20 { + margin-top: 20px; +} + +.mr20 { + margin-right: 20px; +} + +.mb20 { + margin-bottom: 20px; +} +.ml20 { + margin-left: 20px; +} + +.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { + font-family: inherit; + font-weight: 500; + line-height: 1.1; + color: inherit; +} + +.el-message-box__status + .el-message-box__message{ + word-break: break-word; +} + +.el-dialog:not(.is-fullscreen) { + margin-top: 6vh !important; +} + +.el-dialog__wrapper.scrollbar .el-dialog .el-dialog__body { + overflow: auto; + overflow-x: hidden; + max-height: 70vh; + padding: 10px 20px 0; +} + +.el-table { + .el-table__header-wrapper, .el-table__fixed-header-wrapper { + th { + word-break: break-word; + background-color: #f8f8f9; + color: #515a6e; + height: 40px; + font-size: 13px; + } + } + + .el-table__body-wrapper { + .el-button [class*="el-icon-"] + span { + margin-left: 1px; + } + } +} + +/** 表单布局 **/ +.form-header { + font-size: 15px; + color: #6379bb; + border-bottom: 1px solid #ddd; + margin: 8px 10px 25px 10px; + padding-bottom: 5px +} + +/** 表格布局 **/ +.pagination-container { + display: flex; + justify-content: flex-end; + margin-top: 20px; +} + +/* tree border */ +.tree-border { + margin-top: 5px; + border: 1px solid #e5e6e7; + background: #FFFFFF none; + border-radius: 4px; +} + +@media (max-width: 768px) { + .pagination-container .el-pagination > .el-pagination__jump { + display: none !important; + } + .pagination-container .el-pagination > .el-pagination__sizes { + display: none !important; + } +} + +.el-table .fixed-width .el-button--mini { + padding-left: 0; + padding-right: 0; + width: inherit; +} + +/** 表格更多操作下拉样式 */ +.el-table .el-dropdown-link,.el-table .el-dropdown-selfdefine { + cursor: pointer; + margin-left: 5px; +} + +.el-table .el-dropdown, .el-icon-arrow-down { + font-size: 12px; +} + +.el-tree-node__content > .el-checkbox { + margin-right: 8px; +} + +.list-group-striped > .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0; +} + +.list-group { + padding-left: 0px; + list-style: none; +} + +.list-group-item { + border-bottom: 1px solid #e7eaec; + border-top: 1px solid #e7eaec; + margin-bottom: -1px; + padding: 11px 0px; + font-size: 13px; +} + +.pull-right { + float: right !important; +} + +.el-card__header { + padding: 14px 15px 7px; + min-height: 40px; +} + +.el-card__body { + padding: 15px 20px 20px 20px; +} + +.card-box { + margin-bottom: 10px; +} + +/* button color */ +.el-button--cyan.is-active, +.el-button--cyan:active { + background: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + +.el-button--cyan:focus, +.el-button--cyan:hover { + background: #48D1CC; + border-color: #48D1CC; + color: #FFFFFF; +} + +.el-button--cyan { + background-color: #20B2AA; + border-color: #20B2AA; + color: #FFFFFF; +} + +/* text color */ +.text-navy { + color: #1ab394; +} + +.text-primary { + color: inherit; +} + +.text-success { + color: #1c84c6; +} + +.text-info { + color: #23c6c8; +} + +.text-warning { + color: #f8ac59; +} + +.text-danger { + color: #ed5565; +} + +.text-muted { + color: #888888; +} + +/* image */ +.img-circle { + border-radius: 50%; +} + +.img-lg { + width: 120px; + height: 120px; +} + +.avatar-upload-preview { + position: relative; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + width: 200px; + height: 200px; + border-radius: 50%; + box-shadow: 0 0 4px #ccc; + overflow: hidden; +} + +/* 拖拽列样式 */ +.sortable-ghost { + opacity: .8; + color: #fff !important; + background: #42b983 !important; +} + +.top-right-btn { + position: relative; + float: right; +} + +/* 分割面板样式 */ +.splitpanes.default-theme .splitpanes__pane { + background-color: #fff!important; +} diff --git a/Study-Vue-redis/ry-study-ui/src/layout/components/Navbar.vue b/Study-Vue-redis/ry-study-ui/src/layout/components/Navbar.vue index 45ee588..7a16127 100644 --- a/Study-Vue-redis/ry-study-ui/src/layout/components/Navbar.vue +++ b/Study-Vue-redis/ry-study-ui/src/layout/components/Navbar.vue @@ -9,14 +9,6 @@