-
Notifications
You must be signed in to change notification settings - Fork 390
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
90 changed files
with
394 additions
and
394 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,5 +8,5 @@ | |
], | ||
"useWorkspaces": true, | ||
"npmClient": "yarn", | ||
"version": "2.7.3-beta.1" | ||
"version": "2.7.3" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,39 +9,39 @@ require('dotenv-flow').config( | |
silent: true | ||
}); | ||
|
||
if(_.isEmpty(process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN)) { | ||
if (_.isEmpty(process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN)) { | ||
process.env.STEEDOS_TENANT_ENABLE_PASSWORD_LOGIN = 'true'; | ||
} | ||
|
||
if(_.isEmpty(process.env.STEEDOS_UNPKG_URL)) { | ||
if (_.isEmpty(process.env.STEEDOS_UNPKG_URL)) { | ||
process.env.STEEDOS_UNPKG_URL = 'https://unpkg.steedos.cn'; | ||
} | ||
process.env.STEEDOS_UNPKG_URL = process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, ""); | ||
process.env.STEEDOS_UNPKG_URL = process.env.STEEDOS_UNPKG_URL.replace(/\/+$/, ""); | ||
|
||
if(_.isEmpty(process.env.STEEDOS_BUILDER_URL)) { | ||
if (_.isEmpty(process.env.STEEDOS_BUILDER_URL)) { | ||
process.env.STEEDOS_BUILDER_URL = 'https://6-3.builder.steedos.com'; | ||
} | ||
process.env.STEEDOS_BUILDER_URL = process.env.STEEDOS_BUILDER_URL.replace(/\/+$/, ""); | ||
process.env.STEEDOS_BUILDER_URL = process.env.STEEDOS_BUILDER_URL.replace(/\/+$/, ""); | ||
|
||
|
||
if(_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) { | ||
if (_.isEmpty(process.env.STEEDOS_AMIS_VERSION)) { | ||
process.env.STEEDOS_AMIS_VERSION = '6.3.0-patch.3'; | ||
} | ||
|
||
if(_.isEmpty(process.env.STEEDOS_AMIS_URL)) { | ||
if (_.isEmpty(process.env.STEEDOS_AMIS_URL)) { | ||
// process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_UNPKG_URL + '/amis@' + process.env.STEEDOS_AMIS_VERSION; | ||
// 默认加载 https://unpkg.steedos.cn/@steedos-widgets/[email protected], STEEDOS_AMIS_VERSION可变更版本号 | ||
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_UNPKG_URL + '/@steedos-widgets/amis@' + process.env.STEEDOS_AMIS_VERSION; | ||
}else{ | ||
} else { | ||
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace("https://unpkg.com", process.env.STEEDOS_UNPKG_URL) | ||
} | ||
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, ""); | ||
process.env.STEEDOS_AMIS_URL = process.env.STEEDOS_AMIS_URL.replace(/\/+$/, ""); | ||
|
||
if(_.isEmpty(process.env.STEEDOS_WIDGETS_VERSION)) { | ||
process.env.STEEDOS_WIDGETS_VERSION = '6.3.0-beta.23'; | ||
if (_.isEmpty(process.env.STEEDOS_WIDGETS_VERSION)) { | ||
process.env.STEEDOS_WIDGETS_VERSION = '6.3.0'; | ||
} | ||
|
||
if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) { | ||
if (_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) { | ||
const widgetsVersion = process.env.STEEDOS_WIDGETS_VERSION; | ||
const unpkgUrl = process.env.STEEDOS_UNPKG_URL; | ||
let steedosPublicPageAsseturls = `${unpkgUrl}/@steedos-widgets/amis-object@${widgetsVersion}/dist/assets.json`; | ||
|
@@ -53,7 +53,7 @@ if(_.isEmpty(process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS)) { | |
process.env.STEEDOS_PUBLIC_PAGE_ASSETURLS = steedosPublicPageAsseturls | ||
} | ||
|
||
if(_.isEmpty(process.env.SERIALIZER)){ | ||
if (_.isEmpty(process.env.SERIALIZER)) { | ||
process.env.SERIALIZER = 'JSON' | ||
} | ||
|
||
|
@@ -316,7 +316,7 @@ module.exports = { | |
broker.logger.warn('Clear all cache entries on startup.') | ||
broker.cacher.clean(); | ||
|
||
const objectql = require(require.resolve('@steedos/objectql', {paths: [process.cwd()]})); | ||
const objectql = require(require.resolve('@steedos/objectql', { paths: [process.cwd()] })); | ||
objectql.broker.init(broker); | ||
|
||
//TODO 此处不考虑多个node服务模式. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.