diff --git a/HttpBridgeActivity.cs b/HttpBridgeActivity.cs index fc1a8d7..4698585 100644 --- a/HttpBridgeActivity.cs +++ b/HttpBridgeActivity.cs @@ -266,7 +266,7 @@ namespace UMC.Host fom.AddPrompt("注意:流量过期后,剩余流量将会清零"); fom.Submit("去充值", $"{request.Model}.{request.Command}"); - fom.Add(UICell.UI("联系官方", "天才工程师为你解答", new UIClick("Contact").Send("System", "License"))); + fom.Add(UICell.UI("联系官方", "让天才工程师为你服务", new UIClick("Contact").Send("System", "License"))); return fom; }); diff --git a/HttpMimeServier.cs b/HttpMimeServier.cs index 76cbfca..790d9bd 100644 --- a/HttpMimeServier.cs +++ b/HttpMimeServier.cs @@ -536,9 +536,9 @@ namespace UMC.Host { var host = str[1]; - if (System.Text.RegularExpressions.Regex.IsMatch(host, @"^([a-z0-9]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z0-9]{1,6}$") == false) + if (System.Text.RegularExpressions.Regex.IsMatch(host, @"^([a-z0-9\*]([a-z0-9\-]{0,61}[a-z0-9])?\.)+[a-z0-9]{1,6}$") == false) { - pipeServer.Write(System.Text.Encoding.UTF8.GetBytes($"证书域名格式不正确。\r\n")); + pipeServer.Write(System.Text.Encoding.UTF8.GetBytes($"域名格式不正确。\r\n")); break; } @@ -559,9 +559,9 @@ namespace UMC.Host var hs = JSON.Deserialize(jsonStr); if (string.Equals(hs["code"], "success")) { - if (UMC.Net.Certificater.Certificates.TryGetValue(host, out var _v) == false) + if (UMC.Net.Certificater.Certificates.TryGetValue(hs["domain"] ?? host, out var _v) == false) { - _v = new Certificater() { Name = host, Status = 0 }; + _v = new Certificater() { Name = hs["domain"] ?? host, Status = 0 }; UMC.Net.Certificater.Certificates[_v.Name] = _v; } _v.Status = -1;