版本规整V6

cds-fontend-2025.V1/src/typings/components.d.ts

@@ -27,31 +27,12 @@ declare module 'vue' {
     FullScreen: typeof import('./../components/common/full-screen.vue')['default']
     IconAntDesignEnterOutlined: typeof import('~icons/ant-design/enter-outlined')['default']
     IconAntDesignReloadOutlined: typeof import('~icons/ant-design/reload-outlined')['default']
-    IconAntDesignSettingOutlined: typeof import('~icons/ant-design/setting-outlined')['default']
-    IconEpCopyDocument: typeof import('~icons/ep/copy-document')['default']
     IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default']
     IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default']
-    'IconHugeicons:configuration01': typeof import('~icons/hugeicons/configuration01')['default']
-    IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default']
-    IconIcRoundSearch: typeof import('~icons/ic/round-search')['default']
-    'IconMaterialSymbols:add': typeof import('~icons/material-symbols/add')['default']
-    'IconMaterialSymbols:deleteOutline': typeof import('~icons/material-symbols/delete-outline')['default']
-    'IconMaterialSymbols:downloadRounded': typeof import('~icons/material-symbols/download-rounded')['default']
-    'IconMaterialSymbols:imageOutline': typeof import('~icons/material-symbols/image-outline')['default']
-    'IconMaterialSymbols:refreshRounded': typeof import('~icons/material-symbols/refresh-rounded')['default']
-    'IconMaterialSymbols:syncOutline': typeof import('~icons/material-symbols/sync-outline')['default']
-    'IconMaterialSymbols:uploadRounded': typeof import('~icons/material-symbols/upload-rounded')['default']
-    'IconMaterialSymbols:warningOutlineRounded': typeof import('~icons/material-symbols/warning-outline-rounded')['default']
-    IconMaterialSymbolsAddRounded: typeof import('~icons/material-symbols/add-rounded')['default']
-    IconMaterialSymbolsDeleteOutline: typeof import('~icons/material-symbols/delete-outline')['default']
-    IconMaterialSymbolsDriveFileRenameOutlineOutline: typeof import('~icons/material-symbols/drive-file-rename-outline-outline')['default']
     IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']
     IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default']
-    IconMdiDrag: typeof import('~icons/mdi/drag')['default']
     IconMdiKeyboardEsc: typeof import('~icons/mdi/keyboard-esc')['default']
     IconMdiKeyboardReturn: typeof import('~icons/mdi/keyboard-return')['default']
-    'IconQuill:collapse': typeof import('~icons/quill/collapse')['default']
-    'IconQuill:expand': typeof import('~icons/quill/expand')['default']
     IconUilSearch: typeof import('~icons/uil/search')['default']
     JsonPreview: typeof import('./../components/custom/json-preview.vue')['default']
     LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
@@ -69,21 +50,16 @@ declare module 'vue' {
     NButton: typeof import('naive-ui')['NButton']
     NCard: typeof import('naive-ui')['NCard']
     NCheckbox: typeof import('naive-ui')['NCheckbox']
-    NCheckboxGroup: typeof import('naive-ui')['NCheckboxGroup']
-    NCode: typeof import('naive-ui')['NCode']
     NCollapse: typeof import('naive-ui')['NCollapse']
     NCollapseItem: typeof import('naive-ui')['NCollapseItem']
     NColorPicker: typeof import('naive-ui')['NColorPicker']
     NDataTable: typeof import('naive-ui')['NDataTable']
     NDatePicker: typeof import('naive-ui')['NDatePicker']
-    NDescriptions: typeof import('naive-ui')['NDescriptions']
-    NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
     NDivider: typeof import('naive-ui')['NDivider']
     NDrawer: typeof import('naive-ui')['NDrawer']
     NDrawerContent: typeof import('naive-ui')['NDrawerContent']
     NDropdown: typeof import('naive-ui')['NDropdown']
-    NDynamicInput: typeof import('naive-ui')['NDynamicInput']
     NEllipsis: typeof import('naive-ui')['NEllipsis']
     NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
@@ -94,8 +70,6 @@ declare module 'vue' {
     NGridItem: typeof import('naive-ui')['NGridItem']
     NInput: typeof import('naive-ui')['NInput']
     NInputGroup: typeof import('naive-ui')['NInputGroup']
-    NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel']
-    NInputNumber: typeof import('naive-ui')['NInputNumber']
     NLayout: typeof import('naive-ui')['NLayout']
     NLayoutContent: typeof import('naive-ui')['NLayoutContent']
     NLayoutSider: typeof import('naive-ui')['NLayoutSider']
@@ -108,7 +82,6 @@ declare module 'vue' {
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NRadio: typeof import('naive-ui')['NRadio']
-    NRadioButton: typeof import('naive-ui')['NRadioButton']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
@@ -117,8 +90,6 @@ declare module 'vue' {
     NStatistic: typeof import('naive-ui')['NStatistic']
     NSwitch: typeof import('naive-ui')['NSwitch']
     NTab: typeof import('naive-ui')['NTab']
-    NTable: typeof import('naive-ui')['NTable']
-    NTabPane: typeof import('naive-ui')['NTabPane']
     NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
     NText: typeof import('naive-ui')['NText']

cds-fontend-2025.V1/src/views/home/index.vue

@@ -219,20 +219,71 @@ const activityColumns = [
   }
 ]
 
+// 转换为相对时间
+function getRelativeTime(timeString) {
+  const inputTime = new Date(timeString);
+
+  if (isNaN(inputTime.getTime())) {
+    throw new Error("无效的时间格式");
+  }
+
+  const now = new Date();
+  const diffInSeconds = Math.floor((now - inputTime) / 1000);
+
+  if (diffInSeconds < 0) {
+    return "未来时间";
+  } else if (diffInSeconds < 60) {
+    return "刚刚";
+  }
+
+  const diffInMinutes = Math.floor(diffInSeconds / 60);
+  if (diffInMinutes < 60) {
+    return `${diffInMinutes}分钟前`;
+  }
+
+  const diffInHours = Math.floor(diffInMinutes / 60);
+  if (diffInHours < 24) {
+    return `${diffInHours}小时前`;
+  }
+
+  const diffInDays = Math.floor(diffInHours / 24);
+  if (diffInDays < 7) {
+    return `${diffInDays}天前`;
+  }
+
+  const diffInWeeks = Math.floor(diffInDays / 7);
+  if (diffInWeeks < 4) {
+    return `${diffInWeeks}周前`;
+  }
+
+  const diffInMonths = Math.floor(diffInDays / 30);
+  if (diffInMonths < 12) {
+    return `${diffInMonths}个月前`;
+  }
+
+  const diffInYears = Math.floor(diffInDays / 365);
+  return `${diffInYears}年前`;
+}
+
 // 测试登录用户信息
 onMounted(() => {
-  //console.log(JSON.stringify(userInfo));
+  console.log(JSON.stringify(userInfo));
   //console.log("是否营销:" + userInfo.user.userCategory);
   //console.log("营销编号:" + userInfo.user.mktNo);
   //console.log("营销编号:" + userInfo.dept.deptCategory);
 
   //根据用户部门判断是否管理用户
+  //!!用户部门不可能为空的,测试时乱修改会造成为空情况,暂时这么写
+  if(userInfo.dept == null){
+    isAdmin = true;
+  }else{
   isAdmin =
     (
       userInfo.dept.deptCategory === '251009999'
       || userInfo.dept.deptCategory === '251000099'
       || userInfo.dept.deptId === '100'
     );
+  }
 
   // 当用户是管理用户时,登陆后即异步查询所有用户信息,暂时mock数据
   if(isAdmin.value){
@@ -259,7 +310,7 @@ onMounted(() => {
       { category: '其他', amount: 15129.06, percentage: 26, trend: 'down', growth: -3.4 }
     ];
     adminData.value.recentActivities = [
-      { user: userInfo.user.nickName, action: '录入营销数据', time: '5分钟前', type: 'update' },
+      { user: userInfo.user.nickName, action: '录入营销数据', time: getRelativeTime('2025-09-04 15:07:12'), type: 'update' },
       { user: userInfo.user.nickName, action: '录入营销数据', time: '30分钟前', type: 'import' },
       { user: userInfo.user.nickName, action: '新增业务类型', time: '2小时前', type: 'submit' },
       { user: userInfo.user.nickName, action: '修改分成比例', time: '昨天', type: 'review' },

cds-platform-2025.V1/cds-admin/pom.xml

@@ -54,50 +54,50 @@
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-doc</artifactId>
+            <artifactId>cds-common-doc</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-social</artifactId>
+            <artifactId>cds-common-social</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-ratelimiter</artifactId>
+            <artifactId>cds-common-ratelimiter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-mail</artifactId>
+            <artifactId>cds-common-mail</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-system</artifactId>
+            <artifactId>cds-system</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-job</artifactId>
+            <artifactId>cds-job</artifactId>
         </dependency>
 
         <!-- 代码生成-->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-generator</artifactId>
+            <artifactId>cds-generator</artifactId>
         </dependency>
 
         <!--  demo模块  -->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-demo</artifactId>
+            <artifactId>cds-demo</artifactId>
         </dependency>
 
         <!--  工作流模块  -->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-workflow</artifactId>
+            <artifactId>cds-workflow</artifactId>
         </dependency>
 
         <dependency>

cds-platform-2025.V1/cds-admin/src/main/resources/application-prod.yml

@@ -41,7 +41,7 @@ spring:
     dynamic:
       # 性能分析插件(有性能损耗 不建议生产环境使用)
       # 投产初期,暂时打开
-      p6spy: true
+      p6spy: false
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
       # 严格模式 匹配不到数据源则报错

cds-platform-2025.V1/cds-common/cds-common-bom/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.dromara</groupId>
-    <artifactId>ruoyi-common-bom</artifactId>
+    <artifactId>cds-common-bom</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
     <description>
-        ruoyi-common-bom common依赖项
+        cds-common-bom common依赖项
     </description>
 
     <properties>
@@ -22,160 +22,160 @@
             <!-- 核心模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-core</artifactId>
+                <artifactId>cds-common-core</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 接口模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-doc</artifactId>
+                <artifactId>cds-common-doc</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- excel -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-excel</artifactId>
+                <artifactId>cds-common-excel</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 幂等 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-idempotent</artifactId>
+                <artifactId>cds-common-idempotent</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 调度模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-job</artifactId>
+                <artifactId>cds-common-job</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 日志记录 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-log</artifactId>
+                <artifactId>cds-common-log</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 邮件服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-mail</artifactId>
+                <artifactId>cds-common-mail</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据库服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-mybatis</artifactId>
+                <artifactId>cds-common-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- OSS -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-oss</artifactId>
+                <artifactId>cds-common-oss</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 限流 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-ratelimiter</artifactId>
+                <artifactId>cds-common-ratelimiter</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 缓存服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-redis</artifactId>
+                <artifactId>cds-common-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- satoken -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-satoken</artifactId>
+                <artifactId>cds-common-satoken</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 安全模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-security</artifactId>
+                <artifactId>cds-common-security</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 短信模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sms</artifactId>
+                <artifactId>cds-common-sms</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-social</artifactId>
+                <artifactId>cds-common-social</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- web服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-web</artifactId>
+                <artifactId>cds-common-web</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 翻译模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-translation</artifactId>
+                <artifactId>cds-common-translation</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 脱敏模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sensitive</artifactId>
+                <artifactId>cds-common-sensitive</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 序列化模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-json</artifactId>
+                <artifactId>cds-common-json</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据库加解密模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-encrypt</artifactId>
+                <artifactId>cds-common-encrypt</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 租户模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-tenant</artifactId>
+                <artifactId>cds-common-tenant</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- WebSocket模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-websocket</artifactId>
+                <artifactId>cds-common-websocket</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- SSE模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sse</artifactId>
+                <artifactId>cds-common-sse</artifactId>
                 <version>${revision}</version>
             </dependency>
 

cds-platform-2025.V1/cds-common/cds-common-core/pom.xml

@@ -4,15 +4,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-common</artifactId>
+        <artifactId>cds-common</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common-core</artifactId>
+    <artifactId>cds-common-core</artifactId>
 
     <description>
-        ruoyi-common-core 核心模块
+        cds-common-core 核心模块
     </description>
 
     <dependencies>

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/constant/Constants.java

@@ -3,7 +3,7 @@ package org.dromara.common.core.constant;
 /**
  * 通用常量信息
  *
- * @author ruoyi
+ * @author cds
  */
 public interface Constants {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 /**
  * 当前在线会话
  *
- * @author ruoyi
+ * @author cds
  */
 
 @Data

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 /**
  * 用户状态
  *
- * @author ruoyi
+ * @author cds
  */
 @Getter
 @AllArgsConstructor

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java

@@ -7,7 +7,7 @@ import java.io.Serial;
 /**
  * 业务异常
  *
- * @author ruoyi
+ * @author cds
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java

@@ -12,7 +12,7 @@ import java.io.Serial;
 /**
  * 基础异常
  *
- * @author ruoyi
+ * @author cds
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java

@@ -7,7 +7,7 @@ import java.io.Serial;
 /**
  * 文件信息异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class FileException extends BaseException {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java

@@ -5,7 +5,7 @@ import java.io.Serial;
 /**
  * 文件名称超长限制异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class FileNameLengthLimitExceededException extends FileException {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java

@@ -5,7 +5,7 @@ import java.io.Serial;
 /**
  * 文件名大小限制异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class FileSizeLimitExceededException extends FileException {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java

@@ -5,7 +5,7 @@ import java.io.Serial;
 /**
  * 验证码错误异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class CaptchaException extends UserException {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java

@@ -5,7 +5,7 @@ import java.io.Serial;
 /**
  * 验证码失效异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class CaptchaExpireException extends UserException {
 

cds-platform-2025.V1/cds-common/cds-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java

@@ -7,7 +7,7 @@ import java.io.Serial;
 /**
  * 用户信息异常类
  *
- * @author ruoyi
+ * @author cds
  */
 public class UserException extends BaseException {