修改日常问题

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) {
+        public ActionResult GetId([FromQuery] string? prefix, [FromQuery] int? count) {
-            string _result = "";
+            if (count != null && count > 0)
-            if (!string.IsNullOrEmpty(prefix)) {
+            {
-                _result += prefix;
+                List<string> _result = new List<string>();
-            }
+                for (int i = 0; i < count; i++) {
-            var _date = DateTime.Now;
+                    string _temp = "";
-            _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')}";
+                    if (!string.IsNullOrEmpty(prefix))
-            return Ok(_result);
+                    {
+                        _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")]

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",

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",
+    "PassWord": "Panjiandong1994",
-    "Key": "hadoopdb",
+    "Key": "erptest",
     "Port": "3306"
   }
 }

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"
   }
 }

Hadoop/ZKLT.Hadoop.API/docker-build.bat

@@ -1 +1 @@
-docker build -f ./Dockerfile -t hadoop:1.0.0 ../../.
+docker build -f ./Dockerfile -t hadoop:1.0.3 ../../.

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");