From 96b71e4f8d752b37bdeda78012d5d7e15315c521 Mon Sep 17 00:00:00 2001 From: zhaojun <873019219@qq.com> Date: Sun, 5 Mar 2023 15:16:55 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E9=A6=96=E9=A1=B5=20Logo=20=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=8A=9F=E8=83=BD=EF=BC=8CLogo=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E3=80=82=20=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/model/dto/SystemConfigDTO.java | 32 ++++++++++++++++--- .../request/UpdateSiteSettingRequest.java | 13 +++++++- .../request/UpdateViewSettingRequest.java | 12 +++++++ .../config/model/result/SiteConfigResult.java | 27 ++++++++++++++-- ...system_config_add_field_load_more_size.sql | 2 ++ ...system_config_add_field_site_home_name.sql | 4 +++ ...em_config_add_field_default_sort_field.sql | 2 ++ ...system_config_add_field_load_more_size.sql | 2 ++ ...system_config_add_field_site_home_name.sql | 4 +++ ...em_config_add_field_default_sort_field.sql | 2 ++ 10 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/db/migration-mysql/V14__system_config_add_field_load_more_size.sql create mode 100644 src/main/resources/db/migration-mysql/V15__system_config_add_field_site_home_name.sql create mode 100644 src/main/resources/db/migration-mysql/V16__system_config_add_field_default_sort_field.sql create mode 100644 src/main/resources/db/migration-sqlite/V14__system_config_add_field_load_more_size.sql create mode 100644 src/main/resources/db/migration-sqlite/V15__system_config_add_field_site_home_name.sql create mode 100644 src/main/resources/db/migration-sqlite/V16__system_config_add_field_default_sort_field.sql diff --git a/src/main/java/im/zhaojun/zfile/module/config/model/dto/SystemConfigDTO.java b/src/main/java/im/zhaojun/zfile/module/config/model/dto/SystemConfigDTO.java index 3f6cff9..f5bc6cc 100644 --- a/src/main/java/im/zhaojun/zfile/module/config/model/dto/SystemConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/module/config/model/dto/SystemConfigDTO.java @@ -119,14 +119,38 @@ public class SystemConfigDTO { @ApiModelProperty(value = "默认文件点击习惯", example = "click") private FileClickModeEnum fileClickMode; - + @ApiModelProperty(value = "最大同时上传文件数", example = "5") private Integer maxFileUploads; - + @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") private String onlyOfficeUrl; - + @ApiModelProperty(value = "是否允许路径直链可直接访问", example = "true", required = true) private Boolean allowPathLinkAnonAccess; - + + @ApiModelProperty(value = "默认最大显示文件数", example = "1000") + private Integer maxShowSize; + + @ApiModelProperty(value = "每次加载更多文件数", example = "50") + private Integer loadMoreSize; + + @ApiModelProperty(value = "默认排序字段", example = "name") + private String defaultSortField; + + @ApiModelProperty(value = "默认排序方向", example = "asc") + private String defaultSortOrder; + + @ApiModelProperty(value = "站点 Home 名称", example = "xxx 的小站") + private String siteHomeName; + + @ApiModelProperty(value = "站点 Home Logo", example = "true") + private String siteHomeLogo; + + @ApiModelProperty(value = "站点 Logo 点击后链接", example = "https://www.zfile.vip") + private String siteHomeLogoLink; + + @ApiModelProperty(value = "站点 Logo 链接打开方式", example = "_blank") + private String siteHomeLogoTargetMode; + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateSiteSettingRequest.java b/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateSiteSettingRequest.java index 8deacb5..fbdc4cc 100644 --- a/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateSiteSettingRequest.java +++ b/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateSiteSettingRequest.java @@ -31,8 +31,19 @@ public class UpdateSiteSettingRequest { @ApiModelProperty(value = "备案号", example = "冀ICP备12345678号-1") private String icp; - + @ApiModelProperty(value = "最大同时上传文件数", example = "5") private Integer maxFileUploads; + @ApiModelProperty(value = "站点 Home 名称", example = "xxx 的小站") + private String siteHomeName; + + @ApiModelProperty(value = "站点 Home Logo", example = "true") + private String siteHomeLogo; + + @ApiModelProperty(value = "站点 Logo 点击后链接", example = "https://www.zfile.vip") + private String siteHomeLogoLink; + + @ApiModelProperty(value = "站点 Logo 链接打开方式", example = "_blank") + private String siteHomeLogoTargetMode; } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateViewSettingRequest.java b/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateViewSettingRequest.java index c84a985..4c50e94 100644 --- a/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateViewSettingRequest.java +++ b/src/main/java/im/zhaojun/zfile/module/config/model/request/UpdateViewSettingRequest.java @@ -56,4 +56,16 @@ public class UpdateViewSettingRequest { @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") private String onlyOfficeUrl; + @ApiModelProperty(value = "默认最大显示文件数", example = "1000") + private Integer maxShowSize; + + @ApiModelProperty(value = "每次加载更多文件数", example = "50") + private Integer loadMoreSize; + + @ApiModelProperty(value = "默认排序字段", example = "name") + private String defaultSortField; + + @ApiModelProperty(value = "默认排序方向", example = "asc") + private String defaultSortOrder; + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/module/config/model/result/SiteConfigResult.java b/src/main/java/im/zhaojun/zfile/module/config/model/result/SiteConfigResult.java index e8a3385..abe98b7 100644 --- a/src/main/java/im/zhaojun/zfile/module/config/model/result/SiteConfigResult.java +++ b/src/main/java/im/zhaojun/zfile/module/config/model/result/SiteConfigResult.java @@ -46,7 +46,7 @@ public class SiteConfigResult { @ApiModelProperty(value = "是否显示生成路径链接功能", example = "true", required = true) private Boolean showPathLink; - + @ApiModelProperty(value = "是否显示文档区", example = "true", required = true) private Boolean showDocument; @@ -85,11 +85,34 @@ public class SiteConfigResult { @ApiModelProperty(value = "默认文件点击习惯", example = "click") private FileClickModeEnum fileClickMode; - + @ApiModelProperty(value = "最大同时上传文件数", example = "5") private Integer maxFileUploads; @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") private String onlyOfficeUrl; + @ApiModelProperty(value = "默认最大显示文件数", example = "1000") + private Integer maxShowSize; + + @ApiModelProperty(value = "每次加载更多文件数", example = "50") + private Integer loadMoreSize; + + @ApiModelProperty(value = "默认排序字段", example = "name") + private String defaultSortField; + + @ApiModelProperty(value = "默认排序方向", example = "asc") + private String defaultSortOrder; + + @ApiModelProperty(value = "站点 Home 名称", example = "xxx 的小站") + private String siteHomeName; + + @ApiModelProperty(value = "站点 Home Logo", example = "true") + private String siteHomeLogo; + + @ApiModelProperty(value = "站点 Logo 点击后链接", example = "https://www.zfile.vip") + private String siteHomeLogoLink; + + @ApiModelProperty(value = "站点 Logo 链接打开方式", example = "_blank") + private String siteHomeLogoTargetMode; } \ No newline at end of file diff --git a/src/main/resources/db/migration-mysql/V14__system_config_add_field_load_more_size.sql b/src/main/resources/db/migration-mysql/V14__system_config_add_field_load_more_size.sql new file mode 100644 index 0000000..ba7060f --- /dev/null +++ b/src/main/resources/db/migration-mysql/V14__system_config_add_field_load_more_size.sql @@ -0,0 +1,2 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('maxShowSize', '默认最大显示文件数', '1000'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('loadMoreSize', '每次加载更多文件数', '50'); \ No newline at end of file diff --git a/src/main/resources/db/migration-mysql/V15__system_config_add_field_site_home_name.sql b/src/main/resources/db/migration-mysql/V15__system_config_add_field_site_home_name.sql new file mode 100644 index 0000000..af61cad --- /dev/null +++ b/src/main/resources/db/migration-mysql/V15__system_config_add_field_site_home_name.sql @@ -0,0 +1,4 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeName', '站点 Home 名称', '首页'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogo', '站点 Home Logo', null); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogoLink', '站点 Logo 打开链接', '/'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogoTargetMode', '站点 Logo 链接打开方式', '_blank'); \ No newline at end of file diff --git a/src/main/resources/db/migration-mysql/V16__system_config_add_field_default_sort_field.sql b/src/main/resources/db/migration-mysql/V16__system_config_add_field_default_sort_field.sql new file mode 100644 index 0000000..483c89c --- /dev/null +++ b/src/main/resources/db/migration-mysql/V16__system_config_add_field_default_sort_field.sql @@ -0,0 +1,2 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('defaultSortField', '默认排序字段', 'name'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('defaultSortOrder', '默认排序字段', 'asc'); \ No newline at end of file diff --git a/src/main/resources/db/migration-sqlite/V14__system_config_add_field_load_more_size.sql b/src/main/resources/db/migration-sqlite/V14__system_config_add_field_load_more_size.sql new file mode 100644 index 0000000..ba7060f --- /dev/null +++ b/src/main/resources/db/migration-sqlite/V14__system_config_add_field_load_more_size.sql @@ -0,0 +1,2 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('maxShowSize', '默认最大显示文件数', '1000'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('loadMoreSize', '每次加载更多文件数', '50'); \ No newline at end of file diff --git a/src/main/resources/db/migration-sqlite/V15__system_config_add_field_site_home_name.sql b/src/main/resources/db/migration-sqlite/V15__system_config_add_field_site_home_name.sql new file mode 100644 index 0000000..af61cad --- /dev/null +++ b/src/main/resources/db/migration-sqlite/V15__system_config_add_field_site_home_name.sql @@ -0,0 +1,4 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeName', '站点 Home 名称', '首页'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogo', '站点 Home Logo', null); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogoLink', '站点 Logo 打开链接', '/'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('siteHomeLogoTargetMode', '站点 Logo 链接打开方式', '_blank'); \ No newline at end of file diff --git a/src/main/resources/db/migration-sqlite/V16__system_config_add_field_default_sort_field.sql b/src/main/resources/db/migration-sqlite/V16__system_config_add_field_default_sort_field.sql new file mode 100644 index 0000000..483c89c --- /dev/null +++ b/src/main/resources/db/migration-sqlite/V16__system_config_add_field_default_sort_field.sql @@ -0,0 +1,2 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('defaultSortField', '默认排序字段', 'name'); +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('defaultSortOrder', '默认排序字段', 'asc'); \ No newline at end of file