fix(uwp): kvp UNIQUE id

Author: hal-wang

src/Lavcode.Service.Sqlite/ConService.cs

@@ -1,10 +1,8 @@
 using HTools;
 using Lavcode.IService;
 using Lavcode.Service.Sqlite.Entities;
-using Newtonsoft.Json.Linq;
 using SQLite;
 using System;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
 
@@ -22,22 +20,14 @@ public async Task<bool> Connect(object args)
             _args = args;
 
             var filePath = DynamicHelper.ToExpandoObject(args).FilePath as string;
-            try
-            {
-                Connection?.Dispose();
-                Connection = new SQLiteConnection(filePath);
-                await TaskExtend.Run(() =>
-                {
-                    CreateTables();
-                    TryUpdateKvpId();
-                });
-                return true;
-            }
-            catch (Exception ex)
+            Connection?.Dispose();
+            Connection = new SQLiteConnection(filePath);
+            await TaskExtend.Run(() =>
             {
-                Debug.Write(ex);
-                return false;
-            }
+                TryUpdateKvpId();
+                CreateTables();
+            });
+            return true;
         }
 
         public virtual async Task<bool> Refresh()
@@ -67,12 +57,15 @@ private void TryUpdateKvpId()
         {
             if (!IsKvpIdNeedUpdate()) return;
 
-            var kvps = Connection.Table<KeyValuePairEntity>().ToArray();
-            foreach (var kvp in kvps)
+            var index = 1;
+            var kvps = Connection.Table<BeforeKeyValuePairEntity>().ToArray().Select(item => new KeyValuePairEntity()
             {
                 // fix 合并冲突
-                kvp.Id = kvp.Id + kvp.PasswordId;
-            }
+                Id = item.Id + item.SourceId + index++,
+                PasswordId = item.SourceId,
+                Key = item.Key,
+                Value = item.Value,
+            });
             Connection.RunInTransaction(() =>
             {
                 Connection.Execute("drop table [KeyValuePair]");

src/Lavcode.Service.Sqlite/Entities/BeforeKeyValuePairEntity.cs

@@ -0,0 +1,13 @@
+using SQLite;
+
+namespace Lavcode.Service.Sqlite.Entities
+{
+    [Table("KeyValuePair")]
+    public class BeforeKeyValuePairEntity
+    {
+        public virtual int Id { get; set; }
+        public virtual string SourceId { get; set; }
+        public virtual string Key { get; set; }
+        public virtual string Value { get; set; }
+    }
+}

src/Lavcode.Uwp/Lavcode.Uwp.csproj

@@ -4,7 +4,8 @@
   <PropertyGroup>
     <LangVersion>9.0</LangVersion>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-    <PackageCertificateThumbprint>2F4003FF881CEE581F179666C77E123DDA351ACC</PackageCertificateThumbprint>
+    <PackageCertificateThumbprint>
+    </PackageCertificateThumbprint>
     <DefaultLanguage>zh-CN</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup>
@@ -28,7 +29,7 @@
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <PackageCertificateKeyFile>Lavcode.Uwp_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>

src/Lavcode.Uwp/Package.appxmanifest

@@ -11,7 +11,7 @@
   <Identity
     Name="524473F72DB2F.Lavcode"
     Publisher="CN=72C1148F-5C2B-4F28-9B8C-891A63D2777E"
-    Version="1.2.1.0" />
+    Version="1.2.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="cda4abc7-39a4-4c92-8937-e609f1c9fb70" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>