From e8117c7d3bda4e813af87c4ef47d87523289c7e5 Mon Sep 17 00:00:00 2001 From: zhaojun <873019219@qq.com> Date: Fri, 26 Aug 2022 18:16:53 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=A2=9E=E5=8A=A0=20OnlyOffice=20?= =?UTF-8?q?=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/request/setting/UpdateViewSettingRequest.java | 3 +++ .../im/zhaojun/zfile/home/model/dto/SystemConfigDTO.java | 5 ++++- .../im/zhaojun/zfile/home/model/result/SiteConfigResult.java | 3 +++ src/main/resources/application.properties | 2 +- ...__system_config_modify_field_only_office_url_to_https.sql | 1 + .../V9__system_config_add_field_only_office_url.sql | 1 + ...__system_config_modify_field_only_office_url_to_https.sql | 1 + .../V9__system_config_add_field_only_office_url.sql | 1 + 8 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/db/migration-mysql/V11__system_config_modify_field_only_office_url_to_https.sql create mode 100644 src/main/resources/db/migration-mysql/V9__system_config_add_field_only_office_url.sql create mode 100644 src/main/resources/db/migration-sqlite/V11__system_config_modify_field_only_office_url_to_https.sql create mode 100644 src/main/resources/db/migration-sqlite/V9__system_config_add_field_only_office_url.sql diff --git a/src/main/java/im/zhaojun/zfile/admin/model/request/setting/UpdateViewSettingRequest.java b/src/main/java/im/zhaojun/zfile/admin/model/request/setting/UpdateViewSettingRequest.java index 243858f..45a4f17 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/request/setting/UpdateViewSettingRequest.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/request/setting/UpdateViewSettingRequest.java @@ -53,4 +53,7 @@ public class UpdateViewSettingRequest { @ApiModelProperty(value = "默认文件点击习惯", example = "click") private FileClickModeEnum fileClickMode; + @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") + private String onlyOfficeUrl; + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/home/model/dto/SystemConfigDTO.java b/src/main/java/im/zhaojun/zfile/home/model/dto/SystemConfigDTO.java index 49403e7..6f48e52 100644 --- a/src/main/java/im/zhaojun/zfile/home/model/dto/SystemConfigDTO.java +++ b/src/main/java/im/zhaojun/zfile/home/model/dto/SystemConfigDTO.java @@ -122,5 +122,8 @@ public class SystemConfigDTO { @ApiModelProperty(value = "最大同时上传文件数", example = "5") private Integer maxFileUploads; - + + @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") + private String onlyOfficeUrl; + } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/home/model/result/SiteConfigResult.java b/src/main/java/im/zhaojun/zfile/home/model/result/SiteConfigResult.java index 0832084..41a1025 100644 --- a/src/main/java/im/zhaojun/zfile/home/model/result/SiteConfigResult.java +++ b/src/main/java/im/zhaojun/zfile/home/model/result/SiteConfigResult.java @@ -89,4 +89,7 @@ public class SiteConfigResult { @ApiModelProperty(value = "最大同时上传文件数", example = "5") private Integer maxFileUploads; + @ApiModelProperty(value = "onlyOffice 在线预览地址", example = "http://office.zfile.vip") + private String onlyOfficeUrl; + } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b867d8b..543c49c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -29,6 +29,6 @@ spring.profiles.active=prod # ingroe zfile-pro upgrade sql -spring.flyway.ignore-migration-patterns=V5__.*,V6__.* +spring.flyway.ignore-migration-patterns=V5__.*,V6__.*,V10__.* # -------------- database config end -------------- \ No newline at end of file diff --git a/src/main/resources/db/migration-mysql/V11__system_config_modify_field_only_office_url_to_https.sql b/src/main/resources/db/migration-mysql/V11__system_config_modify_field_only_office_url_to_https.sql new file mode 100644 index 0000000..b4dc98f --- /dev/null +++ b/src/main/resources/db/migration-mysql/V11__system_config_modify_field_only_office_url_to_https.sql @@ -0,0 +1 @@ +UPDATE system_config SET value = 'https://office.zfile.vip' WHERE value = 'http://office.zfile.vip'; \ No newline at end of file diff --git a/src/main/resources/db/migration-mysql/V9__system_config_add_field_only_office_url.sql b/src/main/resources/db/migration-mysql/V9__system_config_add_field_only_office_url.sql new file mode 100644 index 0000000..21cce2f --- /dev/null +++ b/src/main/resources/db/migration-mysql/V9__system_config_add_field_only_office_url.sql @@ -0,0 +1 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('onlyOfficeUrl', 'onlineOffice 地址', 'http://office.zfile.vip'); \ No newline at end of file diff --git a/src/main/resources/db/migration-sqlite/V11__system_config_modify_field_only_office_url_to_https.sql b/src/main/resources/db/migration-sqlite/V11__system_config_modify_field_only_office_url_to_https.sql new file mode 100644 index 0000000..b4dc98f --- /dev/null +++ b/src/main/resources/db/migration-sqlite/V11__system_config_modify_field_only_office_url_to_https.sql @@ -0,0 +1 @@ +UPDATE system_config SET value = 'https://office.zfile.vip' WHERE value = 'http://office.zfile.vip'; \ No newline at end of file diff --git a/src/main/resources/db/migration-sqlite/V9__system_config_add_field_only_office_url.sql b/src/main/resources/db/migration-sqlite/V9__system_config_add_field_only_office_url.sql new file mode 100644 index 0000000..21cce2f --- /dev/null +++ b/src/main/resources/db/migration-sqlite/V9__system_config_add_field_only_office_url.sql @@ -0,0 +1 @@ +INSERT INTO system_config (`name`, `title`, `value`) VALUES ('onlyOfficeUrl', 'onlineOffice 地址', 'http://office.zfile.vip'); \ No newline at end of file