create-steedos-app 2.2.12 → 2.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.2.12",
+  "version": "2.2.15",
   "keywords": [
     "steedos"
   ],
@@ -35,5 +35,5 @@
   "resolutions": {
     "**/chalk": "3.0.0"
   },
-  "gitHead": "06806c509f487a82158919278c6c0b384373f8ac"
+  "gitHead": "576e0fc3b02f0b8b8fb2835f1281864b31a75078"
 }

package/templates/default/.steedos/_package.json

@@ -4,7 +4,6 @@
     "description": "",
     "author": "",
     "dependencies": {
-        "@steedos/webapp-accounts": "^2.2.12",
         "@steedos-labs/master": "2.1.46",
         "@steedos-labs/oa": "2.1.46",
         "@steedos-labs/workflow": "2.1.46"

package/templates/default/.steedos/steedos-packages.yml

@@ -4,12 +4,6 @@ steedos-app-default:
   description: A Steedos App
   local: true
   path: steedos-app
-'@steedos/webapp-accounts':
-  enable: true
-  version: 2.2.12
-  description: ''
-  local: false
-  path: .steedos/node_modules/@steedos/webapp-accounts
 '@steedos-labs/oa':
   enable: true
   version: 2.1.46

package/templates/default/_package.json

@@ -8,16 +8,12 @@
     "node": ">=12"
   },
   "scripts": {
-    "start": "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",
@@ -28,7 +24,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@steedos/service-community": "2.2.4"
+    "@steedos/service-community": "^2.2.14"
   },
   "devDependencies": {
     "eslint": "^7.7.0",

package/templates/default/services/community.service.js

@@ -0,0 +1,19 @@
+/*
+ * @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"));
+  }
+}

package/templates/default/services/enterprise.service.js

@@ -0,0 +1,24 @@
+/*
+ * @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"));
+    }
+}

package/templates/default/services/metadata-server.service.js

@@ -1,7 +0,0 @@
-const MetadataService = require("@steedos/service-metadata-server");
-
-module.exports = {
-  name: "metadata-server",
-  namespace: "steedos",
-  mixins: [MetadataService],
-}

package/templates/default/services/project-server.service.js

@@ -1,7 +0,0 @@
-const packageService = require("@steedos/service-package-registry");
-
-module.exports = {
-  name: "project-server",
-  namespace: "steedos",
-  mixins: [packageService],
-}

package/templates/default/services/steedos-server.service.js

@@ -1,28 +0,0 @@
-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
-        }
-    }
-}