owl-cli 6.195.0 → 6.197.0

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 (63) hide show
  1. package/.eslintrc.json +2 -2
  2. package/.vscode/launch.json +22 -22
  3. package/.vscode/settings.json +2 -2
  4. package/bin/createTables.js +94 -94
  5. package/bin/deploy.js +66 -66
  6. package/bin/dsl.js +223 -223
  7. package/bin/genEvents.js +188 -188
  8. package/bin/owl-init.js +50 -50
  9. package/bin/owl.js +322 -322
  10. package/bin/owlconfig.json +16 -16
  11. package/bin/table_mysql.js +189 -189
  12. package/bin/undeploy.js +56 -56
  13. package/defaultTemplate/api/build.xml +94 -94
  14. package/defaultTemplate/api/src/about.html +12 -12
  15. package/defaultTemplate/api/src/about.jsx +11 -11
  16. package/defaultTemplate/api/src/handlers/aggs.jsx +161 -161
  17. package/defaultTemplate/api/src/handlers/batchImport.jsx +78 -78
  18. package/defaultTemplate/api/src/handlers/delete.jsx +88 -91
  19. package/defaultTemplate/api/src/handlers/export.jsx +56 -56
  20. package/defaultTemplate/api/src/handlers/exportDoc.jsx +27 -27
  21. package/defaultTemplate/api/src/handlers/exportEx.jsx +77 -77
  22. package/defaultTemplate/api/src/handlers/exportWithTemplates.jsx +50 -50
  23. package/defaultTemplate/api/src/handlers/exportZip.jsx +26 -26
  24. package/defaultTemplate/api/src/handlers/get.jsx +50 -50
  25. package/defaultTemplate/api/src/handlers/getByIds.jsx +51 -51
  26. package/defaultTemplate/api/src/handlers/getChildren.jsx +96 -96
  27. package/defaultTemplate/api/src/handlers/getExportTaskInfo.jsx +36 -36
  28. package/defaultTemplate/api/src/handlers/getHistory.jsx +64 -64
  29. package/defaultTemplate/api/src/handlers/getSpec.jsx +40 -40
  30. package/defaultTemplate/api/src/handlers/include/checklogin.jsx +792 -792
  31. package/defaultTemplate/api/src/handlers/include/diff.jsx +315 -315
  32. package/defaultTemplate/api/src/handlers/include/util.jsx +60 -60
  33. package/defaultTemplate/api/src/handlers/list.jsx +252 -252
  34. package/defaultTemplate/api/src/handlers/listEx.jsx +142 -142
  35. package/defaultTemplate/api/src/handlers/reIndex.jsx +63 -63
  36. package/defaultTemplate/api/src/handlers/recovery.jsx +53 -53
  37. package/defaultTemplate/api/src/handlers/save.jsx +125 -127
  38. package/defaultTemplate/api/src/handlers/upload.jsx +72 -72
  39. package/defaultTemplate/api/src/init/indexConfigs/changeMapping.json +14 -14
  40. package/defaultTemplate/api/src/init/indexConfigs/createAliase.json +10 -10
  41. package/defaultTemplate/api/src/init/indexConfigs/createIndex.json +105 -105
  42. package/defaultTemplate/api/src/init/indexConfigs/rebuildIndex.sh +27 -27
  43. package/defaultTemplate/api/src/init/indexConfigs/reindex.json +9 -9
  44. package/defaultTemplate/api/src/init/init.jsx +34 -34
  45. package/defaultTemplate/api/src/meta.json +10 -10
  46. package/defaultTemplate/api/src/services/dblayer.jsx +251 -251
  47. package/defaultTemplate/api/src/services/modelService.jsx +1279 -1264
  48. package/defaultTemplate/api/src/services/sqlstring.jsx +240 -240
  49. package/defaultTemplate/api/src/tasks/doBatchImport.jsx +176 -176
  50. package/defaultTemplate/api/src/tasks/export.jsx +224 -224
  51. package/defaultTemplate/api/src/tasks/exportDoc.jsx +99 -99
  52. package/defaultTemplate/api/src/tasks/exportExTask.jsx +332 -332
  53. package/defaultTemplate/api/src/tasks/exportWithTemplateTask.jsx +128 -128
  54. package/defaultTemplate/api/src/tasks/exportZip1.jsx +53 -53
  55. package/examples/buildProperties/build.properties +2 -2
  56. package/examples/gitignore/gitignore_example.txt +1 -1
  57. package/examples/models/product.json +52 -52
  58. package/examples/models/shop.json +71 -71
  59. package/examples/models/sku.json +254 -254
  60. package/examples/models/user.json +49 -49
  61. package/examples/owlconfig.json +13 -13
  62. package/package.json +33 -33
  63. package/todo.txt +4 -4
