@certd/lib-server 1.39.10 → 1.39.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -21,6 +21,7 @@ export declare class SysPublicSettings extends BaseSettings {
|
|
|
21
21
|
managerOtherUserPipeline: boolean;
|
|
22
22
|
icpNo?: string;
|
|
23
23
|
mpsNo?: string;
|
|
24
|
+
customFooter?: string;
|
|
24
25
|
robots?: boolean;
|
|
25
26
|
aiChatEnabled: boolean;
|
|
26
27
|
captchaEnabled: boolean;
|
|
@@ -54,6 +55,7 @@ export declare class SysPrivateSettings extends BaseSettings {
|
|
|
54
55
|
httpRequestTimeout?: number;
|
|
55
56
|
pipelineMaxRunningCount?: number;
|
|
56
57
|
environmentVars?: string;
|
|
58
|
+
acmeWalkFromAuthoritative?: boolean;
|
|
57
59
|
sms?: {
|
|
58
60
|
type?: string;
|
|
59
61
|
config?: any;
|
|
@@ -24,6 +24,7 @@ export class SysPublicSettings extends BaseSettings {
|
|
|
24
24
|
managerOtherUserPipeline = false;
|
|
25
25
|
icpNo;
|
|
26
26
|
mpsNo;
|
|
27
|
+
customFooter;
|
|
27
28
|
robots = true;
|
|
28
29
|
aiChatEnabled = true;
|
|
29
30
|
//验证码是否开启
|
|
@@ -61,6 +62,7 @@ export class SysPrivateSettings extends BaseSettings {
|
|
|
61
62
|
httpRequestTimeout = 30;
|
|
62
63
|
pipelineMaxRunningCount;
|
|
63
64
|
environmentVars = '';
|
|
65
|
+
acmeWalkFromAuthoritative = true;
|
|
64
66
|
sms = {
|
|
65
67
|
type: 'aliyun',
|
|
66
68
|
config: {},
|
|
@@ -12,12 +12,12 @@ import { InjectEntityModel } from '@midwayjs/typeorm';
|
|
|
12
12
|
import { Repository } from 'typeorm';
|
|
13
13
|
import { SysSettingsEntity } from '../entity/sys-settings.js';
|
|
14
14
|
import { SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
|
|
15
|
-
import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
|
|
15
|
+
import { getAllSslProviderDomains, setSslProviderReverseProxies, setWalkFromAuthoritative } from '@certd/acme-client';
|
|
16
16
|
import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
|
|
17
|
+
import { isPlus } from '@certd/plus-core';
|
|
17
18
|
import * as dns from 'node:dns';
|
|
18
19
|
import { BaseService, setAdminMode } from '../../../basic/index.js';
|
|
19
20
|
import { executorQueue } from '../../basic/service/executor-queue.js';
|
|
20
|
-
import { isComm, isPlus } from '@certd/plus-core';
|
|
21
21
|
const { merge } = mergeUtils;
|
|
22
22
|
let lastSaveEnvVars = {};
|
|
23
23
|
/**
|
|
@@ -113,11 +113,11 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
113
113
|
return await this.getSetting(SysPublicSettings);
|
|
114
114
|
}
|
|
115
115
|
async savePublicSettings(bean) {
|
|
116
|
-
if (isComm()) {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
116
|
+
// if (isComm()) {
|
|
117
|
+
// if (bean.adminMode === 'enterprise') {
|
|
118
|
+
// throw new Error("商业版不支持使用企业管理模式")
|
|
119
|
+
// }
|
|
120
|
+
// }
|
|
121
121
|
await this.saveSetting(bean);
|
|
122
122
|
//让设置生效
|
|
123
123
|
await this.reloadPublicSettings();
|
|
@@ -163,6 +163,7 @@ let SysSettingsService = class SysSettingsService extends BaseService {
|
|
|
163
163
|
setSslProviderReverseProxies(privateSetting.reverseProxies);
|
|
164
164
|
//加载环境变量
|
|
165
165
|
this.setEnvironmentVars(privateSetting.environmentVars);
|
|
166
|
+
setWalkFromAuthoritative(privateSetting.acmeWalkFromAuthoritative);
|
|
166
167
|
}
|
|
167
168
|
setEnvironmentVars(vars) {
|
|
168
169
|
const envVars = {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@certd/lib-server",
|
|
3
|
-
"version": "1.39.
|
|
3
|
+
"version": "1.39.12",
|
|
4
4
|
"description": "midway with flyway, sql upgrade way ",
|
|
5
5
|
"private": false,
|
|
6
6
|
"type": "module",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
],
|
|
29
29
|
"license": "AGPL",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@certd/acme-client": "^1.39.
|
|
32
|
-
"@certd/basic": "^1.39.
|
|
33
|
-
"@certd/pipeline": "^1.39.
|
|
34
|
-
"@certd/plugin-lib": "^1.39.
|
|
35
|
-
"@certd/plus-core": "^1.39.
|
|
31
|
+
"@certd/acme-client": "^1.39.12",
|
|
32
|
+
"@certd/basic": "^1.39.12",
|
|
33
|
+
"@certd/pipeline": "^1.39.12",
|
|
34
|
+
"@certd/plugin-lib": "^1.39.12",
|
|
35
|
+
"@certd/plus-core": "^1.39.12",
|
|
36
36
|
"@midwayjs/cache": "3.14.0",
|
|
37
37
|
"@midwayjs/core": "3.20.11",
|
|
38
38
|
"@midwayjs/i18n": "3.20.13",
|
|
@@ -64,5 +64,5 @@
|
|
|
64
64
|
"typeorm": "^0.3.11",
|
|
65
65
|
"typescript": "^5.4.2"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "898bc9b9f2f75df11ea0803b144862ba98b7511a"
|
|
68
68
|
}
|