统一回复体和分页查询返回体国际化完成

ruoyi-admin/src/main/resources/application-dev.yml

@@ -186,7 +186,7 @@ sms:
             sdk-app-id: 您的sdkAppId
 
 logging:
-    config: classpath:logback-plus-nofile.xml
+    config: classpath:logback-plus-without-file.xml
 
 captcha:
     # 是否启用验证码校验

ruoyi-admin/src/main/resources/application-prod.yml

@@ -189,7 +189,7 @@ sms:
             sdk-app-id: 您的sdkAppId
 
 logging:
-    config: classpath:logback-plus-withfile.xml
+    config: classpath:logback-plus-with-file.xml
 
 captcha:
     # 是否启用验证码校验

ruoyi-admin/src/main/resources/application-test.yml

@@ -186,7 +186,7 @@ sms:
             sdk-app-id: 您的sdkAppId
 
 logging:
-    config: classpath:logback-plus-nofile.xml
+    config: classpath:logback-plus-without-file.xml
 
 captcha:
     # 是否启用验证码校验

ruoyi-admin/src/main/resources/i18n/messages_en_US.properties

@@ -60,3 +60,9 @@ tenant.number.not.blank=Tenant number cannot be blank
 tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator
 tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator
 tenant.expired=Sorry, your tenant has expired. Please contact the administrator.
+##统一返回体
+r.ok=Success
+r.fail=Fail
+##分页返回体
+table.data.info.success=Query success.
+table.data.info.fail=Query fail.

ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -60,3 +60,9 @@ tenant.number.not.blank=租户编号不能为空
 tenant.not.exists=对不起, 您的租户不存在，请联系管理员
 tenant.blocked=对不起，您的租户已禁用，请联系管理员
 tenant.expired=对不起，您的租户已过期，请联系管理员
+##统一返回体
+r.ok=操作成功
+r.fail=操作失败
+##分页返回体
+table.data.info.success=查询成功
+table.data.info.fail=查询失败

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java

