namirasoft-log 1.3.25 → 1.3.27
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.
- package/dist/NamirasoftLogServerBase.js +1 -1
- package/dist/command/LogGroupCreateCommand.js +19 -1
- package/dist/command/LogGroupCreateCommand.js.map +1 -1
- package/dist/command/LogGroupUpdateCommand.js +19 -1
- package/dist/command/LogGroupUpdateCommand.js.map +1 -1
- package/dist/enum/LogGroupRetentionUnit.d.ts +8 -0
- package/dist/enum/LogGroupRetentionUnit.js +13 -0
- package/dist/enum/LogGroupRetentionUnit.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/meta/LogGroupMetaTable.d.ts +2 -0
- package/dist/meta/LogGroupMetaTable.js +2 -0
- package/dist/meta/LogGroupMetaTable.js.map +1 -1
- package/dist/meta/LogMetaTable.d.ts +2 -1
- package/dist/meta/LogMetaTable.js +2 -1
- package/dist/meta/LogMetaTable.js.map +1 -1
- package/dist/row/LogGroupInputRow.d.ts +3 -0
- package/dist/row/LogGroupRow.d.ts +3 -0
- package/dist/row/LogRow.d.ts +2 -1
- package/package.json +1 -1
- package/src/NamirasoftLogServerBase.ts +1 -1
- package/src/command/LogGroupCreateCommand.ts +19 -1
- package/src/command/LogGroupUpdateCommand.ts +19 -1
- package/src/enum/LogGroupRetentionUnit.ts +29 -0
- package/src/index.ts +1 -0
- package/src/meta/LogGroupMetaTable.ts +4 -0
- package/src/meta/LogMetaTable.ts +4 -2
- package/src/row/LogGroupInputRow.ts +4 -0
- package/src/row/LogGroupRow.ts +4 -0
- package/src/row/LogRow.ts +2 -1
|
@@ -4,7 +4,7 @@ exports.NamirasoftLogServerBase = void 0;
|
|
|
4
4
|
const namirasoft_account_1 = require("namirasoft-account");
|
|
5
5
|
class NamirasoftLogServerBase extends namirasoft_account_1.NamirasoftServerBase {
|
|
6
6
|
constructor(manager, onError) {
|
|
7
|
-
super(`https://log.namirasoft.com/api/v1`, `1.3.
|
|
7
|
+
super(`https://log.namirasoft.com/api/v1`, `1.3.27`, manager, onError);
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
10
|
exports.NamirasoftLogServerBase = NamirasoftLogServerBase;
|
|
@@ -32,6 +32,22 @@ class LogGroupCreateCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
32
32
|
optional: false,
|
|
33
33
|
args: ["name"],
|
|
34
34
|
defaults: [""]
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
name: "retention_unit",
|
|
38
|
+
short: "",
|
|
39
|
+
description: "Provides the value of 'retention_unit' in body",
|
|
40
|
+
optional: false,
|
|
41
|
+
args: ["retention_unit"],
|
|
42
|
+
defaults: [""]
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
name: "retention_value",
|
|
46
|
+
short: "",
|
|
47
|
+
description: "Provides the value of 'retention_value' in body",
|
|
48
|
+
optional: false,
|
|
49
|
+
args: ["retention_value"],
|
|
50
|
+
defaults: [""]
|
|
35
51
|
}
|
|
36
52
|
]);
|
|
37
53
|
}
|
|
@@ -46,7 +62,9 @@ class LogGroupCreateCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
46
62
|
let server = new NamirasoftLogServer_1.NamirasoftLogServer(manager, e => this.app.logger.error(e.message));
|
|
47
63
|
let ans = yield server.loggroup.Create({
|
|
48
64
|
project_id: this.option_values.project_id,
|
|
49
|
-
name: this.option_values.name
|
|
65
|
+
name: this.option_values.name,
|
|
66
|
+
retention_unit: this.option_values.retention_unit,
|
|
67
|
+
retention_value: this.option_values.retention_value
|
|
50
68
|
});
|
|
51
69
|
this.app.logger.success(JSON.stringify(ans));
|
|
52
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogGroupCreateCommand.js","sourceRoot":"","sources":["../../src/command/LogGroupCreateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE;YACZ;gBACI,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,4CAA4C;gBACzD,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,CAAC,YAAY,CAAC;gBACpB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,sCAAsC;gBACnD,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;SACA,CAAC,CAAC;IACX,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;YACrI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACnC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;gBACzC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"LogGroupCreateCommand.js","sourceRoot":"","sources":["../../src/command/LogGroupCreateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE;YACZ;gBACI,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,4CAA4C;gBACzD,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,CAAC,YAAY,CAAC;gBACpB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,sCAAsC;gBACnD,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,gDAAgD;gBAC7D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,gBAAgB,CAAC;gBACxB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,iDAAiD;gBAC9D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,iBAAiB,CAAC;gBACzB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;SACA,CAAC,CAAC;IACX,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;YACrI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACnC,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;gBACzC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;gBAC7B,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;gBACjD,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe;aACtD,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAxDD,sDAwDC;AAAA,CAAC"}
|
|
@@ -32,6 +32,22 @@ class LogGroupUpdateCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
32
32
|
optional: false,
|
|
33
33
|
args: ["name"],
|
|
34
34
|
defaults: [""]
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
name: "retention_unit",
|
|
38
|
+
short: "",
|
|
39
|
+
description: "Provides the value of 'retention_unit' in body",
|
|
40
|
+
optional: false,
|
|
41
|
+
args: ["retention_unit"],
|
|
42
|
+
defaults: [""]
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
name: "retention_value",
|
|
46
|
+
short: "",
|
|
47
|
+
description: "Provides the value of 'retention_value' in body",
|
|
48
|
+
optional: false,
|
|
49
|
+
args: ["retention_value"],
|
|
50
|
+
defaults: [""]
|
|
35
51
|
}
|
|
36
52
|
]);
|
|
37
53
|
}
|
|
@@ -46,7 +62,9 @@ class LogGroupUpdateCommand extends namirasoft_node_cli_1.BaseFinalCommand {
|
|
|
46
62
|
let server = new NamirasoftLogServer_1.NamirasoftLogServer(manager, e => this.app.logger.error(e.message));
|
|
47
63
|
let ans = yield server.loggroup.Update(this.arg_values[0], {
|
|
48
64
|
project_id: this.option_values.project_id,
|
|
49
|
-
name: this.option_values.name
|
|
65
|
+
name: this.option_values.name,
|
|
66
|
+
retention_unit: this.option_values.retention_unit,
|
|
67
|
+
retention_value: this.option_values.retention_value
|
|
50
68
|
});
|
|
51
69
|
this.app.logger.success(JSON.stringify(ans));
|
|
52
70
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogGroupUpdateCommand.js","sourceRoot":"","sources":["../../src/command/LogGroupUpdateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;YAChB;gBACI,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,4CAA4C;gBACzD,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,CAAC,YAAY,CAAC;gBACpB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,sCAAsC;gBACnD,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;SACA,CAAC,CAAC;IACX,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;YACrI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBACvD,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;gBACzC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"LogGroupUpdateCommand.js","sourceRoot":"","sources":["../../src/command/LogGroupUpdateCommand.ts"],"names":[],"mappings":";;;;;;;;;;;;AAoBA,6DAAuD;AACvD,qDAAiD;AACjD,gEAA6D;AAC7D,2DAAkD;AAElD,MAAa,qBAAsB,SAAQ,sCAAgB;IAEvD,YAAY,IAAc;QAEtB,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE;YAChB;gBACI,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,4CAA4C;gBACzD,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,CAAC,YAAY,CAAC;gBACpB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,sCAAsC;gBACnD,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,MAAM,CAAC;gBACd,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,gBAAgB;gBACtB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,gDAAgD;gBAC7D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,gBAAgB,CAAC;gBACxB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;YACD;gBACI,IAAI,EAAE,iBAAiB;gBACvB,KAAK,EAAE,EAAE;gBACT,WAAW,EAAE,iDAAiD;gBAC9D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,CAAC,iBAAiB,CAAC;gBACzB,QAAQ,EAAE,CAAC,EAAE,CAAC;aACjB;SACA,CAAC,CAAC;IACX,CAAC;IACc,IAAI;;YAEf,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,KAAK,IAAI,IAAI;gBACb,MAAM,IAAI,KAAK,CAAC,+GAA+G,CAAC,CAAC;YACrI,IAAI,OAAO,GAAG,IAAI,gCAAc,EAAE,CAAC;YACnC,IAAI,OAAO,GAAG,IAAI,iCAAY,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG,IAAI,yCAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBACvD,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU;gBACzC,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI;gBAC7B,cAAc,EAAE,IAAI,CAAC,aAAa,CAAC,cAAc;gBACjD,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe;aACtD,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QACjD,CAAC;KAAA;CACJ;AAxDD,sDAwDC;AAAA,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LogGroupRetentionUnit = void 0;
|
|
4
|
+
var LogGroupRetentionUnit;
|
|
5
|
+
(function (LogGroupRetentionUnit) {
|
|
6
|
+
LogGroupRetentionUnit["minutes"] = "minutes";
|
|
7
|
+
LogGroupRetentionUnit["hours"] = "hours";
|
|
8
|
+
LogGroupRetentionUnit["days"] = "days";
|
|
9
|
+
LogGroupRetentionUnit["weeks"] = "weeks";
|
|
10
|
+
LogGroupRetentionUnit["months"] = "months";
|
|
11
|
+
LogGroupRetentionUnit["years"] = "years";
|
|
12
|
+
})(LogGroupRetentionUnit || (exports.LogGroupRetentionUnit = LogGroupRetentionUnit = {}));
|
|
13
|
+
//# sourceMappingURL=LogGroupRetentionUnit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LogGroupRetentionUnit.js","sourceRoot":"","sources":["../../src/enum/LogGroupRetentionUnit.ts"],"names":[],"mappings":";;;AAoBA,IAAY,qBAQX;AARD,WAAY,qBAAqB;IAE7B,4CAAmB,CAAA;IACnB,wCAAe,CAAA;IACf,sCAAa,CAAA;IACb,wCAAe,CAAA;IACf,0CAAiB,CAAA;IACjB,wCAAe,CAAA;AACnB,CAAC,EARW,qBAAqB,qCAArB,qBAAqB,QAQhC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -79,6 +79,7 @@ export * from "./command/LogGroupUpdateCommand";
|
|
|
79
79
|
export * from "./command/LogListCommand";
|
|
80
80
|
export * from "./command/ValueCommand";
|
|
81
81
|
export * from "./command/ValueListCommand";
|
|
82
|
+
export * from "./enum/LogGroupRetentionUnit";
|
|
82
83
|
export * from "./meta/AlarmCategoryMetaTable";
|
|
83
84
|
export * from "./meta/AlarmFieldMetaTable";
|
|
84
85
|
export * from "./meta/AlarmMetaTable";
|
package/dist/index.js
CHANGED
|
@@ -95,6 +95,7 @@ __exportStar(require("./command/LogGroupUpdateCommand"), exports);
|
|
|
95
95
|
__exportStar(require("./command/LogListCommand"), exports);
|
|
96
96
|
__exportStar(require("./command/ValueCommand"), exports);
|
|
97
97
|
__exportStar(require("./command/ValueListCommand"), exports);
|
|
98
|
+
__exportStar(require("./enum/LogGroupRetentionUnit"), exports);
|
|
98
99
|
__exportStar(require("./meta/AlarmCategoryMetaTable"), exports);
|
|
99
100
|
__exportStar(require("./meta/AlarmFieldMetaTable"), exports);
|
|
100
101
|
__exportStar(require("./meta/AlarmMetaTable"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAoBA,kDAAgC;AAChC,kDAAgC;AAChC,mDAAiC;AACjC,+CAA6B;AAC7B,4CAA0B;AAC1B,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,2CAAyB;AACzB,wDAAsC;AACtC,6DAA2C;AAC3C,qEAAmD;AACnD,kEAAgD;AAChD,gEAA8C;AAC9C,4DAA0C;AAC1C,+DAA6C;AAC7C,2DAAyC;AACzC,gEAA8C;AAC9C,wEAAsD;AACtD,qEAAmD;AACnD,mEAAiD;AACjD,6DAA2C;AAC3C,kDAAgC;AAChC,+CAA6B;AAC7B,wDAAsC;AACtC,iEAA+C;AAC/C,uEAAqD;AACrD,uEAAqD;AACrD,oEAAkD;AAClD,qEAAmD;AACnD,uEAAqD;AACrD,yDAAuC;AACvC,+DAA6C;AAC7C,+DAA6C;AAC7C,8DAA4C;AAC5C,oEAAkD;AAClD,oEAAkD;AAClD,iEAA+C;AAC/C,kEAAgD;AAChD,oEAAkD;AAClD,4DAA0C;AAC1C,6DAA2C;AAC3C,4DAA0C;AAC1C,kEAAgD;AAChD,kEAAgD;AAChD,+DAA6C;AAC7C,gEAA8C;AAC9C,kEAAgD;AAChD,+DAA6C;AAC7C,2DAAyC;AACzC,8DAA4C;AAC5C,uDAAqC;AACrC,6DAA2C;AAC3C,0DAAwC;AACxC,oEAAkD;AAClD,0EAAwD;AACxD,0EAAwD;AACxD,uEAAqD;AACrD,wEAAsD;AACtD,0EAAwD;AACxD,4DAA0C;AAC1C,kEAAgD;AAChD,kEAAgD;AAChD,iEAA+C;AAC/C,uEAAqD;AACrD,uEAAqD;AACrD,oEAAkD;AAClD,qEAAmD;AACnD,uEAAqD;AACrD,+DAA6C;AAC7C,gEAA8C;AAC9C,+DAA6C;AAC7C,qEAAmD;AACnD,qEAAmD;AACnD,kEAAgD;AAChD,mEAAiD;AACjD,qEAAmD;AACnD,kEAAgD;AAChD,2DAAyC;AACzC,yDAAuC;AACvC,6DAA2C;AAC3C,gEAA8C;AAC9C,6DAA2C;AAC3C,wDAAsC;AACtC,2DAAyC;AACzC,mEAAiD;AACjD,gEAA8C;AAC9C,2DAAyC;AACzC,8DAA4C;AAC5C,sDAAoC;AACpC,sDAAoC;AACpC,yDAAuC;AACvC,sDAAoC;AACpC,sDAAoC;AACpC,iDAA+B;AAC/B,oDAAkC;AAClC,+DAA6C;AAC7C,4DAA0C;AAC1C,0DAAwC;AACxC,qDAAmC;AACnC,4DAA0C;AAC1C,yDAAuC;AACvC,yDAAuC;AACvC,oDAAkC;AAClC,uDAAqC;AACrC,+CAA6B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAoBA,kDAAgC;AAChC,kDAAgC;AAChC,mDAAiC;AACjC,+CAA6B;AAC7B,4CAA0B;AAC1B,4CAA0B;AAC1B,wCAAsB;AACtB,6CAA2B;AAC3B,2CAAyB;AACzB,wDAAsC;AACtC,6DAA2C;AAC3C,qEAAmD;AACnD,kEAAgD;AAChD,gEAA8C;AAC9C,4DAA0C;AAC1C,+DAA6C;AAC7C,2DAAyC;AACzC,gEAA8C;AAC9C,wEAAsD;AACtD,qEAAmD;AACnD,mEAAiD;AACjD,6DAA2C;AAC3C,kDAAgC;AAChC,+CAA6B;AAC7B,wDAAsC;AACtC,iEAA+C;AAC/C,uEAAqD;AACrD,uEAAqD;AACrD,oEAAkD;AAClD,qEAAmD;AACnD,uEAAqD;AACrD,yDAAuC;AACvC,+DAA6C;AAC7C,+DAA6C;AAC7C,8DAA4C;AAC5C,oEAAkD;AAClD,oEAAkD;AAClD,iEAA+C;AAC/C,kEAAgD;AAChD,oEAAkD;AAClD,4DAA0C;AAC1C,6DAA2C;AAC3C,4DAA0C;AAC1C,kEAAgD;AAChD,kEAAgD;AAChD,+DAA6C;AAC7C,gEAA8C;AAC9C,kEAAgD;AAChD,+DAA6C;AAC7C,2DAAyC;AACzC,8DAA4C;AAC5C,uDAAqC;AACrC,6DAA2C;AAC3C,0DAAwC;AACxC,oEAAkD;AAClD,0EAAwD;AACxD,0EAAwD;AACxD,uEAAqD;AACrD,wEAAsD;AACtD,0EAAwD;AACxD,4DAA0C;AAC1C,kEAAgD;AAChD,kEAAgD;AAChD,iEAA+C;AAC/C,uEAAqD;AACrD,uEAAqD;AACrD,oEAAkD;AAClD,qEAAmD;AACnD,uEAAqD;AACrD,+DAA6C;AAC7C,gEAA8C;AAC9C,+DAA6C;AAC7C,qEAAmD;AACnD,qEAAmD;AACnD,kEAAgD;AAChD,mEAAiD;AACjD,qEAAmD;AACnD,kEAAgD;AAChD,2DAAyC;AACzC,yDAAuC;AACvC,6DAA2C;AAC3C,+DAA6C;AAC7C,gEAA8C;AAC9C,6DAA2C;AAC3C,wDAAsC;AACtC,2DAAyC;AACzC,mEAAiD;AACjD,gEAA8C;AAC9C,2DAAyC;AACzC,8DAA4C;AAC5C,sDAAoC;AACpC,sDAAoC;AACpC,yDAAuC;AACvC,sDAAoC;AACpC,sDAAoC;AACpC,iDAA+B;AAC/B,oDAAkC;AAClC,+DAA6C;AAC7C,4DAA0C;AAC1C,0DAAwC;AACxC,qDAAmC;AACnC,4DAA0C;AAC1C,yDAAuC;AACvC,yDAAuC;AACvC,oDAAkC;AAClC,uDAAqC;AACrC,+CAA6B"}
|
|
@@ -10,6 +10,8 @@ class LogGroupMetaTable extends namirasoft_core_1.BaseMetaTable {
|
|
|
10
10
|
user_id: new namirasoft_core_1.BaseMetaColumn("user_id", "User Id", "String", true),
|
|
11
11
|
project_id: new namirasoft_core_1.BaseMetaColumn("project_id", "Project Id", "String", true),
|
|
12
12
|
name: new namirasoft_core_1.BaseMetaColumn("name", "Name", "String", true),
|
|
13
|
+
retention_unit: new namirasoft_core_1.BaseMetaColumn("retention_unit", "Retention Unit", "Enum", true),
|
|
14
|
+
retention_value: new namirasoft_core_1.BaseMetaColumn("retention_value", "Retention Value", "Integer", true),
|
|
13
15
|
};
|
|
14
16
|
}
|
|
15
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogGroupMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogGroupMetaTable.ts"],"names":[],"mappings":";;;AAoBA,qDAAgE;AAEhE,MAAa,iBAAkB,SAAQ,+BAAa;
|
|
1
|
+
{"version":3,"file":"LogGroupMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogGroupMetaTable.ts"],"names":[],"mappings":";;;AAoBA,qDAAgE;AAEhE,MAAa,iBAAkB,SAAQ,+BAAa;IAUhD;QAEI,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG;YACX,EAAE,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC;YAClD,OAAO,EAAE,IAAI,gCAAc,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC;YACjE,UAAU,EAAE,IAAI,gCAAc,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC;YAC1E,IAAI,EAAE,IAAI,gCAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC;YACxD,cAAc,EAAE,IAAI,gCAAc,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC;YACpF,eAAe,EAAE,IAAI,gCAAc,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,SAAS,EAAE,IAAI,CAAC;SAC7F,CAAC;IACN,CAAC;CACJ;AAtBD,8CAsBC;AAAA,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { BaseMetaColumn, BaseMetaTable } from "namirasoft-core";
|
|
2
2
|
export declare class LogMetaTable extends BaseMetaTable {
|
|
3
3
|
columns: {
|
|
4
|
+
id: BaseMetaColumn;
|
|
4
5
|
user_id: BaseMetaColumn;
|
|
5
6
|
log_group_id: BaseMetaColumn;
|
|
6
7
|
product_id: BaseMetaColumn;
|
|
7
8
|
project_id: BaseMetaColumn;
|
|
8
9
|
level: BaseMetaColumn;
|
|
9
10
|
message: BaseMetaColumn;
|
|
10
|
-
|
|
11
|
+
created_at: BaseMetaColumn;
|
|
11
12
|
};
|
|
12
13
|
constructor();
|
|
13
14
|
}
|
|
@@ -6,13 +6,14 @@ class LogMetaTable extends namirasoft_core_1.BaseMetaTable {
|
|
|
6
6
|
constructor() {
|
|
7
7
|
super("log", "Log");
|
|
8
8
|
this.columns = {
|
|
9
|
+
id: new namirasoft_core_1.BaseMetaColumn("id", "Id", "String", false),
|
|
9
10
|
user_id: new namirasoft_core_1.BaseMetaColumn("user_id", "User Id", "String", false),
|
|
10
11
|
log_group_id: new namirasoft_core_1.BaseMetaColumn("log_group_id", "Log Group Id", "String", false),
|
|
11
12
|
product_id: new namirasoft_core_1.BaseMetaColumn("product_id", "Product Id", "String", false),
|
|
12
13
|
project_id: new namirasoft_core_1.BaseMetaColumn("project_id", "Project Id", "String", false),
|
|
13
14
|
level: new namirasoft_core_1.BaseMetaColumn("level", "Level", "String", false),
|
|
14
15
|
message: new namirasoft_core_1.BaseMetaColumn("message", "Message", "String", false),
|
|
15
|
-
|
|
16
|
+
created_at: new namirasoft_core_1.BaseMetaColumn("created_at", "Created At", "DateTime", false),
|
|
16
17
|
};
|
|
17
18
|
}
|
|
18
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LogMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogMetaTable.ts"],"names":[],"mappings":";;;AAoBA,qDAAgE;AAEhE,MAAa,YAAa,SAAQ,+BAAa;
|
|
1
|
+
{"version":3,"file":"LogMetaTable.js","sourceRoot":"","sources":["../../src/meta/LogMetaTable.ts"],"names":[],"mappings":";;;AAoBA,qDAAgE;AAEhE,MAAa,YAAa,SAAQ,+BAAa;IAY3C;QAEI,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG;YACX,EAAE,EAAE,IAAI,gCAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC;YACnD,OAAO,EAAE,IAAI,gCAAc,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC;YAClE,YAAY,EAAE,IAAI,gCAAc,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,KAAK,CAAC;YACjF,UAAU,EAAE,IAAI,gCAAc,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC;YAC3E,UAAU,EAAE,IAAI,gCAAc,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,CAAC;YAC3E,KAAK,EAAE,IAAI,gCAAc,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC;YAC5D,OAAO,EAAE,IAAI,gCAAc,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC;YAClE,UAAU,EAAE,IAAI,gCAAc,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC;SAChF,CAAC;IACN,CAAC;CACJ;AA1BD,oCA0BC;AAAA,CAAC"}
|
package/dist/row/LogRow.d.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export type LogRow = {
|
|
2
|
+
id: (string | null);
|
|
2
3
|
user_id: (string | null);
|
|
3
4
|
log_group_id: (string | null);
|
|
4
5
|
product_id: (string | null);
|
|
5
6
|
project_id: (string | null);
|
|
6
7
|
level: (string | null);
|
|
7
8
|
message: (string | null);
|
|
8
|
-
|
|
9
|
+
created_at: (Date | null);
|
|
9
10
|
};
|
package/package.json
CHANGED
|
@@ -25,6 +25,6 @@ export class NamirasoftLogServerBase extends NamirasoftServerBase
|
|
|
25
25
|
{
|
|
26
26
|
constructor(manager: TokenManager, onError: (error: Error) => void)
|
|
27
27
|
{
|
|
28
|
-
super(`https://log.namirasoft.com/api/v1`, `1.3.
|
|
28
|
+
super(`https://log.namirasoft.com/api/v1`, `1.3.27`, manager, onError);
|
|
29
29
|
}
|
|
30
30
|
};
|
|
@@ -43,6 +43,22 @@ export class LogGroupCreateCommand extends BaseFinalCommand
|
|
|
43
43
|
optional: false,
|
|
44
44
|
args: ["name"],
|
|
45
45
|
defaults: [""]
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
name: "retention_unit",
|
|
49
|
+
short: "",
|
|
50
|
+
description: "Provides the value of 'retention_unit' in body",
|
|
51
|
+
optional: false,
|
|
52
|
+
args: ["retention_unit"],
|
|
53
|
+
defaults: [""]
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
name: "retention_value",
|
|
57
|
+
short: "",
|
|
58
|
+
description: "Provides the value of 'retention_value' in body",
|
|
59
|
+
optional: false,
|
|
60
|
+
args: ["retention_value"],
|
|
61
|
+
defaults: [""]
|
|
46
62
|
}
|
|
47
63
|
]);
|
|
48
64
|
}
|
|
@@ -57,7 +73,9 @@ export class LogGroupCreateCommand extends BaseFinalCommand
|
|
|
57
73
|
let server = new NamirasoftLogServer(manager, e => this.app.logger.error(e.message));
|
|
58
74
|
let ans = await server.loggroup.Create({
|
|
59
75
|
project_id: this.option_values.project_id,
|
|
60
|
-
name: this.option_values.name
|
|
76
|
+
name: this.option_values.name,
|
|
77
|
+
retention_unit: this.option_values.retention_unit,
|
|
78
|
+
retention_value: this.option_values.retention_value
|
|
61
79
|
});
|
|
62
80
|
this.app.logger.success(JSON.stringify(ans));
|
|
63
81
|
}
|
|
@@ -43,6 +43,22 @@ export class LogGroupUpdateCommand extends BaseFinalCommand
|
|
|
43
43
|
optional: false,
|
|
44
44
|
args: ["name"],
|
|
45
45
|
defaults: [""]
|
|
46
|
+
},
|
|
47
|
+
{
|
|
48
|
+
name: "retention_unit",
|
|
49
|
+
short: "",
|
|
50
|
+
description: "Provides the value of 'retention_unit' in body",
|
|
51
|
+
optional: false,
|
|
52
|
+
args: ["retention_unit"],
|
|
53
|
+
defaults: [""]
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
name: "retention_value",
|
|
57
|
+
short: "",
|
|
58
|
+
description: "Provides the value of 'retention_value' in body",
|
|
59
|
+
optional: false,
|
|
60
|
+
args: ["retention_value"],
|
|
61
|
+
defaults: [""]
|
|
46
62
|
}
|
|
47
63
|
]);
|
|
48
64
|
}
|
|
@@ -57,7 +73,9 @@ export class LogGroupUpdateCommand extends BaseFinalCommand
|
|
|
57
73
|
let server = new NamirasoftLogServer(manager, e => this.app.logger.error(e.message));
|
|
58
74
|
let ans = await server.loggroup.Update(this.arg_values[0], {
|
|
59
75
|
project_id: this.option_values.project_id,
|
|
60
|
-
name: this.option_values.name
|
|
76
|
+
name: this.option_values.name,
|
|
77
|
+
retention_unit: this.option_values.retention_unit,
|
|
78
|
+
retention_value: this.option_values.retention_value
|
|
61
79
|
});
|
|
62
80
|
this.app.logger.success(JSON.stringify(ans));
|
|
63
81
|
}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/****************************************************************/
|
|
2
|
+
/* */
|
|
3
|
+
/* This is an Auto-Generated File */
|
|
4
|
+
/* Made By */
|
|
5
|
+
/* Namirasoft SDK Generator NPM Package */
|
|
6
|
+
/* */
|
|
7
|
+
/****************************************************************/
|
|
8
|
+
/****************************************************************/
|
|
9
|
+
/* */
|
|
10
|
+
/* Please do not make any change to this file */
|
|
11
|
+
/* If any changed is reqired, ns-sdkg command must be used */
|
|
12
|
+
/* */
|
|
13
|
+
/****************************************************************/
|
|
14
|
+
/****************************************************************/
|
|
15
|
+
/* */
|
|
16
|
+
/* Namira Software Corporation */
|
|
17
|
+
/* https://namirasoft.com */
|
|
18
|
+
/* */
|
|
19
|
+
/****************************************************************/
|
|
20
|
+
|
|
21
|
+
export enum LogGroupRetentionUnit
|
|
22
|
+
{
|
|
23
|
+
minutes = "minutes",
|
|
24
|
+
hours = "hours",
|
|
25
|
+
days = "days",
|
|
26
|
+
weeks = "weeks",
|
|
27
|
+
months = "months",
|
|
28
|
+
years = "years",
|
|
29
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -99,6 +99,7 @@ export * from "./command/LogGroupUpdateCommand";
|
|
|
99
99
|
export * from "./command/LogListCommand";
|
|
100
100
|
export * from "./command/ValueCommand";
|
|
101
101
|
export * from "./command/ValueListCommand";
|
|
102
|
+
export * from "./enum/LogGroupRetentionUnit";
|
|
102
103
|
export * from "./meta/AlarmCategoryMetaTable";
|
|
103
104
|
export * from "./meta/AlarmFieldMetaTable";
|
|
104
105
|
export * from "./meta/AlarmMetaTable";
|
|
@@ -27,6 +27,8 @@ export class LogGroupMetaTable extends BaseMetaTable
|
|
|
27
27
|
user_id: BaseMetaColumn;
|
|
28
28
|
project_id: BaseMetaColumn;
|
|
29
29
|
name: BaseMetaColumn;
|
|
30
|
+
retention_unit: BaseMetaColumn;
|
|
31
|
+
retention_value: BaseMetaColumn;
|
|
30
32
|
}
|
|
31
33
|
constructor()
|
|
32
34
|
{
|
|
@@ -36,6 +38,8 @@ export class LogGroupMetaTable extends BaseMetaTable
|
|
|
36
38
|
user_id: new BaseMetaColumn("user_id", "User Id", "String", true),
|
|
37
39
|
project_id: new BaseMetaColumn("project_id", "Project Id", "String", true),
|
|
38
40
|
name: new BaseMetaColumn("name", "Name", "String", true),
|
|
41
|
+
retention_unit: new BaseMetaColumn("retention_unit", "Retention Unit", "Enum", true),
|
|
42
|
+
retention_value: new BaseMetaColumn("retention_value", "Retention Value", "Integer", true),
|
|
39
43
|
};
|
|
40
44
|
}
|
|
41
45
|
};
|
package/src/meta/LogMetaTable.ts
CHANGED
|
@@ -23,25 +23,27 @@ import { BaseMetaColumn, BaseMetaTable } from "namirasoft-core";
|
|
|
23
23
|
export class LogMetaTable extends BaseMetaTable
|
|
24
24
|
{
|
|
25
25
|
public columns!: {
|
|
26
|
+
id: BaseMetaColumn;
|
|
26
27
|
user_id: BaseMetaColumn;
|
|
27
28
|
log_group_id: BaseMetaColumn;
|
|
28
29
|
product_id: BaseMetaColumn;
|
|
29
30
|
project_id: BaseMetaColumn;
|
|
30
31
|
level: BaseMetaColumn;
|
|
31
32
|
message: BaseMetaColumn;
|
|
32
|
-
|
|
33
|
+
created_at: BaseMetaColumn;
|
|
33
34
|
}
|
|
34
35
|
constructor()
|
|
35
36
|
{
|
|
36
37
|
super("log", "Log");
|
|
37
38
|
this.columns = {
|
|
39
|
+
id: new BaseMetaColumn("id", "Id", "String", false),
|
|
38
40
|
user_id: new BaseMetaColumn("user_id", "User Id", "String", false),
|
|
39
41
|
log_group_id: new BaseMetaColumn("log_group_id", "Log Group Id", "String", false),
|
|
40
42
|
product_id: new BaseMetaColumn("product_id", "Product Id", "String", false),
|
|
41
43
|
project_id: new BaseMetaColumn("project_id", "Project Id", "String", false),
|
|
42
44
|
level: new BaseMetaColumn("level", "Level", "String", false),
|
|
43
45
|
message: new BaseMetaColumn("message", "Message", "String", false),
|
|
44
|
-
|
|
46
|
+
created_at: new BaseMetaColumn("created_at", "Created At", "DateTime", false),
|
|
45
47
|
};
|
|
46
48
|
}
|
|
47
49
|
};
|
|
@@ -18,8 +18,12 @@
|
|
|
18
18
|
/* */
|
|
19
19
|
/****************************************************************/
|
|
20
20
|
|
|
21
|
+
import { LogGroupRetentionUnit } from "../enum/LogGroupRetentionUnit";
|
|
22
|
+
|
|
21
23
|
export type LogGroupInputRow =
|
|
22
24
|
{
|
|
23
25
|
project_id: (string | null);
|
|
24
26
|
name: string;
|
|
27
|
+
retention_unit: LogGroupRetentionUnit;
|
|
28
|
+
retention_value: number;
|
|
25
29
|
}
|
package/src/row/LogGroupRow.ts
CHANGED
|
@@ -18,10 +18,14 @@
|
|
|
18
18
|
/* */
|
|
19
19
|
/****************************************************************/
|
|
20
20
|
|
|
21
|
+
import { LogGroupRetentionUnit } from "../enum/LogGroupRetentionUnit";
|
|
22
|
+
|
|
21
23
|
export type LogGroupRow =
|
|
22
24
|
{
|
|
23
25
|
id: string;
|
|
24
26
|
user_id: string;
|
|
25
27
|
project_id: string;
|
|
26
28
|
name: string;
|
|
29
|
+
retention_unit: LogGroupRetentionUnit;
|
|
30
|
+
retention_value: number;
|
|
27
31
|
}
|
package/src/row/LogRow.ts
CHANGED
|
@@ -20,11 +20,12 @@
|
|
|
20
20
|
|
|
21
21
|
export type LogRow =
|
|
22
22
|
{
|
|
23
|
+
id: (string | null);
|
|
23
24
|
user_id: (string | null);
|
|
24
25
|
log_group_id: (string | null);
|
|
25
26
|
product_id: (string | null);
|
|
26
27
|
project_id: (string | null);
|
|
27
28
|
level: (string | null);
|
|
28
29
|
message: (string | null);
|
|
29
|
-
|
|
30
|
+
created_at: (Date | null);
|
|
30
31
|
}
|