zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor:remove duplicate codes (#2101)

Browse Source 
Co-authored-by: 沈四胜 <sisheng.shen@71360.com>
This commit is contained in:
warrior
2022-07-09 14:56:49 +08:00
committed by GitHub
parent 74c41e8c5e
commit 8afe68f3f1
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/utils/version.go
View File

@@ -35,13 +35,12 @@ func CompareVersions(v1, op, v2 string) bool {
// return -1 if v1<v2, 0 if they are equal, and 1 if v1>v2 // return -1 if v1<v2, 0 if they are equal, and 1 if v1>v2
func compare(v1, v2 string) int { func compare(v1, v2 string) int {
v1 = replacer.Replace(v1) v1, v2 = replacer.Replace(v1), replacer.Replace(v2)
v2 = replacer.Replace(v2) fields1, fields2 := strings.Split(v1, "."), strings.Split(v2, ".")
fields1 := strings.Split(v1, ".")
fields2 := strings.Split(v2, ".") ver1, ver2 := strsToInts(fields1), strsToInts(fields2)
ver1 := strsToInts(fields1) ver1len, ver2len := len(ver1), len(ver2)
ver2 := strsToInts(fields2) shorter := mathx.MinInt(ver1len, ver2len)
shorter := mathx.MinInt(len(ver1), len(ver2))
for i := 0; i < shorter; i++ { for i := 0; i < shorter; i++ {
if ver1[i] == ver2[i] { if ver1[i] == ver2[i] {
@@ -53,9 +52,9 @@ func compare(v1, v2 string) int {
} }
} }
if len(ver1) < len(ver2) { if ver1len < ver2len {
return -1 return -1
} else if len(ver1) == len(ver2) { } else if ver1len == ver2len {
return 0 return 0
} else { } else {
return 1 return 1