Merge pull request #34 from catcherwong/depend-and-const

upgrading dependencies and make some string to static readonly
dtm-labs · Mar 1, 2022 · 86808ba · 86808ba
2 parents 4317130 + 402c016
commit 86808ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Dtmcli/DtmClient.cs b/src/Dtmcli/DtmClient.cs
@@ -14,6 +14,8 @@ public class DtmClient : IDtmClient
     {
         private static readonly char Slash = '/';
         private static readonly string QueryStringFormat = "dtm={0}&gid={1}&trans_type={2}&branch_id={3}&op={4}";
+        private static readonly string QuestionMark = "?";
+        private static readonly string And = "&";
 
         private readonly IHttpClientFactory _httpClientFactory;
         private readonly DtmOptions _dtmOptions;
@@ -82,8 +84,8 @@ public async Task<HttpResponseMessage> TransRequestBranch(TransBase tb, HttpMeth
 
             var client = _httpClientFactory.CreateClient(Constant.BranchClientHttpName);
 
-            if (url.Contains("?")) url = string.Concat(url, "&" ,queryParams);
-            else url = string.Concat(url, "?", queryParams);
+            if (url.Contains(QuestionMark)) url = string.Concat(url, And, queryParams);
+            else url = string.Concat(url, QuestionMark, queryParams);
 
             var httpRequestMsg = new HttpRequestMessage(method, url);
             foreach (var item in tb.BranchHeaders ?? new Dictionary<string, string>())

diff --git a/src/Dtmcli/Dtmcli.csproj b/src/Dtmcli/Dtmcli.csproj
@@ -24,7 +24,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="DtmCommon" Version="0.5.0" />
+	  <PackageReference Include="DtmCommon" Version="1.0.0" />
 	</ItemGroup>
 
 </Project>