@steedos/service-enterprise 2.5.4 → 2.5.6

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 -11
  2. package/package.service.js +66 -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.4",
4
+ "version": "2.5.6",
5
5
  "private": false,
6
6
  "repository": "https://github.com/steedos/steedos-platform.git",
7
7
  "description": "",
@@ -11,15 +11,14 @@
11
11
  "author": "steedos",
12
12
  "license": "MIT",
13
13
  "dependencies": {
14
- "@steedos-labs/analytics": "^0.0.7",
15
- "@steedos/ee_audit-records": "2.5.4",
16
- "@steedos/ee_branding": "2.5.4",
17
- "@steedos/ee_mongodb-bi-connector": "2.5.4",
18
- "@steedos/ee_plugin-field-encryption": "2.5.4",
19
- "@steedos/ee_virus-scan": "2.5.4",
20
- "@steedos/plugin-dingtalk": "2.5.4",
21
- "@steedos/plugin-qywx": "2.5.4",
22
- "@steedos/service-license": "2.5.4",
14
+ "@steedos-labs/analytics": "^0.0.8",
15
+ "@steedos/ee_audit-records": "2.5.6",
16
+ "@steedos/ee_branding": "2.5.6",
17
+ "@steedos/ee_mongodb-bi-connector": "2.5.6",
18
+ "@steedos/ee_virus-scan": "2.5.6",
19
+ "@steedos/plugin-dingtalk": "2.5.6",
20
+ "@steedos/plugin-qywx": "2.5.6",
21
+ "@steedos/service-license": "2.5.6",
23
22
  "mssql": "^8.1.2",
24
23
  "oracle": "^0.4.1"
25
24
  },
@@ -27,5 +26,5 @@
27
26
  "publishConfig": {
28
27
  "access": "public"
29
28
  },
30
- "gitHead": "7f2d758e638a6313a3d1948e814305df3ae66bba"
29
+ "gitHead": "d18d2f0abad13f403dc5649c551eccd145b5dd55"
31
30
  }
@@ -68,32 +68,72 @@ module.exports = {
68
68
  this.broker._restartService(service);
69
69
  }
70
70
 
71
- this.broker.waitForServices('@steedos/service-license').then(async () => {
72
- setTimeout(async ()=>{
73
-
74
- const enterprisePackages = process.env.STEEDOS_ENTERPRISE_PACKAGES || '@steedos/ee_audit-records,@steedos/ee_branding';
75
-
76
- const packages = enterprisePackages.split(',');
77
-
78
- packages.forEach((packageName)=>{
79
- if(packageName && _.trim(packageName)){
80
- this.broker.createService(require(_.trim(packageName)));
81
- }
82
- })
83
- // // 记录审计日志
84
- // this.broker.createService(require("@steedos/ee_audit-records"));
85
- // // 自定义品牌
86
- // this.broker.createService(require("@steedos/ee_branding"));
87
- // // mongodb bi connector
88
- // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
89
- // // 字段级加密服务
90
- // this.broker.createService(require("@steedos/ee_plugin-field-encryption"));
91
- // //企业微信
92
- // this.broker.createService(require("@steedos/plugin-qywx"));
93
- // //钉钉
94
- // this.broker.createService(require("@steedos/plugin-dingtalk"));
95
- }, 3000)
96
- })
71
+ await this.broker.waitForServices('@steedos/service-license')
72
+ // setTimeout(async ()=>{
73
+
74
+ // const enterprisePackages = process.env.STEEDOS_ENTERPRISE_PACKAGES || '@steedos/ee_audit-records,@steedos/ee_branding';
75
+
76
+ // const packages = enterprisePackages.split(',');
77
+
78
+ // packages.forEach((packageName)=>{
79
+ // if(packageName && _.trim(packageName)){
80
+ // this.broker.createService(require(_.trim(packageName)));
81
+ // }
82
+ // })
83
+ // // // 记录审计日志
84
+ // // this.broker.createService(require("@steedos/ee_audit-records"));
85
+ // // // 自定义品牌
86
+ // // this.broker.createService(require("@steedos/ee_branding"));
87
+ // // // mongodb bi connector
88
+ // // this.broker.createService(require("@steedos/ee_mongodb-bi-connector"));
89
+ // // // 字段级加密服务
90
+ // // this.broker.createService(require("@steedos/ee_plugin-field-encryption"));
91
+ // // //企业微信
92
+ // // this.broker.createService(require("@steedos/plugin-qywx"));
93
+ // // //钉钉
94
+ // // this.broker.createService(require("@steedos/plugin-dingtalk"));
95
+ // }, 3000)
96
+ //
97
+
98
+ const platform = await this.broker.call('@steedos/service-license.getPlatform');
99
+ if (!platform) {
100
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos/ee_audit-records"});
101
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos/ee_branding"});
102
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos/plugin-qywx"});
103
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos/plugin-dingtalk"});
104
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos/ee_virus-scan"});
105
+ await this.broker.call('@steedos/service-project.disablePackage', { module: "@steedos-labs/analytics"});
106
+
107
+ return;
108
+ }
109
+
110
+ await this.broker.call('@steedos/service-project.addPackages', {
111
+ packages: [
112
+ {
113
+ name: '@steedos/ee_audit-records',
114
+ enable: true
115
+ },{
116
+ name: '@steedos/ee_branding',
117
+ enable: true
118
+ },
119
+ {
120
+ name: '@steedos/plugin-qywx',
121
+ enable: false
122
+ },
123
+ {
124
+ name: '@steedos/plugin-dingtalk',
125
+ enable: false
126
+ },
127
+ {
128
+ name: '@steedos/ee_virus-scan',
129
+ enable: false
130
+ },
131
+ {
132
+ name: '@steedos-labs/analytics',
133
+ enable: false
134
+ },
135
+ ]
136
+ })
97
137
  },
98
138
 
99
139
  /**