Merge branch '2.2'

.env

@@ -30,3 +30,10 @@ STEEDOS_CLOUD_SPACE_ID=
 [metadata]
 METADATA_SERVER=
 METADATA_APIKEY=
+
+
+STEEDOS_PAGE_RENDER=
+
+STEEDOS_PUBLIC_PAGE_ASSETURLS=https://unpkg.com/@steedos-ui/builder-widgets@1.1.37/dist/assets.json
+
+STEEDOS_UNPKG_URL=https://npm.elemecdn.com 
\ No newline at end of file

.steedos/package.json

@@ -4,8 +4,8 @@
     "description": "",
     "author": "",
     "dependencies": {
-        "@steedos-labs/master": "2.1.46",
-        "@steedos-labs/oa": "2.1.46",
+        "@steedos-labs/master": "2.1.61",
+        "@steedos-labs/oa": "2.1.61",
         "@steedos-labs/workflow": "2.1.46"
     }
 }

.steedos/steedos-packages.yml

@@ -27,4 +27,4 @@ my-package:
   version: 1.0.0
   description: A Steedos Package
   local: true
-  path: steedos-packages/my-package
+  path: steedos-packages/my-package
\ No newline at end of file

.steedos/yarn.lock

@@ -16,3 +16,20 @@
   version "2.1.46"
   resolved "https://registry.npmmirror.com/@steedos-labs/workflow/download/@steedos-labs/workflow-2.1.46.tgz#f123666881d0527ab7f56ab706a60232170ae9b7"
   integrity sha512-M0zzmH2XJNEGFpdBNj7RmLlNCYE0ToYRfrXIuoKycgY2rqieQNVxYqCFl+MTvtVrRgsTAut0NEBDkNc5ikwR/g==
+
+"@steedos/service-plugin-amis@2.2.12":
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/@steedos/service-plugin-amis/-/service-plugin-amis-2.2.12.tgz#c7bb705657092c166c2a2d0b7a219f44e51d86aa"
+  integrity sha512-F0lZdn60vKz3tGjA8imBXqtoPgfN+DobwxRjQD2aCug9o+VVeNcpWqbnefILqNz/KGakdXfQeZhyrd2kCnHbRA==
+
+"@steedos/webapp-accounts@^2.2.12":
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/@steedos/webapp-accounts/-/webapp-accounts-2.2.12.tgz#eb4e53cadd6d779b4d6101341c19bae12b4839c2"
+  integrity sha512-d1KkChTHafeDn6HD+Eql+ab8nrcjv6Ul0gfesp6dx+Zh6dilHkMyZtn6F8rpcH1tGMIzW8Wv4HPPGcv5yprOeA==
+  dependencies:
+    lodash "^4.17.21"
+
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

package.json

