@steedos/service-enterprise 2.5.1 → 2.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +10 -9
  2. package/package.service.js +47 -26
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@steedos/service-enterprise",
3
3
  "main": "package.service.js",
4
- "version": "2.5.1",
4
+ "version": "2.5.2",
5
5
  "private": false,
6
6
  "repository": "https://github.com/steedos/steedos-platform.git",
7
7
  "description": "",
@@ -11,13 +11,14 @@
11
11
  "author": "steedos",
12
12
  "license": "MIT",
13
13
  "dependencies": {
14
- "@steedos/ee_audit-records": "2.5.1",
15
- "@steedos/ee_branding": "2.5.1",
16
- "@steedos/ee_mongodb-bi-connector": "2.5.1",
17
- "@steedos/ee_plugin-field-encryption": "2.5.1",
18
- "@steedos/plugin-dingtalk": "2.5.1",
19
- "@steedos/plugin-qywx": "2.5.1",
20
- "@steedos/service-package-license": "2.5.1",
14
+ "@steedos/ee_audit-records": "2.5.2",
15
+ "@steedos/ee_branding": "2.5.2",
16
+ "@steedos/ee_mongodb-bi-connector": "2.5.2",
17
+ "@steedos/ee_plugin-field-encryption": "2.5.2",
18
+ "@steedos/ee_virus-scan": "2.5.2",
19
+ "@steedos/plugin-dingtalk": "2.5.2",
20
+ "@steedos/plugin-qywx": "2.5.2",
21
+ "@steedos/service-package-license": "2.5.2",
21
22
  "mongodb": "^3.7.3",
22
23
  "mssql": "^8.1.2",
23
24
  "nats": "^1.4.12",
@@ -28,5 +29,5 @@
28
29
  "publishConfig": {
29
30
  "access": "public"
30
31
  },
31
- "gitHead": "a858317bc56cb1fa405a2722656230e69703c2bc"
32
+ "gitHead": "f55fc39aaeb0e5114164c7be94ada9f8194bd54a"
32
33
  }
@@ -71,35 +71,56 @@ module.exports = {
71
71
  this.broker._restartService(service);
72
72
  }
73
73
 
74
- this.broker.waitForServices('@steedos/service-package-license').then(() => {
75
- setTimeout(()=>{
74
+ this.broker.waitForServices('@steedos/service-package-license').then(async () => {
75
+ setTimeout(async ()=>{
76
+
77
+
76
78
  // 如果环境变量中配置了
77
- this.broker.call(`@steedos/service-package-license.hasEnvLicense`, {}).then((has)=>{
78
- if(has){
79
-
80
- const enterprisePackages = process.env.STEEDOS_ENTERPRISE_PACKAGES || '@steedos/ee_audit-records,@steedos/ee_branding';
81
-
82
- const packages = enterprisePackages.split(',');
83
-
84
- packages.forEach((packageName)=>{
85
- if(packageName && _.trim(packageName)){
86
- this.broker.createService(require(_.trim(packageName)));
87
- }
88
- })
89
- // // 记录审计日志
90
- // this.broker.createService(require("@steedos/ee_audit-records"));
91
- // // 自定义品牌
92
- // this.broker.createService(require("@steedos/ee_branding"));
93
- // // mongodb bi connector
94
- // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
95
- // // 字段级加密服务
96
- // this.broker.createService(require("@steedos/ee_plugin-field-encryption"));
97
- // //企业微信
98
- // this.broker.createService(require("@steedos/plugin-qywx"));
99
- // //钉钉
100
- // this.broker.createService(require("@steedos/plugin-dingtalk"));
79
+ const platform = await this.broker.call(`@steedos/service-package-license.getPlatform`);
80
+ if(!platform){
81
+ console.log("*******************************************************************");
82
+ console.log("*");
83
+ console.log("* Steedos Platform License not found !");
84
+ console.log("*");
85
+ console.log("*******************************************************************");
86
+ return
87
+ }
88
+ const enterprisePackages = process.env.STEEDOS_ENTERPRISE_PACKAGES || '@steedos/ee_audit-records,@steedos/ee_branding';
89
+
90
+ console.log("*******************************************************************");
91
+ console.log("*");
92
+ console.log(`* Steedos Platform License`);
93
+ console.log("*");
94
+ if (platform.licensed_to)
95
+ console.log(`* Licensed To : ${platform.licensed_to}`);
96
+ console.log(`* Version: ${project.version}`);
97
+ console.log(`* Product: ${platform.product}`);
98
+ console.log(`* User Limit: ${platform.user_number}`);
99
+ console.log(`* Expiration : ${platform.end_date}`);
100
+ console.log(`* Packages : ${enterprisePackages}`);
101
+ console.log("*");
102
+ console.log("*******************************************************************");
103
+
104
+
105
+ const packages = enterprisePackages.split(',');
106
+
107
+ packages.forEach((packageName)=>{
108
+ if(packageName && _.trim(packageName)){
109
+ this.broker.createService(require(_.trim(packageName)));
101
110
  }
102
111
  })
112
+ // // 记录审计日志
113
+ // this.broker.createService(require("@steedos/ee_audit-records"));
114
+ // // 自定义品牌
115
+ // this.broker.createService(require("@steedos/ee_branding"));
116
+ // // mongodb bi connector
117
+ // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
118
+ // // 字段级加密服务
119
+ // this.broker.createService(require("@steedos/ee_plugin-field-encryption"));
120
+ // //企业微信
121
+ // this.broker.createService(require("@steedos/plugin-qywx"));
122
+ // //钉钉
123
+ // this.broker.createService(require("@steedos/plugin-dingtalk"));
103
124
  }, 3000)
104
125
  })
105
126
  },