create-steedos-app 2.1.67 → 2.1.73

package/createSteedosApp.js

@@ -79,6 +79,12 @@ function createProject(name) {
           case 'gitignore': {
             return '.gitignore'
           }
+          case 'gitpod.Dockerfile': {
+            return '.gitpod.Dockerfile'
+          }
+          case 'gitpod.yml': {
+            return '.gitpod.yml'
+          }
           case '_package.json': {
             return 'package.json'
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.1.67",
+  "version": "2.1.73",
   "keywords": [
     "steedos"
   ],
@@ -32,5 +32,5 @@
     "cpy": "7.3.0",
     "fs-extra": "8.1.0"
   },
-  "gitHead": "55195daf99312e32a604c8cb6ff8a37cb545824b"
+  "gitHead": "f653412d0a75971dd044cff2a87dc4cd0caf8c04"
 }

package/templates/default/.scripts/flush_cacher_db.js

@@ -0,0 +1,7 @@
+const Redis = require("ioredis");
+require('dotenv-flow').config(process.cwd());
+const redis = new Redis(process.env.CACHER);
+redis.flushdb(() => {
+    console.log(`flushdb: ${process.env.CACHER}`);
+    process.exit(0)
+});

package/templates/default/.scripts/setup.sh

@@ -0,0 +1,13 @@
+# create mongodb data directory
+mkdir -p /workspace/mongodb/data/db
+
+# create .env.local
+cp .env .env.local
+
+# replace ROOT_URL
+root_replacement="ROOT_URL=$(gp url 5000)"
+sed -i "/^ROOT_URL=*/c$root_replacement" .env.local
+
+# replace METADATA_SERVER
+meta_replacement="METADATA_SERVER=$(gp url 5000)"
+sed -i "/^METADATA_SERVER=*/c$meta_replacement" .env.local

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