@@ -8,17 +8,12 @@
     "node": "^12.22.0"
   },
   "scripts": {
-    "start": "yarn flushCacherDB && moleculer-runner services !services/sidecar-server.service.js",
-    "start:all": "yarn flushCacherDB && moleculer-runner services",
+    "start": "yarn start:community",
+    "start:community": "yarn flushCacherDB && moleculer-runner services/community.service.js",
+    "start:enterprise": "yarn flushCacherDB && moleculer-runner services/enterprise.service.js",
+    "start:console": "cross-env NODEID=STEEDOS-CONSOLE moleculer connect --config ./moleculer.config.js",
     "flushCacherDB": "node .scripts/flush_cacher_db.js",
-    "start:steedos": "cross-env NODEID=STEEDOS-SERVER moleculer-runner services/steedos-server",
-    "start:app": "cross-env NODEID=STEEDOS-APP moleculer-runner --repl services/steedos-app",
-    "console": "cross-env NODEID=STEEDOS-CONSOLE moleculer connect --config ./moleculer.config.js",
-    "docker": "docker-compose up --build -d",
-    "dev": "moleculer-runner services services/dx.develop.js",
-    "postinstall": "cd .steedos && yarn",
-    "pm2-start": "pm2 start --interpreter bash --name steedos yarn -- start",
-    "restart": "pm2 delete steedos && yarn pm2-start"
+    "postinstall": "cd .steedos && yarn"
   },
   "keywords": [
     "steedos",
@@ -29,7 +24,10 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-community": "^2.1"
+    "@steedos/ee_service-plugin-license": "^2.2.2",
+    "@steedos/service-community": "^2.2.14",
+    "@steedos/service-plugin-amis": "^2.2.14",
+    "@steedos/webapp-accounts": "^2.2.14"
   },
   "devDependencies": {
     "eslint": "^7.7.0",

services/community.service.js

+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-31 15:20:09
+ * @Description: 社区版, 开源、免费
+ */
+module.exports = {
+  name: "community-server",
+  namespace: "steedos",
+  async created() {
+    // 启动 元数据服务
+    this.broker.createService(require("@steedos/service-metadata-server"));
+    // 启动 加载软件包服务
+    this.broker.createService(require("@steedos/service-package-registry"));
+    // 启动 登录页面服务
+    this.broker.createService(require("@steedos/webapp-accounts"));
+    // 启动 meteor服务
+    this.broker.createService(require("@steedos/service-steedos-server"));
+  }
+}
\ No newline at end of file

services/enterprise.service.js

+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2022-03-31 15:20:09
+ * @Description: 企业版, 请联系官方购买: https://www.steedos.cn
+ */
+
+module.exports = {
+    name: "community-server",
+    namespace: "steedos",
+    async created() {
+        // 启动 元数据服务
+        this.broker.createService(require("@steedos/service-metadata-server"));
+        // 启动 加载软件包服务
+        this.broker.createService(require("@steedos/service-package-registry"));
+        // 启动 登录页面服务
+        this.broker.createService(require("@steedos/webapp-accounts"));
+        // 启动 meteor服务
+        this.broker.createService(require("@steedos/service-steedos-server"));
+        // 启动 sidecar服务: steedos services 跨语言访问
+        // this.broker.createService(require("@steedos/service-sidecar"));
+        // 启动 amis服务: 给page提供amis渲染器
+        this.broker.createService(require("@steedos/service-plugin-amis"));
+        // 许可证服务
+        this.broker.createService(require("@steedos/ee_service-plugin-license"));
+    }
+}
\ No newline at end of file

services/metadata-server.service.js

-const MetadataService = require("@steedos/service-metadata-server");
-
-module.exports = {
-  name: "metadata-server",
-  namespace: "steedos",
-  mixins: [MetadataService],
-}
\ No newline at end of file

services/project-server.service.js

-const packageService = require("@steedos/service-package-registry");
-
-module.exports = {
-  name: "project-server",
-  namespace: "steedos",
-  mixins: [packageService],
-}
\ No newline at end of file

services/sidecar-server.service.js

-const SidecarService = require("@steedos/service-sidecar");
-
-module.exports = {
-  name: "$sidecar",
-  namespace: "steedos",
-  mixins: [SidecarService],
-}
\ No newline at end of file

services/steedos-server.service.js

-const SteedosService = require("@steedos/service-steedos-server");
-const path = require('path');
-
-module.exports = {
-    name: "steedos-server",
-    namespace: "steedos",
-    mixins: [SteedosService],
-    dependencies: ['metadata-server'],
-    settings: {
-        // Change port setting
-        port: process.env.PORT,
-        rootUrl: process.env.ROOT_URL,
-        mongoUrl: process.env.MONGO_URL,
-        mongodbServer: {
-            enabled: !process.env.MONGO_URL,
-            debug: true,
-            port: process.env.MONGO_PORT || 27018,
-            dbPath: process.env.MONGO_DBPATH || path.join(process.cwd(), 'db'),
-        },
-        nodeRedServer: {
-            enabled: false,
-            userDir: path.join(process.cwd(), "node-red-app"),
-        },
-        apiServer: {
-            enabled: true
-        }
-    }
-}
\ No newline at end of file

steedos-config.yml

@@ -14,6 +14,9 @@ public:
       urlProvideForJsreport: ${JSREPORT_TO_ACQUIRE_DATA_URL}
     app_exchange:
       url: ${STEEDOS_APP_EXCHANGE_URL}
+  page:
+    assetUrls: ${STEEDOS_PUBLIC_PAGE_ASSETURLS}
+    unpkgUrl: ${STEEDOS_PUBLIC_PAGE_UNPKGURL}
 cfs:
   store: ${STEEDOS_CFS_STORE}
   aliyun: