diff --git a/Hadoop/ZKLT.Hadoop.API/Controllers/HadoopController.cs b/Hadoop/ZKLT.Hadoop.API/Controllers/HadoopController.cs index 646ac12..54a4098 100644 --- a/Hadoop/ZKLT.Hadoop.API/Controllers/HadoopController.cs +++ b/Hadoop/ZKLT.Hadoop.API/Controllers/HadoopController.cs @@ -22,14 +22,38 @@ namespace ZKLT.Hadoop.API.Controllers private IHadoopService _HadoopService; [HttpGet("getid")] - public ActionResult GetId([FromQuery] string? prefix) { - string _result = ""; - if (!string.IsNullOrEmpty(prefix)) { - _result += prefix; - } - var _date = DateTime.Now; - _result += $@"{_date.Year.ToString().PadLeft(4,'0')}{_date.Month.ToString().PadLeft(2, '0')}{_date.Day.ToString().PadLeft(2, '0')}{_date.Hour.ToString().PadLeft(2, '0')}{_date.Minute.ToString().PadLeft(2, '0')}{_date.Second.ToString().PadLeft(2, '0')}{_date.Millisecond.ToString().PadLeft(3, '0')}{new Random().Next(1000).ToString().PadLeft(4,'0')}"; - return Ok(_result); + public ActionResult GetId([FromQuery] string? prefix, [FromQuery] int? count) { + if (count != null && count > 0) + { + List _result = new List(); + for (int i = 0; i < count; i++) { + string _temp = ""; + if (!string.IsNullOrEmpty(prefix)) + { + _temp += prefix; + } + var _date = DateTime.Now; + _temp += $@"{_date.Year.ToString().PadLeft(4, '0')}{_date.Month.ToString().PadLeft(2, '0')}{_date.Day.ToString().PadLeft(2, '0')}{_date.Hour.ToString().PadLeft(2, '0')}{_date.Minute.ToString().PadLeft(2, '0')}{_date.Second.ToString().PadLeft(2, '0')}{_date.Millisecond.ToString().PadLeft(3, '0')}{new Random().Next(9999).ToString().PadLeft(4, '0')}"; + if (_result.Any(v => v == _temp)) + { + i--; + } + else { + _result.Add(_temp); + } + } + return Ok(_result); + } + else { + string _result = ""; + if (!string.IsNullOrEmpty(prefix)) + { + _result += prefix; + } + var _date = DateTime.Now; + _result += $@"{_date.Year.ToString().PadLeft(4, '0')}{_date.Month.ToString().PadLeft(2, '0')}{_date.Day.ToString().PadLeft(2, '0')}{_date.Hour.ToString().PadLeft(2, '0')}{_date.Minute.ToString().PadLeft(2, '0')}{_date.Second.ToString().PadLeft(2, '0')}{_date.Millisecond.ToString().PadLeft(3, '0')}{new Random().Next(9999).ToString().PadLeft(4, '0')}"; + return Ok(_result); + } } [HttpGet("getsource")] diff --git a/Hadoop/ZKLT.Hadoop.API/Properties/launchSettings.json b/Hadoop/ZKLT.Hadoop.API/Properties/launchSettings.json index 828e8ba..a589d55 100644 --- a/Hadoop/ZKLT.Hadoop.API/Properties/launchSettings.json +++ b/Hadoop/ZKLT.Hadoop.API/Properties/launchSettings.json @@ -8,7 +8,7 @@ "ASPNETCORE_ENVIRONMENT": "Development" }, "dotnetRunMessages": true, - "applicationUrl": "http://localhost:5171" + "applicationUrl": "http://*:5171" }, "IIS Express": { "commandName": "IISExpress", diff --git a/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json b/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json index c97e6f6..1f07c59 100644 --- a/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json +++ b/Hadoop/ZKLT.Hadoop.API/appsettings.Development.json @@ -6,10 +6,10 @@ } }, "ConnectionStrings": { - "Host": "127.0.0.1", + "Host": "1.94.127.210", "Account": "root", - "PassWord": "root", - "Key": "hadoopdb", + "PassWord": "Panjiandong1994", + "Key": "erptest", "Port": "3306" } } diff --git a/Hadoop/ZKLT.Hadoop.API/appsettings.json b/Hadoop/ZKLT.Hadoop.API/appsettings.json index 90511ac..9cfc1ad 100644 --- a/Hadoop/ZKLT.Hadoop.API/appsettings.json +++ b/Hadoop/ZKLT.Hadoop.API/appsettings.json @@ -7,10 +7,10 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "Host": "host.docker.internal", + "Host": "1.94.127.210", "Account": "root", "PassWord": "Panjiandong1994", - "Key": "erp", + "Key": "erptest", "Port": "3306" } } diff --git a/Hadoop/ZKLT.Hadoop.API/docker-build.bat b/Hadoop/ZKLT.Hadoop.API/docker-build.bat index 5bab267..c4a6f06 100644 --- a/Hadoop/ZKLT.Hadoop.API/docker-build.bat +++ b/Hadoop/ZKLT.Hadoop.API/docker-build.bat @@ -1 +1 @@ -docker build -f ./Dockerfile -t hadoop:1.0.0 ../../. \ No newline at end of file +docker build -f ./Dockerfile -t hadoop:1.0.3 ../../. \ No newline at end of file diff --git a/Hadoop/ZKLT.Hadoop.Model/HDP_CommandAction.cs b/Hadoop/ZKLT.Hadoop.Model/HDP_CommandAction.cs index 0d3be48..c92a5fd 100644 --- a/Hadoop/ZKLT.Hadoop.Model/HDP_CommandAction.cs +++ b/Hadoop/ZKLT.Hadoop.Model/HDP_CommandAction.cs @@ -55,14 +55,14 @@ namespace ZKLT.Hadoop.Model string _guid; if (value is string) { string _action = value.ToString()!; - Regex _regex1 = new Regex(@"(?<=(\+\=))\d+"); + Regex _regex1 = new Regex(@"(?<=(\+\=))[\d\.]+"); if(_regex1.IsMatch(_action)) { _guid = Guid.NewGuid().ToString("N"); param.Add(_guid,_regex1.Match(_action).Value); return @$"`{column.Key}` + @{_guid}"; } - Regex _regex2 = new Regex(@"(?<=(\-\=))\d+"); + Regex _regex2 = new Regex(@"(?<=(\-\=))[\d\.]+"); if (_regex2.IsMatch(_action)) { _guid = Guid.NewGuid().ToString("N");