@steedos/service-enterprise 2.5.0-beta.9 → 2.5.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/service-enterprise",
   "main": "package.service.js",
-  "version": "2.5.0-beta.9",
+  "version": "2.5.0",
   "private": false,
   "repository": "https://github.com/steedos/steedos-platform.git",
   "description": "",
@@ -11,22 +11,22 @@
   "author": "steedos",
   "license": "MIT",
   "dependencies": {
-    "@steedos/ee_audit-records": "2.5.0-beta.9",
-    "@steedos/ee_branding": "2.5.0-beta.9",
-    "@steedos/ee_mongodb-bi-connector": "2.5.0-beta.9",
-    "@steedos/ee_service-plugin-license": "^2.2.5",
-    "@steedos/ee_sso-oidc": "2.5.0-beta.9",
-    "@steedos/ee_stimulsoft-reports": "2.5.0-beta.9",
-    "@steedos/ee_virus-scan": "2.5.0-beta.9",
-    "@steedos/service-community": "2.5.0-beta.9",
+    "@steedos/ee_audit-records": "2.5.0",
+    "@steedos/ee_branding": "2.5.0",
+    "@steedos/ee_mongodb-bi-connector": "2.5.0",
+    "@steedos/ee_plugin-field-encryption": "2.5.0",
+    "@steedos/plugin-dingtalk": "2.5.0",
+    "@steedos/plugin-qywx": "2.5.0",
+    "@steedos/service-package-license": "2.5.0",
     "mongodb": "^3.7.3",
     "mssql": "^8.1.2",
     "nats": "^1.4.12",
+    "notepack.io": "^3.0.1",
     "validator": "^13.6.0"
   },
   "homepage": "https://www.steedos.com",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a2623b433dd42632dc54d23c51b718bd4d1a2fdc"
+  "gitHead": "4428143293b96ef93b2bbeef0cd6691c9baa8e4f"
 }

package/package.service.js

@@ -1,7 +1,15 @@
+/*
+ * @Author: baozhoutao@steedos.com
+ * @Date: 2023-05-17 15:06:55
+ * @LastEditors: baozhoutao@steedos.com
+ * @LastEditTime: 2023-06-15 09:29:54
+ * @Description: 
+ */
 "use strict";
 const project = require('./package.json');
 const serviceName = project.name;
 const validator = require('validator');
+const _ = require('lodash');
 /**
  * @typedef {import('moleculer').Context} Context Moleculer's Context
  * 软件包服务启动后也需要抛出事件。
@@ -25,7 +33,7 @@ module.exports = {
     /**
      * Dependencies
      */
-    dependencies: [],
+    dependencies: ['steedos-server'],
     /**
      * Actions
      */
@@ -50,34 +58,50 @@ module.exports = {
      * Service created lifecycle event handler
      */
     async created() {
-
+        global.broker = this.broker;
     },
 
     /**
      * Service started lifecycle event handler
      */
     async started(ctx) {
-        // 启动 社区版 服务
-        this.broker.createService(require("@steedos/service-community"));
 
-        // 启动 企业版许可证服务
-        this.broker.createService(require("@steedos/ee_service-plugin-license"));
+        const service = this.broker.createService(require("@steedos/service-package-license"));
+        if (!this.broker.started) {
+            this.broker._restartService(service);
+        }
+
+        this.broker.waitForServices('@steedos/service-package-license').then(() => {
+            setTimeout(()=>{
+                // 如果环境变量中配置了
+                this.broker.call(`@steedos/service-package-license.hasEnvLicense`, {}).then((has)=>{
+                    if(has){
+
+                        const enterprisePackages = process.env.STEEDOS_ENTERPRISE_PACKAGES || '@steedos/ee_audit-records,@steedos/ee_branding';
 
-        // 启动 报表服务
-        this.broker.createService(require("@steedos/ee_stimulsoft-reports"));
+                        const packages = enterprisePackages.split(',');
 
-        // 启动 sidecar服务: steedos services 跨语言访问
-        // broker.createService(require("@steedos/service-sidecar"));
-        // 字段级加密服务
-        // broker.createService(require("@steedos/ee_plugin-field-encryption"));
-        // 附件病毒扫描
-        // broker.createService(require("@steedos/ee_virus-scan"));
-        // 记录审计日志
-        this.broker.createService(require("@steedos/ee_audit-records"));
-        // 自定义品牌
-        this.broker.createService(require("@steedos/ee_branding"));
-        // mongodb bi connector
-        // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
+                        packages.forEach((packageName)=>{
+                            if(packageName && _.trim(packageName)){
+                                this.broker.createService(require(_.trim(packageName)));
+                            }
+                        })
+                        // // 记录审计日志
+                        // this.broker.createService(require("@steedos/ee_audit-records"));
+                        // // 自定义品牌
+                        // this.broker.createService(require("@steedos/ee_branding"));
+                        // // mongodb bi connector
+                        // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
+                        // // 字段级加密服务
+                        // this.broker.createService(require("@steedos/ee_plugin-field-encryption"));
+                        // //企业微信
+                        // this.broker.createService(require("@steedos/plugin-qywx"));
+                        // //钉钉
+                        // this.broker.createService(require("@steedos/plugin-dingtalk"));
+                    }
+                })
+            }, 3000)
+		})
     },
 
     /**
@@ -86,4 +110,4 @@ module.exports = {
     async stopped() {
 
     }
-};
+};

package/LICENSE.txt

@@ -1,22 +0,0 @@
-Steedos Licensing
-
-SOFTWARE LICENSING
-
-To determine under which license you may use a file from the Steedos source code,
-please resort to the header of that file.
-
-If the file has no header, the following rules apply
-1. enterprise features are licensed under Steedos Enterprise Terms, see License.enterprise.txt
-2. source code that is neither (1) is licensed under MIT, see https://opensource.org/licenses/MIT
-
-On request, licenses under different terms are available.
-
-Source code of enterprise features are files that
-* are in folders named "ee" or start with "ee_", or in subfolders of such folders.
-* contain the strings "ee_" in its filename name.
-The files can be found by running the command `find . -iname ee -or -iname "*_ee*" -or -iname "*ee_*"`
-
-STEEDOS TRADEMARK GUIDELINES
-
-Your use of the mark Steedos is subject to Steedos, Inc's prior written approval. For trademark approval or any questions
-you have about using these trademarks, please email zhuangjianguo@steedos.com