Merge branch 'master' of https://github.com/dotnetcore/SmartSql

Ahoo-Wang · Ahoo-Wang · commit 85b84e21eca3 · 2019-07-10T11:52:01.000+08:00
diff --git a/src/SmartSql/IdGenerator/SnowflakeIdState.cs b/src/SmartSql/IdGenerator/SnowflakeIdState.cs
@@ -24,10 +24,10 @@ public SnowflakeIdState(long id, ISnowflakeId idGen)
             }
 
             UtcTime = _idGen.EpochTime.AddMilliseconds((Id >> _idGen.TimestampShift) & _idGen.TimestampMask);
-            var sequenceFormat = $"D{MachineIdLength}";
-            var machineIdFormat = $"D{SequenceLength}";
+            var machineIdFormat = $"D{MachineIdLength}";
+            var sequenceFormat = $"D{SequenceLength}";
             IdString =
-                $"{UtcTime.ToString(TIME_FORMAT)}{MachineId.ToString(sequenceFormat)}{Sequence.ToString(machineIdFormat)}";
+                $"{UtcTime.ToString(TIME_FORMAT)}{MachineId.ToString(machineIdFormat)}{Sequence.ToString(sequenceFormat)}";
         }
 
         public SnowflakeIdState(String idString, ISnowflakeId idGen)

Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,10 @@ public SnowflakeIdState(long id, ISnowflakeId idGen)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`UtcTime = _idGen.EpochTime.AddMilliseconds((Id >> _idGen.TimestampShift) & _idGen.TimestampMask);`
`27`		`- var sequenceFormat = $"D{MachineIdLength}";`
`28`		`- var machineIdFormat = $"D{SequenceLength}";`
	`27`	`+ var machineIdFormat = $"D{MachineIdLength}";`
	`28`	`+ var sequenceFormat = $"D{SequenceLength}";`
`29`	`29`	`IdString =`
`30`		`- $"{UtcTime.ToString(TIME_FORMAT)}{MachineId.ToString(sequenceFormat)}{Sequence.ToString(machineIdFormat)}";`
	`30`	`+ $"{UtcTime.ToString(TIME_FORMAT)}{MachineId.ToString(machineIdFormat)}{Sequence.ToString(sequenceFormat)}";`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public SnowflakeIdState(String idString, ISnowflakeId idGen)`