@@ -1,176 +1,176 @@
1
- //#import $@projectCode:services/modelService.jsx
2
- //#import $owl_batch_import:services/modelService.jsx
3
- //#import $owl_process_job_log:services/modelService.jsx
4
-
5
-
6
- var batchId = batchImportId;
7
-
8
- function main(){
9
- var batchImport = owl_batch_importService.get(batchId);
10
- if(!batchImport || !batchImport.importFile || batchImport.importFile.length==0){
11
- return;
12
- }
13
-
14
-
15
- try{
16
- var s = null;
17
- var url = batchImport.importFile[0].url;
18
- if(!url){
19
- return;
20
- }
21
- if(url.endsWith(".zip")){
22
- s = $.unzipUrl(url,batchImport.zipPass,batchImport.contentFileName);
23
- }
24
- else{
25
- s = $.get(url);
26
- }
27
-
28
- var now = new Date().getTime();
29
- var log = {
30
- objId:batchImport.id,
31
- startTime:now,
32
- endTime:now,
33
- name:"批量导入" + batchImport.id,
34
- remark:"下载完成,文件长度" + s.length
35
-
36
- }
37
- owl_process_job_logService.add(log);
38
-
39
- var contentType = batchImport.contentType;
40
- if(!contentType){
41
- if(s.startsWith("[")){
42
- contentType = "json";
43
- }
44
- else {
45
- contentType = "jsonl";
46
- }
47
- }
48
- var rows = null;
49
-
50
- if(contentType==="jsonl"){
51
- rows = s.split("\n");
52
- }
53
- else{
54
- rows = JSON.parse(s);
55
- }
56
-
57
- var log = {
58
- objId:batchImport.id,
59
- name:"批量导入" + batchImport.id,
60
- remark:"读取记录完成,记录数" + rows.length
61
-
62
- }
63
-
64
- owl_process_job_logService.add(log);
65
-
66
- var nImported = 0;
67
- var nError = 0;
68
- for(var i=0; i<rows.length; i++){
69
- var row = rows[i];
70
- try{
71
- var row = rows[i];
72
- var rec = null;
73
- if(contentType==="jsonl") {
74
- rec = JSON.parse(row);
75
- }
76
- else{
77
- rec = row;
78
- }
79
- if(!rec._orgId){
80
- rec._orgId = batchImport._orgId;
81
- rec._orgIds = batchImport._orgIds;
82
- }
83
- if(rec._orgId!=batchImport._orgId && batchImport._orgId!='0'){
84
- throw "记录的_orgId不正确,应该是" + batchImport._orgId + ",实际是" + rec._orgId;
85
- }
86
-
87
- //检查
88
- var oldObj = @projectCodeService.get(rec.id);
89
- if(oldObj && !batchImport.override){
90
- throw "记录已经存在,id=" + rec.id;
91
- }
92
- if(oldObj && batchImport.override==true && oldObj._orgId!=rec._orgId){
93
- throw "记录的_orgId不正确,不能覆盖其他人的数据,应该是" + rec._orgId + ",实际是" + oldObj._orgId;
94
- }
95
- @projectCodeService.add( rec);
96
- nImported++;
97
-
98
- if(i%1000==0){
99
- var now = new Date().getTime();
100
- var log = {
101
- objId:batchImport.id,
102
- startTime:now,
103
- endTime:now,
104
- name:"批量导入" + batchImport.id,
105
- remark:"成功导入记录:" + i
106
- }
107
- owl_process_job_logService.add(log);
108
- }
109
- }
110
- catch(e){
111
- var msg = "";
112
- if(typeof e === "string"){
113
- msg = e;
114
- }
115
- else{
116
- msg = e.msg;
117
- if(!msg && e.getCause){
118
- msg = e.getCause();
119
- }
120
- }
121
- var now = new Date().getTime();
122
- var log = {
123
- objId:batchImport.id,
124
- startTime:now,
125
- endTime:now,
126
- name:"批量导入" + batchImport.id,
127
- remark:"错误记录,行号" + i + ",内容:" + row + ",错误信息:" + msg
128
- }
129
- owl_process_job_logService.add(log);
130
- nError++;
131
- if(nError==50){
132
- throw "错误记录超过50条,停止导入";
133
- }
134
- }
135
- }
136
-
137
- var now = new Date().getTime();
138
- var log = {
139
- objId:batchImport.id,
140
- startTime:now,
141
- endTime:now,
142
- name:"批量导入" + batchImport.id,
143
- remark:"导入成功"+ nImported + "条记录"
144
- }
145
- owl_process_job_logService.add(log);
146
-
147
- batchImport.state = "success";
148
- owl_batch_importService.update(batchImport);
149
- }catch(e){
150
- var msg = "";
151
- if(typeof e === "string"){
152
- msg = e;
153
- }
154
- else{
155
- msg = e.msg;
156
- if(!msg && e.getCause){
157
- msg = e.getCause();
158
- }
159
- }
160
- var now = new Date().getTime();
161
- var log = {
162
- objId:batchImport.id,
163
- startTime:now,
164
- endTime:now,
165
- name:"批量导入" + batchImport.id,
166
- remark:"出现错误:" + msg
167
- }
168
- owl_process_job_logService.add(log);
169
- batchImport.state = "failed";
170
- owl_batch_importService.update(batchImport);
171
- }
172
-
173
- }
174
- main();
175
-
176
-
1
+ //#import $@projectCode:services/modelService.jsx
2
+ //#import $owl_batch_import:services/modelService.jsx
3
+ //#import $owl_process_job_log:services/modelService.jsx
4
+
5
+
6
+ var batchId = batchImportId;
7
+
8
+ function main(){
9
+ var batchImport = owl_batch_importService.get(batchId);
10
+ if(!batchImport || !batchImport.importFile || batchImport.importFile.length==0){
11
+ return;
12
+ }
13
+
14
+
15
+ try{
16
+ var s = null;
17
+ var url = batchImport.importFile[0].url;
18
+ if(!url){
19
+ return;
20
+ }
21
+ if(url.endsWith(".zip")){
22
+ s = $.unzipUrl(url,batchImport.zipPass,batchImport.contentFileName);
23
+ }
24
+ else{
25
+ s = $.get(url);
26
+ }
27
+
28
+ var now = new Date().getTime();
29
+ var log = {
30
+ objId:batchImport.id,
31
+ startTime:now,
32
+ endTime:now,
33
+ name:"批量导入" + batchImport.id,
34
+ remark:"下载完成,文件长度" + s.length
35
+
36
+ }
37
+ owl_process_job_logService.add(log);
38
+
39
+ var contentType = batchImport.contentType;
40
+ if(!contentType){
41
+ if(s.startsWith("[")){
42
+ contentType = "json";
43
+ }
44
+ else {
45
+ contentType = "jsonl";
46
+ }
47
+ }
48
+ var rows = null;
49
+
50
+ if(contentType==="jsonl"){
51
+ rows = s.split("\n");
52
+ }
53
+ else{
54
+ rows = JSON.parse(s);
55
+ }
56
+
57
+ var log = {
58
+ objId:batchImport.id,
59
+ name:"批量导入" + batchImport.id,
60
+ remark:"读取记录完成,记录数" + rows.length
61
+
62
+ }
63
+
64
+ owl_process_job_logService.add(log);
65
+
66
+ var nImported = 0;
67
+ var nError = 0;
68
+ for(var i=0; i<rows.length; i++){
69
+ var row = rows[i];
70
+ try{
71
+ var row = rows[i];
72
+ var rec = null;
73
+ if(contentType==="jsonl") {
74
+ rec = JSON.parse(row);
75
+ }
76
+ else{
77
+ rec = row;
78
+ }
79
+ if(!rec._orgId){
80
+ rec._orgId = batchImport._orgId;
81
+ rec._orgIds = batchImport._orgIds;
82
+ }
83
+ if(rec._orgId!=batchImport._orgId && batchImport._orgId!='0'){
84
+ throw "记录的_orgId不正确,应该是" + batchImport._orgId + ",实际是" + rec._orgId;
85
+ }
86
+
87
+ //检查
88
+ var oldObj = @projectCodeService.get(rec.id);
89
+ if(oldObj && !batchImport.override){
90
+ throw "记录已经存在,id=" + rec.id;
91
+ }
92
+ if(oldObj && batchImport.override==true && oldObj._orgId!=rec._orgId){
93
+ throw "记录的_orgId不正确,不能覆盖其他人的数据,应该是" + rec._orgId + ",实际是" + oldObj._orgId;
94
+ }
95
+ @projectCodeService.add( rec);
96
+ nImported++;
97
+
98
+ if(i%1000==0){
99
+ var now = new Date().getTime();
100
+ var log = {
101
+ objId:batchImport.id,
102
+ startTime:now,
103
+ endTime:now,
104
+ name:"批量导入" + batchImport.id,
105
+ remark:"成功导入记录:" + i
106
+ }
107
+ owl_process_job_logService.add(log);
108
+ }
109
+ }
110
+ catch(e){
111
+ var msg = "";
112
+ if(typeof e === "string"){
113
+ msg = e;
114
+ }
115
+ else{
116
+ msg = e.msg;
117
+ if(!msg && e.getCause){
118
+ msg = e.getCause();
119
+ }
120
+ }
121
+ var now = new Date().getTime();
122
+ var log = {
123
+ objId:batchImport.id,
124
+ startTime:now,
125
+ endTime:now,
126
+ name:"批量导入" + batchImport.id,
127
+ remark:"错误记录,行号" + i + ",内容:" + row + ",错误信息:" + msg
128
+ }
129
+ owl_process_job_logService.add(log);
130
+ nError++;
131
+ if(nError==50){
132
+ throw "错误记录超过50条,停止导入";
133
+ }
134
+ }
135
+ }
136
+
137
+ var now = new Date().getTime();
138
+ var log = {
139
+ objId:batchImport.id,
140
+ startTime:now,
141
+ endTime:now,
142
+ name:"批量导入" + batchImport.id,
143
+ remark:"导入成功"+ nImported + "条记录"
144
+ }
145
+ owl_process_job_logService.add(log);
146
+
147
+ batchImport.state = "success";
148
+ owl_batch_importService.update(batchImport);
149
+ }catch(e){
150
+ var msg = "";
151
+ if(typeof e === "string"){
152
+ msg = e;
153
+ }
154
+ else{
155
+ msg = e.msg;
156
+ if(!msg && e.getCause){
157
+ msg = e.getCause();
158
+ }
159
+ }
160
+ var now = new Date().getTime();
161
+ var log = {
162
+ objId:batchImport.id,
163
+ startTime:now,
164
+ endTime:now,
165
+ name:"批量导入" + batchImport.id,
166
+ remark:"出现错误:" + msg
167
+ }
168
+ owl_process_job_logService.add(log);
169
+ batchImport.state = "failed";
170
+ owl_batch_importService.update(batchImport);
171
+ }
172
+
173
+ }
174
+ main();
175
+
176
+