diff --git a/.vscode/launch.json b/.vscode/launch.json index 9a398da..603d95a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -59,6 +59,13 @@ "type": "dart", "program": "./test/test.dart", "args": [] + }, + { + "name": "startup", + "request": "launch", + "type": "dart", + "program": "./bin/main.dart", + "args": ["exe", "-f", "C:/Work/automation/iot/script/windows/startup.yaml"] } ] } \ No newline at end of file diff --git a/lib/cli/commands/command_exe.dart b/lib/cli/commands/command_exe.dart index 83cd9f9..4cbe2ef 100644 --- a/lib/cli/commands/command_exe.dart +++ b/lib/cli/commands/command_exe.dart @@ -1,6 +1,7 @@ // ignore_for_file: avoid_init_to_null import 'dart:async'; +import 'dart:convert'; import 'dart:io'; import 'package:dart_framework/charset/euc_kr.dart'; @@ -63,7 +64,7 @@ class CommandExe extends CommandBase { if (file.existsSync()) { _handler = IsolateManager.create(IsolateExe(BuildType.file, yamlContent: file.readAsStringSync( - encoding: Platform.isWindows ? eucKr : systemEncoding))); + /*encoding: Platform.isWindows ? eucKr : systemEncoding*/))); await isComplete(); } else { await CLI.print([ diff --git a/lib/oto/commands/util/slack.dart b/lib/oto/commands/util/slack.dart index c0e5e73..00b71c4 100644 --- a/lib/oto/commands/util/slack.dart +++ b/lib/oto/commands/util/slack.dart @@ -42,8 +42,8 @@ class SlackBuild extends Command { @override Future execute(DataCommand command) async { var data = DataSlackBuild.fromJson(getParam(command)); - - await SlackSender(data.token).sendBuild(data.appName, data.type, Color.hex(data.color), data.version, data.downloadURL); + var channel = data.channel ?? 'build'; + await SlackSender(data.token).sendBuild(data.appName, data.type, Color.hex(data.color), data.version, data.downloadURL, channel: channel); return complete(0, command); } diff --git a/lib/oto/data/command_data.dart b/lib/oto/data/command_data.dart index acc7b37..323a6d6 100644 --- a/lib/oto/data/command_data.dart +++ b/lib/oto/data/command_data.dart @@ -470,6 +470,7 @@ class DataSlackBuild extends DataSlackSender { late String color; late String version; late String downloadURL; + late String? channel; factory DataSlackBuild.fromJson(Map json) => _$DataSlackBuildFromJson(json); diff --git a/lib/oto/data/command_data.g.dart b/lib/oto/data/command_data.g.dart index 8be6f47..a92573f 100644 --- a/lib/oto/data/command_data.g.dart +++ b/lib/oto/data/command_data.g.dart @@ -765,7 +765,8 @@ DataSlackBuild _$DataSlackBuildFromJson(Map json) => ..type = $enumDecode(_$SlackBuildTypeEnumMap, json['type']) ..color = json['color'] as String ..version = json['version'] as String - ..downloadURL = json['downloadURL'] as String; + ..downloadURL = json['downloadURL'] as String + ..channel = json['channel'] as String?; Map _$DataSlackBuildToJson(DataSlackBuild instance) => { @@ -781,6 +782,7 @@ Map _$DataSlackBuildToJson(DataSlackBuild instance) => 'color': instance.color, 'version': instance.version, 'downloadURL': instance.downloadURL, + 'channel': instance.channel, }; const _$SlackBuildTypeEnumMap = {