@@ -4,7 +4,8 @@
     "description": "",
     "author": "",
     "dependencies": {
-        "@steedos-labs/master": "2.1.17",
-        "@steedos-labs/oa": "2.1.20"
+        "@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

@@ -6,16 +6,22 @@ steedos-app-default:
   path: steedos-app
 '@steedos-labs/oa':
   enable: true
-  version: 2.1.20
+  version: 2.1.46
   description: ''
   local: false
   path: .steedos/node_modules/@steedos-labs/oa
 '@steedos-labs/master':
   enable: true
-  version: 2.1.17
+  version: 2.1.46
   description: ''
   local: false
   path: .steedos/node_modules/@steedos-labs/master
+'@steedos-labs/workflow':
+  enable: true
+  version: 2.1.46
+  description: ''
+  local: false
+  path: .steedos/node_modules/@steedos-labs/workflow
 my-package:
   enable: true
   version: 1.0.0

package/templates/default/.steedos/yarn.lock

@@ -2,25 +2,17 @@
 # yarn lockfile v1
 
 
-"@steedos-labs/master@2.1.17":
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/@steedos-labs/master/-/master-2.1.17.tgz#0dd693da48c46b0975c5bb9740d88c149390bcc2"
-  integrity sha512-uFUxqq9FkSfq+8xc8rTT/FbyDB+C5/cwhFxO/G5OcTLZDuML2T7JpxecbymYISds8Sgg5a5gOe8x5Fv/+krEWQ==
+"@steedos-labs/master@2.1.46":
+  version "2.1.46"
+  resolved "https://registry.npmmirror.com/@steedos-labs/master/download/@steedos-labs/master-2.1.46.tgz#a99d1a85266a2fcc7a68a5f63efbeda82ff53589"
+  integrity sha512-ww6U7rsDxzLWyyFPXZ93vUQEqXVW7OOylOgoOB/ytnKpkpETrrn8G/i4rcDI1zUPqEb/ZFDz63mBfj4tYiaL8w==
 
-"@steedos-labs/oa@2.1.20":
-  version "2.1.20"
-  resolved "https://registry.yarnpkg.com/@steedos-labs/oa/-/oa-2.1.20.tgz#4942d2694246d0abfea31b623981c563bf086c5b"
-  integrity sha512-o0KaDuw8g4n4FcrrNlPJQyrGGiREm56RwA6scFhi4CTGkV/D6Tyz7EMuZgsvUaha8SUFFKWDFccWwWKdaOHvJg==
-  dependencies:
-    "@steedos/app-contracts" "2.0.51"
-    "@steedos/app-crm" "2.0.51"
+"@steedos-labs/oa@2.1.46":
+  version "2.1.46"
+  resolved "https://registry.npmmirror.com/@steedos-labs/oa/download/@steedos-labs/oa-2.1.46.tgz#8805973d56bc493789c42b6b021f6446883a5a98"
+  integrity sha512-YK219meTkA+gqISKZlKPdIUaOB3gOVzJ1xJlUpa3euuUCMAphIBXmElM5Dg0hYXTkucqmAk4CCwi4HYULahNmg==
 
-"@steedos/app-contracts@2.0.51":
-  version "2.0.51"
-  resolved "https://registry.nlark.com/@steedos/app-contracts/download/@steedos/app-contracts-2.0.51.tgz#9867ca5c2efb28f17172edd4126382e1689069f0"
-  integrity sha1-mGfKXC77KPFxcu3UEmOC4WiQafA=
-
-"@steedos/app-crm@2.0.51":
-  version "2.0.51"
-  resolved "https://registry.nlark.com/@steedos/app-crm/download/@steedos/app-crm-2.0.51.tgz#2db47346be1afc38a5f05b37efe3b79d30c25eab"
-  integrity sha1-LbRzRr4a/Dil8Fs37+O3nTDCXqs=
+"@steedos-labs/workflow@2.1.46":
+  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==

package/templates/default/Dockerfile

@@ -10,8 +10,8 @@ ADD package.json .
 ADD moleculer.config.js .
 ADD steedos-config.yml ./steedos-config.yml
 
-RUN npm config set registry http://registry.npm.taobao.org/
-RUN yarn config set registry http://registry.npm.taobao.org/
+# RUN npm config set registry http://registry.npm.taobao.org/
+# RUN yarn config set registry http://registry.npm.taobao.org/
 
 RUN yarn
 

package/templates/default/README.md

@@ -22,9 +22,21 @@
 
 在浏览器中打开项目后，会自动执行`yarn`指令安装项目依赖项，并自动执行`yarn start`指令运行项目。
 
-第一次运行项目项目会在控制台看到提示“请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY”，但是我们也可以看到项目运行起来后自动打开了一个浏览器窗口访问运行好的华炎魔方，只是因为没有激活华炎魔方所以没有账户可以登录使用。
+第一次运行项目时可以在控制台看到提示“请配置环境变量STEEDOS_CLOUD_SPACE_ID和STEEDOS_CLOUD_API_KEY”，但是我们也可以看到项目运行起来后自动打开了一个浏览器窗口访问运行好的华炎魔方，只是因为没有激活华炎魔方没有账户可以登录使用所以显示了激活华炎魔方的初始化界面。
 
-请参考文档 [激活华炎魔方](https://www.steedos.cn/docs/deploy/deploy-activate#%E9%85%8D%E7%BD%AE%E7%8E%AF%E5%A2%83%E5%8F%98%E9%87%8F) 配置这两个环境变量，配置好后重启项目即可使用私有部署的华炎魔方初始账户登录使用。
+请在云平台”管理控制台”应用的“我的魔方”中找到对应的私有部署记录，并在该初始化界面中输入点击私有部署记录详细界面右上角“复制激活参数”按钮复制的内容，其中已经包含了激活华炎魔方需要的两个环境变量，提交后会自动把相关环境变量值保存到`.env.local`文件并且页面会自动跳转到登录界面，使用私有部署的华炎魔方初始账户登录即可进入系统主界面了。
+
+```
+[metadata]
+METADATA_SERVER=https://5000-rose-fowl-9ece4ams.ws-us25.gitpod.io
+METADATA_APIKEY=#会自动填充为初始界面中输入的环境变量值
+
+[steedos-cloud]
+STEEDOS_CLOUD_SPACE_ID=#会自动填充为初始界面中输入的环境变量值
+STEEDOS_CLOUD_API_KEY=#会自动填充为初始界面中输入的环境变量值
+```
+
+其中METADATA_SERVER 和 METADATA_APIKEY这两个环境变量是用于同步元数据，详细请参考文档 [同步元数据](https://beta.steedos.cn/docs/developer/getting-started#%E5%90%8C%E6%AD%A5%E5%85%83%E6%95%B0%E6%8D%AE)。
 
 ## 开发项目
 

package/templates/default/_package.json

@@ -8,7 +8,8 @@
     "node": ">=12"
   },
   "scripts": {
-    "start": "moleculer-runner services",
+    "start": "yarn flushCacherDB && moleculer-runner services",
+    "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",

package/templates/default/env

@@ -17,7 +17,7 @@ STEEDOS_PUSH_HUAWEI_APPSECRET=
 STEEDOS_PUSH_HUAWEI_APPPKGNAME=
 STEEDOS_PUSH_MI_APPSECRET=
 STEEDOS_PUSH_MI_PRODUCTION=
-DEVELOPER_STANDARD_OBJECTS=true
+DEVELOPER_STANDARD_OBJECTS=
 DEFAULT_PACKAGE_PATH=
 STEEDOS_CLOUD_LOGO_URL=
 STEEDOS_CLOUD_LOGO_SQUARE_URL=

package/templates/default/gitpod.Dockerfile

@@ -0,0 +1,2 @@
+FROM steedos/gitpod-workspace-base:latest
+

package/templates/default/gitpod.yml

@@ -0,0 +1,41 @@
+image: steedos/gitpod-workspace-base:latest
+
+# List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
+ports:
+  - port: 5000
+    onOpen: open-browser
+    visibility: public
+  - port: 6379
+    onOpen: ignore
+  - port: 27017
+    onOpen: ignore
+  - port: 5488 # jsreport-app
+    onOpen: open-browser
+    visibility: public
+  - port: 1880 # node-red-app
+    onOpen: open-browser
+    visibility: public
+# List the start up tasks. You can start them in parallel in multiple terminals. See https://www.gitpod.io/docs/config-start-tasks/
+tasks:
+  - init: sh ./.scripts/setup.sh
+    command: |
+      mongod --replSet rs0 --dbpath /workspace/mongodb/data/db
+  - command: |
+      gp await-port 27017
+      mongo steedos --eval "rs.initiate()"
+  - command: |
+      redis-server --save "" --appendonly no --client-output-buffer-limit replica 0 0 0 --client-output-buffer-limit pubsub 0 0 0 --client-output-buffer-limit slave 0 0 0
+  - init: |
+      yarn install
+    command: |
+      gp await-port 27017
+      gp await-port 6379
+      yarn start
+
+vscode:
+  extensions:
+    - dbaeumer.vscode-eslint
+    - redhat.vscode-yaml
+    - steedos.steedosdx-vscode
+    - steedos.steedosdx-vscode-core
+    - eamodio.gitlens