();
@@ -145,7 +145,7 @@ public class CommonController
throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource));
}
// 本地资源路径
- String localPath = RuoYiConfig.getProfile();
+ String localPath = XinliConfig.getProfile();
// 数据库资源地址
String downloadPath = localPath + FileUtils.stripPrefix(resource);
// 下载名称
diff --git a/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java b/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java
index 2b72487b..3830a33e 100644
--- a/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysIndexController.java
+++ b/ry-xinli-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.XinliConfig;
import com.ddnai.common.utils.StringUtils;
/**
@@ -16,7 +16,7 @@ public class SysIndexController
{
/** 系统基础配置 */
@Autowired
- private RuoYiConfig ruoyiConfig;
+ private XinliConfig xinliConfig;
/**
* 访问首页，提示语
@@ -24,7 +24,7 @@ public class SysIndexController
@RequestMapping("/")
public String index()
{
- return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());
+ return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", xinliConfig.getName(), xinliConfig.getVersion());
}
}
diff --git a/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java b/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java
index 432334ad..b699eb4b 100644
--- a/ry-xinli-admin/src/main/java/com/ddnai/web/controller/system/SysProfileController.java
+++ b/ry-xinli-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.XinliConfig;
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(XinliConfig.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(XinliConfig.getProfile() + FileUtils.stripPrefix(oldAvatar));
}
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", avatar);
diff --git a/ry-xinli-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java b/ry-xinli-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java
index 01941692..720c4479 100644
--- a/ry-xinli-admin/src/main/java/com/ddnai/web/core/config/SwaggerConfig.java
+++ b/ry-xinli-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.XinliConfig;
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 XinliConfig xinliConfig;
/** 是否开启swagger */
@Value("${swagger.enabled}")
@@ -113,13 +113,13 @@ public class SwaggerConfig
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
- .title("标题：若依管理系统_接口文档")
+ .title("标题：心理健康测评系统_接口文档")
// 描述
- .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
+ .description("描述：AI心理健康测评系统，提供专业的心理量表测评、智能分析和个性化建议")
// 作者信息
- .contact(new Contact(ruoyiConfig.getName(), null, null))
+ .contact(new Contact(xinliConfig.getName(), null, null))
// 版本
- .version("版本号:" + ruoyiConfig.getVersion())
+ .version("版本号:" + xinliConfig.getVersion())
.build();
}
}
diff --git a/ry-xinli-admin/src/main/resources/application.yml b/ry-xinli-admin/src/main/resources/application.yml
index 2b4c758f..a41e7f41 100644
--- a/ry-xinli-admin/src/main/resources/application.yml
+++ b/ry-xinli-admin/src/main/resources/application.yml
@@ -1,5 +1,5 @@
# 项目相关配置
-ruoyi:
+xinli:
# 名称
name: AI心理健康测评系统
# 版本
diff --git a/ry-xinli-admin/src/main/resources/banner.txt b/ry-xinli-admin/src/main/resources/banner.txt
index 528be7f7..02dd9a26 100644
--- a/ry-xinli-admin/src/main/resources/banner.txt
+++ b/ry-xinli-admin/src/main/resources/banner.txt
@@ -1,3 +1,3 @@
-Application Version: ${ruoyi.version}
+Application Version: ${xinli.version}
Spring Boot Version: ${spring-boot.version}
// AI心理健康测评系统 永不宕机 永无BUG //
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java b/ry-xinli-common/src/main/java/com/ddnai/common/config/XinliConfig.java
similarity index 90%
rename from ry-xinli-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java
rename to ry-xinli-common/src/main/java/com/ddnai/common/config/XinliConfig.java
index 5f4dacc5..aa4910d7 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/config/RuoYiConfig.java
+++ b/ry-xinli-common/src/main/java/com/ddnai/common/config/XinliConfig.java
@@ -9,8 +9,8 @@ import org.springframework.stereotype.Component;
* @author ddnai
*/
@Component
-@ConfigurationProperties(prefix = "ruoyi")
-public class RuoYiConfig
+@ConfigurationProperties(prefix = "xinli")
+public class XinliConfig
{
/** 项目名称 */
private String name;
@@ -67,7 +67,7 @@ public class RuoYiConfig
public void setProfile(String profile)
{
- RuoYiConfig.profile = profile;
+ XinliConfig.profile = profile;
}
public static boolean isAddressEnabled()
@@ -77,7 +77,7 @@ public class RuoYiConfig
public void setAddressEnabled(boolean addressEnabled)
{
- RuoYiConfig.addressEnabled = addressEnabled;
+ XinliConfig.addressEnabled = addressEnabled;
}
public static String getCaptchaType() {
@@ -85,7 +85,7 @@ public class RuoYiConfig
}
public void setCaptchaType(String captchaType) {
- RuoYiConfig.captchaType = captchaType;
+ XinliConfig.captchaType = captchaType;
}
/**
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java
index affc41b6..959b3e10 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java
+++ b/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileTypeUtils.java
@@ -13,7 +13,7 @@ public class FileTypeUtils
/**
* 获取文件类型
*
- * 例如: ruoyi.txt, 返回: txt
+ * 例如: xinli.txt, 返回: txt
*
* @param file 文件名
* @return 后缀（不含".")
@@ -30,7 +30,7 @@ public class FileTypeUtils
/**
* 获取文件类型
*
- * 例如: ruoyi.txt, 返回: txt
+ * 例如: xinli.txt, 返回: txt
*
* @param fileName 文件名
* @return 后缀（不含".")
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java
index 37b8995c..45167e1e 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUploadUtils.java
+++ b/ry-xinli-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.XinliConfig;
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 = XinliConfig.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 = XinliConfig.getProfile().length() + 1;
String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
}
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java
index c2b28401..9cb5fc56 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/FileUtils.java
+++ b/ry-xinli-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.XinliConfig;
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, XinliConfig.getImportPath());
}
/**
@@ -268,7 +268,7 @@ public class FileUtils
}
/**
- * 获取文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi.png
+ * 获取文件名称 /profile/upload/2022/04/16/xinli.png -- xinli.png
*
* @param fileName 路径名称
* @return 没有文件路径的名称
@@ -286,7 +286,7 @@ public class FileUtils
}
/**
- * 获取不带后缀文件名称 /profile/upload/2022/04/16/ruoyi.png -- ruoyi
+ * 获取不带后缀文件名称 /profile/upload/2022/04/16/xinli.png -- xinli
*
* @param fileName 路径名称
* @return 没有文件路径和后缀的名称
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java
index 621047f3..5c46c8da 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/file/ImageUtils.java
+++ b/ry-xinli-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.XinliConfig;
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 = XinliConfig.getProfile();
String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX);
in = new FileInputStream(downloadPath);
}
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java
index fff1e348..e1a01c18 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/ip/AddressUtils.java
+++ b/ry-xinli-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.XinliConfig;
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 (XinliConfig.isAddressEnabled())
{
try
{
diff --git a/ry-xinli-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java b/ry-xinli-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java
index e888e97b..af665f73 100644
--- a/ry-xinli-common/src/main/java/com/ddnai/common/utils/poi/ExcelUtil.java
+++ b/ry-xinli-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.XinliConfig;
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 = XinliConfig.getDownloadPath() + filename;
File desc = new File(downloadPath);
if (!desc.getParentFile().exists())
{
diff --git a/ry-xinli-framework/src/main/java/com/ddnai/framework/config/FastJson2JsonRedisSerializer.java b/ry-xinli-framework/src/main/java/com/ddnai/framework/config/FastJson2JsonRedisSerializer.java
index 2aa51183..98c334d4 100644
--- a/ry-xinli-framework/src/main/java/com/ddnai/framework/config/FastJson2JsonRedisSerializer.java
+++ b/ry-xinli-framework/src/main/java/com/ddnai/framework/config/FastJson2JsonRedisSerializer.java
@@ -16,7 +16,7 @@ import com.ddnai.common.core.domain.model.LoginUser;
/**
* Redis使用FastJson序列化
*
- * @author ruoyi
+ * @author ddnai
*/
public class FastJson2JsonRedisSerializer implements RedisSerializer
{
diff --git a/ry-xinli-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java b/ry-xinli-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java
index 61cb3414..7d39c03d 100644
--- a/ry-xinli-framework/src/main/java/com/ddnai/framework/config/ResourcesConfig.java
+++ b/ry-xinli-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.XinliConfig;
import com.ddnai.common.constant.Constants;
import com.ddnai.framework.interceptor.RepeatSubmitInterceptor;
@@ -31,7 +31,7 @@ public class ResourcesConfig implements WebMvcConfigurer
{
/** 本地文件上传路径 */
registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**")
- .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+ .addResourceLocations("file:" + XinliConfig.getProfile() + "/");
/** swagger配置 */
registry.addResourceHandler("/swagger-ui/**")
diff --git a/ry-xinli-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java b/ry-xinli-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java
index fe4618ae..33fd3fe0 100644
--- a/ry-xinli-framework/src/main/java/com/ddnai/framework/web/service/PermissionService.java
+++ b/ry-xinli-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首字母
+ * Xinli自定义权限实现，ss取自SpringSecurity首字母
*
* @author ddnai
*/
diff --git a/ry-xinli-generator/src/main/java/com/ddnai/generator/controller/GenController.java b/ry-xinli-generator/src/main/java/com/ddnai/generator/controller/GenController.java
index 740d5853..393e8785 100644
--- a/ry-xinli-generator/src/main/java/com/ddnai/generator/controller/GenController.java
+++ b/ry-xinli-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=\"xinli.zip\"");
response.addHeader("Content-Length", "" + data.length);
response.setContentType("application/octet-stream; charset=UTF-8");
IOUtils.write(data, response.getOutputStream());
diff --git a/ry-xinli-generator/src/main/java/com/ddnai/generator/util/GenUtils.java b/ry-xinli-generator/src/main/java/com/ddnai/generator/util/GenUtils.java
index b24ada7e..65953953 100644
--- a/ry-xinli-generator/src/main/java/com/ddnai/generator/util/GenUtils.java
+++ b/ry-xinli-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/ry-xinli-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java b/ry-xinli-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java
index 35a2ff59..6e4bb741 100644
--- a/ry-xinli-quartz/src/main/java/com/ddnai/quartz/config/ScheduleConfig.java
+++ b/ry-xinli-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", "XinliScheduler");
// 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("XinliScheduler");
// // 延时启动
// factory.setStartupDelay(1);
// factory.setApplicationContextSchedulerContextKey("applicationContextKey");
diff --git a/xinli-ui/README.md b/xinli-ui/README.md
index 6398ee21..3d1c4d05 100644
--- a/xinli-ui/README.md
+++ b/xinli-ui/README.md
@@ -5,7 +5,7 @@
git clone https://github.com/ddnai/ry-xinli.git
# 进入项目目录
-cd ruoyi-ui
+cd xinli-ui
# 安装依赖
npm install
@@ -32,6 +32,6 @@ npm run build:prod
## 说明
本项目基于-Vue框架定制开发，已进行以下定制化改造：
-- 项目包名：com.ruoyi.* → com.ddnai.*
-- 模块命名：ruoyi-* → ry-xinli-*
+- 项目包名：com.ddnai.*
+- 模块命名：ry-xinli-*
- 品牌标识：全面更换为"AI心理健康测评系统"
\ No newline at end of file
diff --git a/xinli-ui/src/api/system/user.js b/xinli-ui/src/api/system/user.js
index b5e3edd8..fee80add 100644
--- a/xinli-ui/src/api/system/user.js
+++ b/xinli-ui/src/api/system/user.js
@@ -1,5 +1,5 @@
import request from '@/utils/request'
-import { parseStrEmpty } from "@/utils/ruoyi";
+import { parseStrEmpty } from "@/utils/common";
// 查询用户列表
export function listUser(query) {
diff --git a/xinli-ui/src/assets/styles/ruoyi.scss b/xinli-ui/src/assets/styles/common.scss
similarity index 100%
rename from xinli-ui/src/assets/styles/ruoyi.scss
rename to xinli-ui/src/assets/styles/common.scss
diff --git a/xinli-ui/src/components/Common/Doc/index.vue b/xinli-ui/src/components/Common/Doc/index.vue
new file mode 100644
index 00000000..3467e8e7
--- /dev/null
+++ b/xinli-ui/src/components/Common/Doc/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/xinli-ui/src/components/Common/Git/index.vue b/xinli-ui/src/components/Common/Git/index.vue
new file mode 100644
index 00000000..4f7d3967
--- /dev/null
+++ b/xinli-ui/src/components/Common/Git/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/xinli-ui/src/layout/components/Navbar.vue b/xinli-ui/src/layout/components/Navbar.vue
index c2a2bdf8..b96cefa8 100644
--- a/xinli-ui/src/layout/components/Navbar.vue
+++ b/xinli-ui/src/layout/components/Navbar.vue
@@ -50,8 +50,8 @@ import Hamburger from '@/components/Hamburger'
import Screenfull from '@/components/Screenfull'
import SizeSelect from '@/components/SizeSelect'
import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import CommonGit from '@/components/Common/Git'
+import CommonDoc from '@/components/Common/Doc'
export default {
emits: ['setLayout'],
@@ -62,8 +62,8 @@ export default {
Screenfull,
SizeSelect,
Search,
- RuoYiGit,
- RuoYiDoc
+ CommonGit,
+ CommonDoc
},
mounted() {
console.log('=== Navbar Debug ===');
diff --git a/xinli-ui/src/main.js b/xinli-ui/src/main.js
index da017509..177b7485 100644
--- a/xinli-ui/src/main.js
+++ b/xinli-ui/src/main.js
@@ -6,7 +6,7 @@ import Element from 'element-ui'
import './assets/styles/element-variables.scss'
import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/ruoyi.scss' // ruoyi css
+import '@/assets/styles/common.scss' // common css
import App from './App'
import store from './store'
import router from './router'
@@ -18,7 +18,7 @@ import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data"
import { getConfigKey } from "@/api/system/config"
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi"
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/common"
// 分页组件
import Pagination from "@/components/Pagination"
// 自定义表格工具组件
diff --git a/xinli-ui/src/plugins/download.js b/xinli-ui/src/plugins/download.js
index 8dc83eaa..445a57ac 100644
--- a/xinli-ui/src/plugins/download.js
+++ b/xinli-ui/src/plugins/download.js
@@ -3,7 +3,7 @@ import {Loading, Message} from 'element-ui'
import { saveAs } from 'file-saver'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
-import { blobValidate } from "@/utils/ruoyi"
+import { blobValidate } from "@/utils/common"
const baseURL = process.env.VUE_APP_BASE_API
let downloadLoadingInstance
diff --git a/xinli-ui/src/services/report/DynamicContentService.js b/xinli-ui/src/services/report/DynamicContentService.js
index 0b968491..b601e002 100644
--- a/xinli-ui/src/services/report/DynamicContentService.js
+++ b/xinli-ui/src/services/report/DynamicContentService.js
@@ -1,4 +1,4 @@
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/common'
const SEVERITY_META = {
normal: { color: '#67C23A', keywords: ['情绪稳定', '低风险'], scope: '常规打印' },
diff --git a/xinli-ui/src/utils/ruoyi.js b/xinli-ui/src/utils/common.js
similarity index 100%
rename from xinli-ui/src/utils/ruoyi.js
rename to xinli-ui/src/utils/common.js
diff --git a/xinli-ui/src/utils/dict/Dict.js b/xinli-ui/src/utils/dict/Dict.js
index 994f6f7e..f1846cde 100644
--- a/xinli-ui/src/utils/dict/Dict.js
+++ b/xinli-ui/src/utils/dict/Dict.js
@@ -1,5 +1,5 @@
import Vue from 'vue'
-import { mergeRecursive } from "@/utils/ruoyi"
+import { mergeRecursive } from "@/utils/common"
import DictMeta from './DictMeta'
import DictData from './DictData'
diff --git a/xinli-ui/src/utils/dict/DictMeta.js b/xinli-ui/src/utils/dict/DictMeta.js
index 617cc00a..3867cf11 100644
--- a/xinli-ui/src/utils/dict/DictMeta.js
+++ b/xinli-ui/src/utils/dict/DictMeta.js
@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi"
+import { mergeRecursive } from "@/utils/common"
import DictOptions from './DictOptions'
/**
diff --git a/xinli-ui/src/utils/dict/DictOptions.js b/xinli-ui/src/utils/dict/DictOptions.js
index 5fd14257..ed476292 100644
--- a/xinli-ui/src/utils/dict/DictOptions.js
+++ b/xinli-ui/src/utils/dict/DictOptions.js
@@ -1,4 +1,4 @@
-import { mergeRecursive } from "@/utils/ruoyi"
+import { mergeRecursive } from "@/utils/common"
import dictConverter from './DictConverter'
export const options = {
diff --git a/xinli-ui/src/utils/index.js b/xinli-ui/src/utils/index.js
index 9375db7f..09bdc7c3 100644
--- a/xinli-ui/src/utils/index.js
+++ b/xinli-ui/src/utils/index.js
@@ -1,4 +1,4 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from './common'
/**
* 表格时间格式化
diff --git a/xinli-ui/src/utils/request.js b/xinli-ui/src/utils/request.js
index 032c9441..6cf1783a 100644
--- a/xinli-ui/src/utils/request.js
+++ b/xinli-ui/src/utils/request.js
@@ -3,7 +3,7 @@ import { Notification, MessageBox, Message, Loading } from 'element-ui'
import store from '@/store'
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from "@/utils/ruoyi"
+import { tansParams, blobValidate } from "@/utils/common"
import cache from '@/plugins/cache'
import { saveAs } from 'file-saver'
diff --git a/xinli-ui/src/views/index.vue b/xinli-ui/src/views/index.vue
index b90462f6..b2b96888 100644
--- a/xinli-ui/src/views/index.vue
+++ b/xinli-ui/src/views/index.vue
@@ -126,7 +126,7 @@ import {
addPortalComment,
likePortalContent
} from "@/api/portal/website"
-import { parseTime } from "@/utils/ruoyi"
+import { parseTime } from "@/utils/common"
export default {
name: "Index",
diff --git a/xinli-ui/src/views/monitor/job/index.vue b/xinli-ui/src/views/monitor/job/index.vue
index 783873ff..7a415e45 100644
--- a/xinli-ui/src/views/monitor/job/index.vue
+++ b/xinli-ui/src/views/monitor/job/index.vue
@@ -178,8 +178,8 @@
调用方法
- Bean调用示例：ryTask.ryParams('ry')
-
Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+ Bean调用示例：xinliTask.xinliParams('xinli')
+
Class类调用示例：com.ddnai.quartz.task.XinliTask.xinliParams('xinli')
参数说明：支持字符串，布尔类型，长整型，浮点型，整型
diff --git a/xinli-ui/src/views/psychology/assessment/analysis.vue b/xinli-ui/src/views/psychology/assessment/analysis.vue
index c0bc16f6..9b4a38eb 100644
--- a/xinli-ui/src/views/psychology/assessment/analysis.vue
+++ b/xinli-ui/src/views/psychology/assessment/analysis.vue
@@ -305,7 +305,7 @@ import * as echarts from 'echarts'
require('echarts/theme/macarons')
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/common'
import {
getAssessmentAnalytics,
getStudentOptions,
diff --git a/xinli-ui/src/views/psychology/report/comprehensive.vue b/xinli-ui/src/views/psychology/report/comprehensive.vue
index eb93da88..95e22b6b 100644
--- a/xinli-ui/src/views/psychology/report/comprehensive.vue
+++ b/xinli-ui/src/views/psychology/report/comprehensive.vue
@@ -132,7 +132,7 @@
import { getUserAssessmentSummary, getStudentOptions, listAssessment } from '@/api/psychology/assessment'
import { getProfileByUserId, listProfile } from '@/api/psychology/profile'
import { getReport, listReport } from '@/api/psychology/report'
-import { parseTime } from '@/utils/ruoyi'
+import { parseTime } from '@/utils/common'
import axios from 'axios'
export default {
diff --git a/xinli-ui/src/views/tool/gen/genInfoForm.vue b/xinli-ui/src/views/tool/gen/genInfoForm.vue
index 60d9e87d..321f158b 100644
--- a/xinli-ui/src/views/tool/gen/genInfoForm.vue
+++ b/xinli-ui/src/views/tool/gen/genInfoForm.vue
@@ -24,7 +24,7 @@
生成包路径
-
+
diff --git a/xinli-ui/src/views/tool/gen/index.vue b/xinli-ui/src/views/tool/gen/index.vue
index 83c026fb..dc7fc80c 100644
--- a/xinli-ui/src/views/tool/gen/index.vue
+++ b/xinli-ui/src/views/tool/gen/index.vue
@@ -266,7 +266,7 @@ export default {
this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
})
} else {
- this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip")
+ this.$download.zip("/tool/gen/batchGenCode?tables=" + tableNames, "xinli.zip")
}
},
/** 同步数据库操作 */
diff --git a/xinli-ui/vue.config.js b/xinli-ui/vue.config.js
index f96753f2..34c2383c 100644
--- a/xinli-ui/vue.config.js
+++ b/xinli-ui/vue.config.js
@@ -70,7 +70,7 @@ module.exports = {
}
},
plugins: [
- // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+ // 使用gzip解压缩静态文件
new CompressionPlugin({
cache: false, // 不启用文件缓存
test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i, // 压缩文件格式