Update server.patch

This commit is contained in:
Beeant 2023-06-15 10:59:20 +08:00 committed by GitHub
parent edae4a1430
commit 31256bcee4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,9 +1,9 @@
diff --git a/Common/sources/constants.js b/Common/sources/constants.js diff --git a/Common/sources/constants.js b/Common/sources/constants.js
index 65d4c6f..39a7e56 100644 index 8ddfb47..d41c7e6 100644
--- a/Common/sources/constants.js --- a/Common/sources/constants.js
+++ b/Common/sources/constants.js +++ b/Common/sources/constants.js
@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = { @@ -85,7 +85,7 @@ exports.LICENSE_RESULT = {
UsersViewCountOS: 15 NotBefore: 16
}; };
-exports.LICENSE_CONNECTIONS = 20; -exports.LICENSE_CONNECTIONS = 20;
@ -12,7 +12,7 @@ index 65d4c6f..39a7e56 100644
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
diff --git a/Common/sources/license.js b/Common/sources/license.js diff --git a/Common/sources/license.js b/Common/sources/license.js
index 1b617c6..8fa7b53 100644 index 5df8d69..3fd9de1 100644
--- a/Common/sources/license.js --- a/Common/sources/license.js
+++ b/Common/sources/license.js +++ b/Common/sources/license.js
@@ -45,24 +45,24 @@ exports.readLicense = function*() { @@ -45,24 +45,24 @@ exports.readLicense = function*() {
@ -20,58 +20,60 @@ index 1b617c6..8fa7b53 100644
type: c_LR.Success, type: c_LR.Success,
light: false, light: false,
- packageType: constants.PACKAGE_TYPE_OS, - packageType: constants.PACKAGE_TYPE_OS,
+ packageType: constants.PACKAGE_TYPE_I, + packageType: constants.PACKAGE_TYPE_I,
mode: constants.LICENSE_MODE.None, mode: constants.LICENSE_MODE.None,
- branding: false, - branding: false,
+ branding: true, + branding: true,
connections: constants.LICENSE_CONNECTIONS, connections: constants.LICENSE_CONNECTIONS,
connectionsView: constants.LICENSE_CONNECTIONS, connectionsView: constants.LICENSE_CONNECTIONS,
- customization: false, - customization: false,
- advancedApi: false, - advancedApi: false,
- usersCount: 0, - usersCount: 0,
- usersViewCount: 0, - usersViewCount: 0,
+ customization: true, + customization: true,
+ advancedApi: true, + advancedApi: true,
+ usersCount: constants.LICENSE_CONNECTIONS, + usersCount: constants.LICENSE_CONNECTIONS,
+ usersViewCount: constants.LICENSE_CONNECTIONS, + usersViewCount: constants.LICENSE_CONNECTIONS,
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
- hasLicense: false, - hasLicense: false,
- plugins: false, - plugins: false,
+ hasLicense: true, + hasLicense: true,
+ plugins: true, + plugins: true,
buildDate: oBuildDate, buildDate: oBuildDate,
startDate: startDate, startDate: startDate,
- endDate: null, - endDate: null,
+ endDate: new Date("2099-01-01T23:59:59.000Z"), + endDate: new Date("2099-01-01T23:59:59.000Z"),
customerId: "", customerId: "",
- alias: "" - alias: ""
+ alias: "community" + alias: "community"
}, null]; }, null];
}; };
-exports.packageType = constants.PACKAGE_TYPE_OS; -exports.packageType = constants.PACKAGE_TYPE_OS;
+exports.packageType = constants.PACKAGE_TYPE_I; +exports.packageType = constants.PACKAGE_TYPE_I;
diff --git a/DocService/sources/server.js b/DocService/sources/server.js diff --git a/DocService/sources/server.js b/DocService/sources/server.js
index 5c744f6..edfb423 100644 index 6828adb..21374a6 100644
--- a/DocService/sources/server.js --- a/DocService/sources/server.js
+++ b/DocService/sources/server.js +++ b/DocService/sources/server.js
@@ -110,7 +110,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque @@ -111,7 +111,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
if (!tenantManager.isMultitenantMode()) { if (!tenantManager.isMultitenantMode()) {
updateLicense(); updateLicense();
- fs.watchFile(cfgLicenseFile, updateLicense); - fs.watchFile(cfgLicenseFile, updateLicense);
+ // fs.watchFile(cfgLicenseFile, updateLicense);
setInterval(updateLicense, 86400000); setInterval(updateLicense, 86400000);
} }
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
index 2a0b366..96468f9 100644 index e83b71b..bc2ea58 100644
--- a/FileConverter/sources/convertermaster.js --- a/FileConverter/sources/convertermaster.js
+++ b/FileConverter/sources/convertermaster.js +++ b/FileConverter/sources/convertermaster.js
@@ -93,7 +93,6 @@ if (cluster.isMaster) { @@ -93,7 +93,7 @@ if (cluster.isMaster) {
updateLicense(); updateLicense();
if (!tenantManager.isMultitenantMode()) { if (!tenantManager.isMultitenantMode()) {
- fs.watchFile(cfgLicenseFile, updateLicense); - fs.watchFile(cfgLicenseFile, updateLicense);
+ // fs.watchFile(cfgLicenseFile, updateLicense);
setInterval(updateLicense, 86400000); setInterval(updateLicense, 86400000);
} }
} else { } else {