@@ -3,6 +3,7 @@ package org.dromara.common.core.domain;
 import org.dromara.common.core.constant.HttpStatus;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.MessageUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -36,11 +37,11 @@ public class R<T> implements Serializable {
     private T data;
 
     public static <T> R<T> ok() {
-        return restResult(null, SUCCESS, "操作成功");
+        return restResult(null, SUCCESS, MessageUtils.message("r.ok"));
     }
 
     public static <T> R<T> ok(T data) {
-        return restResult(data, SUCCESS, "操作成功");
+        return restResult(data, SUCCESS, MessageUtils.message("r.ok"));
     }
 
     public static <T> R<T> ok(String msg) {
@@ -52,7 +53,7 @@ public class R<T> implements Serializable {
     }
 
     public static <T> R<T> fail() {
-        return restResult(null, FAIL, "操作失败");
+        return restResult(null, FAIL, MessageUtils.message("r.ok"));
     }
 
     public static <T> R<T> fail(String msg) {
@@ -60,7 +61,7 @@ public class R<T> implements Serializable {
     }
 
     public static <T> R<T> fail(T data) {
-        return restResult(data, FAIL, "操作失败");
+        return restResult(data, FAIL, MessageUtils.message("r.fail"));
     }
 
     public static <T> R<T> fail(String msg, T data) {

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java

@@ -5,6 +5,7 @@ import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.MessageUtils;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -52,7 +53,7 @@ public class TableDataInfo<T> implements Serializable {
         this.rows = list;
         this.total = total;
         this.code = HttpStatus.HTTP_OK;
-        this.msg = "查询成功";
+        this.msg = MessageUtils.message("table.data.info.success");
     }
 
     /**
@@ -61,7 +62,7 @@ public class TableDataInfo<T> implements Serializable {
     public static <T> TableDataInfo<T> build(IPage<T> page) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
+        rspData.setMsg(MessageUtils.message("table.data.info.success"));
         rspData.setRows(page.getRecords());
         rspData.setTotal(page.getTotal());
         return rspData;
@@ -73,7 +74,7 @@ public class TableDataInfo<T> implements Serializable {
     public static <T> TableDataInfo<T> build(List<T> list) {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
+        rspData.setMsg(MessageUtils.message("table.data.info.success"));
         rspData.setRows(list);
         rspData.setTotal(list.size());
         return rspData;
@@ -85,7 +86,7 @@ public class TableDataInfo<T> implements Serializable {
     public static <T> TableDataInfo<T> build() {
         TableDataInfo<T> rspData = new TableDataInfo<>();
         rspData.setCode(HttpStatus.HTTP_OK);
-        rspData.setMsg("查询成功");
+        rspData.setMsg(MessageUtils.message("table.data.info.success"));
         return rspData;
     }
 

script/sql/business/create.sql

@@ -1,9 +1,17 @@
 CREATE TABLE `project`
 (
     `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
+    `code`        varchar(128)                NOT NULL COMMENT '项目编号',
     `name`        varchar(128)                NOT NULL COMMENT '名称',
     `icon`        bigint                      NOT NULL COMMENT '图标',
+    `language`    char(1)                     NOT NULL DEFAULT '0' COMMENT '项目语言',
+    `type`        char(1)                     NOT NULL DEFAULT '0' COMMENT '项目类型',
     `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
+    `pd_gpd`      bigint unsigned COMMENT 'PD/GPD',
+    `pm_gpm`      bigint unsigned COMMENT 'PM/GPM',
+    `cta_gcta`    bigint unsigned COMMENT 'CTA/GCTA',
+    `sponsor`     varchar(128) COMMENT '申办方',
+    `cro`         bigint unsigned COMMENT 'CRO',
     `note`        varchar(255) COMMENT '备注',
     `create_dept` bigint(20) COMMENT '创建部门',
     `create_by`   bigint(20) COMMENT '创建者',
@@ -15,28 +23,14 @@ CREATE TABLE `project`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='项目';
 
-CREATE TABLE `country`
+CREATE TABLE `folder`
 (
     `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
     `project_id`  bigint unsigned             NOT NULL COMMENT '所属项目',
-    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
-    `note`        varchar(255) COMMENT '备注',
-    `create_dept` bigint(20) COMMENT '创建部门',
-    `create_by`   bigint(20) COMMENT '创建者',
-    `create_time` datetime COMMENT '创建时间',
-    `update_by`   bigint(20) COMMENT '更新者',
-    `update_time` datetime COMMENT '更新时间',
-    `del_flag`    char(1)                              DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
-    `tenant_id`   varchar(40) COMMENT '租户id'
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='国家';
-
-CREATE TABLE `center`
-(
-    `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
-    `country_id`  bigint unsigned             NOT NULL COMMENT '所属国家',
+    `parent_id`   bigint unsigned             NOT NULL COMMENT '父级',
+    `parent_type` tinyint(1)                  NOT NULL COMMENT '父级类型',
+    `type`        tinyint(1)                  NOT NULL COMMENT '层级类型',
     `name`        varchar(128)                NOT NULL COMMENT '名称',
-    `icon`        bigint                      NOT NULL COMMENT '图标',
     `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
     `note`        varchar(255) COMMENT '备注',
     `create_dept` bigint(20) COMMENT '创建部门',
@@ -47,17 +41,13 @@ CREATE TABLE `center`
     `del_flag`    char(1)                              DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
     `tenant_id`   varchar(40) COMMENT '租户id'
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='中心';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='文件夹';
 
-CREATE TABLE `folder`
+CREATE TABLE `folder_permission`
 (
     `id`          bigint unsigned PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '序号',
-    `parent_id`   bigint unsigned             NOT NULL COMMENT '父级',
-    `parent_type` tinyint(1)                  NOT NULL COMMENT '父级类型',
-    `type`        tinyint(1)                  NOT NULL COMMENT '层级类型',
-    `name`        varchar(128)                NOT NULL COMMENT '名称',
-    `status`      tinyint(1)                  NOT NULL DEFAULT 0 COMMENT '状态',
-    `note`        varchar(255) COMMENT '备注',
+    `folder_id`   bigint unsigned             NOT NULL COMMENT '所属文件夹',
+    `edit`        tinyint(1) unsigned         NOT NULL DEFAULT 0 COMMENT '编辑权限',
     `create_dept` bigint(20) COMMENT '创建部门',
     `create_by`   bigint(20) COMMENT '创建者',
     `create_time` datetime COMMENT '创建时间',
@@ -66,7 +56,7 @@ CREATE TABLE `folder`
     `del_flag`    char(1)                              DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
     `tenant_id`   varchar(40) COMMENT '租户id'
 ) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='文件夹';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='文件权限';
 
 CREATE TABLE `file`
 (