Skip to content

Commit 51be662

Browse files
chengpan168chengpan168
authored
Merge pull request #56 from cmushroom/dev
2.5.0
2 parents 3b94006 + 2080a02 commit 51be662

File tree

14 files changed

+178
-117
lines changed

14 files changed

+178
-117
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎.version

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"latestVersionNum": 18,
3-
"latestVersion": "2.4.0",
2+
"latestVersionNum": 19,
3+
"latestVersion": "2.5.0",
44
"updateType": "hint",
5-
"releaseNotes": "1. 切换db Bug 修复 #53。 \n2. 连接池关闭错误修复。 \n3. 最小化到dock后无法唤起问题修复 #38。"
5+
"releaseNotes": "1. 解决失焦后重新获取焦点tab切换问题,同时解决了最小化到dock唤起的问题 #55 #38。 \n2. 增加用户名登录。"
66
}

‎redis-pro.xcodeproj/project.pbxproj

+28-14
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,11 @@
133133
627E1BC8282FCEE300163D6B /* ScanStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 627E1BC7282FCEE300163D6B /* ScanStore.swift */; };
134134
6280596828B218D800126E81 /* RediStackClientString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6280596728B218D800126E81 /* RediStackClientString.swift */; };
135135
6280596A28B23DBB00126E81 /* RediStackClientStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6280596928B23DBB00126E81 /* RediStackClientStream.swift */; };
136-
628F9A9E28967C120003B6C0 /* RediStack in Frameworks */ = {isa = PBXBuildFile; productRef = 628F9A9D28967C120003B6C0 /* RediStack */; };
137136
628F9AA02896A3FB0003B6C0 /* RedisCommandExt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 628F9A9F2896A3FB0003B6C0 /* RedisCommandExt.swift */; };
138137
628F9AA2289EA7C50003B6C0 /* SSHTunnel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 628F9AA1289EA7C50003B6C0 /* SSHTunnel.swift */; };
139138
628F9AA4289EAEE90003B6C0 /* RedisClientSSH.swift in Sources */ = {isa = PBXBuildFile; fileRef = 628F9AA3289EAEE90003B6C0 /* RedisClientSSH.swift */; };
139+
62BA27AE29324F0F00ABBC0F /* RediStack in Frameworks */ = {isa = PBXBuildFile; productRef = 62BA27AD29324F0F00ABBC0F /* RediStack */; };
140+
62BA27B029324F0F00ABBC0F /* RedisTypes in Frameworks */ = {isa = PBXBuildFile; productRef = 62BA27AF29324F0F00ABBC0F /* RedisTypes */; };
140141
62C262E02839D4380036A282 /* ListValueStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C262DF2839D4380036A282 /* ListValueStore.swift */; };
141142
62C262E22839DD0B0036A282 /* RedisListItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C262E12839DD0B0036A282 /* RedisListItemModel.swift */; };
142143
62C262E4283A31E40036A282 /* ListEditorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 62C262E3283A31E40036A282 /* ListEditorView.swift */; };
@@ -393,7 +394,7 @@
393394
CEA1EF4D277C56DD00D300E9 /* NIO in Frameworks */,
394395
CEA1EF55277C56DD00D300E9 /* NIOFoundationCompat in Frameworks */,
395396
62D23AAF2818DCA000B2AA3F /* ComposableArchitecture in Frameworks */,
396-
628F9A9E28967C120003B6C0 /* RediStack in Frameworks */,
397+
62BA27AE29324F0F00ABBC0F /* RediStack in Frameworks */,
397398
CE0290CE2786B75A0058442B /* Puppy in Frameworks */,
398399
CEA1EF53277C56DD00D300E9 /* NIOEmbedded in Frameworks */,
399400
CEA1EF5E277C57BC00D300E9 /* SwiftyJSON in Frameworks */,
@@ -402,6 +403,7 @@
402403
CE83D51827563C28000DF09D /* AppCenterAnalytics in Frameworks */,
403404
CEA1EF57277C56DD00D300E9 /* NIOPosix in Frameworks */,
404405
CE83D51A27563C28000DF09D /* AppCenterCrashes in Frameworks */,
406+
62BA27B029324F0F00ABBC0F /* RedisTypes in Frameworks */,
405407
6237D032275C954A000ACD6A /* Logging in Frameworks */,
406408
CEA1EF51277C56DD00D300E9 /* NIOCore in Frameworks */,
407409
CEA1EF4F277C56DD00D300E9 /* NIOConcurrencyHelpers in Frameworks */,
@@ -837,7 +839,8 @@
837839
CEA1EF5D277C57BC00D300E9 /* SwiftyJSON */,
838840
CE0290CD2786B75A0058442B /* Puppy */,
839841
62D23AAE2818DCA000B2AA3F /* ComposableArchitecture */,
840-
628F9A9D28967C120003B6C0 /* RediStack */,
842+
62BA27AD29324F0F00ABBC0F /* RediStack */,
843+
62BA27AF29324F0F00ABBC0F /* RedisTypes */,
841844
);
842845
productName = "redis-pro";
843846
productReference = 4320AAF025B6740900A8E214 /* redis-pro.app */;
@@ -868,7 +871,7 @@
868871
isa = PBXProject;
869872
attributes = {
870873
LastSwiftUpdateCheck = 1320;
871-
LastUpgradeCheck = 1240;
874+
LastUpgradeCheck = 1410;
872875
TargetAttributes = {
873876
4320AAEF25B6740900A8E214 = {
874877
CreatedOnToolsVersion = 12.3;
@@ -897,7 +900,7 @@
897900
CEA1EF5C277C57BC00D300E9 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
898901
CE0290CC2786B75A0058442B /* XCRemoteSwiftPackageReference "Puppy" */,
899902
62D23AAD2818DCA000B2AA3F /* XCRemoteSwiftPackageReference "swift-composable-architecture" */,
900-
628F9A9C28967C120003B6C0 /* XCRemoteSwiftPackageReference "RediStack" */,
903+
62BA27AC29324F0F00ABBC0F /* XCRemoteSwiftPackageReference "RediStack" */,
901904
);
902905
productRefGroup = 4320AAF125B6740900A8E214 /* Products */;
903906
projectDirPath = "";
@@ -1165,6 +1168,7 @@
11651168
CLANG_WARN_UNREACHABLE_CODE = YES;
11661169
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
11671170
COPY_PHASE_STRIP = NO;
1171+
DEAD_CODE_STRIPPING = YES;
11681172
DEBUG_INFORMATION_FORMAT = dwarf;
11691173
ENABLE_STRICT_OBJC_MSGSEND = YES;
11701174
ENABLE_TESTABILITY = YES;
@@ -1227,6 +1231,7 @@
12271231
CLANG_WARN_UNREACHABLE_CODE = YES;
12281232
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
12291233
COPY_PHASE_STRIP = NO;
1234+
DEAD_CODE_STRIPPING = YES;
12301235
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
12311236
ENABLE_NS_ASSERTIONS = NO;
12321237
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1256,7 +1261,8 @@
12561261
CODE_SIGN_IDENTITY = "-";
12571262
CODE_SIGN_STYLE = Automatic;
12581263
COMBINE_HIDPI_IMAGES = YES;
1259-
CURRENT_PROJECT_VERSION = 18;
1264+
CURRENT_PROJECT_VERSION = 19;
1265+
DEAD_CODE_STRIPPING = YES;
12601266
DEVELOPMENT_ASSET_PATHS = "\"redis-pro/Preview Content\"";
12611267
ENABLE_PREVIEWS = YES;
12621268
INFOPLIST_FILE = "redis-pro/Info.plist";
@@ -1265,7 +1271,7 @@
12651271
"@executable_path/../Frameworks",
12661272
);
12671273
MACOSX_DEPLOYMENT_TARGET = 11.0;
1268-
MARKETING_VERSION = 2.4.0;
1274+
MARKETING_VERSION = 2.5.0;
12691275
PRODUCT_BUNDLE_IDENTIFIER = "com.cmushroom.redis-pro";
12701276
PRODUCT_NAME = "$(TARGET_NAME)";
12711277
SWIFT_VERSION = 5.0;
@@ -1281,7 +1287,8 @@
12811287
CODE_SIGN_IDENTITY = "-";
12821288
CODE_SIGN_STYLE = Automatic;
12831289
COMBINE_HIDPI_IMAGES = YES;
1284-
CURRENT_PROJECT_VERSION = 18;
1290+
CURRENT_PROJECT_VERSION = 19;
1291+
DEAD_CODE_STRIPPING = YES;
12851292
DEVELOPMENT_ASSET_PATHS = "\"redis-pro/Preview Content\"";
12861293
DEVELOPMENT_TEAM = "";
12871294
ENABLE_PREVIEWS = YES;
@@ -1291,7 +1298,7 @@
12911298
"@executable_path/../Frameworks",
12921299
);
12931300
MACOSX_DEPLOYMENT_TARGET = 11.0;
1294-
MARKETING_VERSION = 2.4.0;
1301+
MARKETING_VERSION = 2.5.0;
12951302
PRODUCT_BUNDLE_IDENTIFIER = "com.cmushroom.redis-pro";
12961303
PRODUCT_NAME = "$(TARGET_NAME)";
12971304
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1306,6 +1313,7 @@
13061313
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
13071314
CODE_SIGN_STYLE = Automatic;
13081315
CURRENT_PROJECT_VERSION = 1;
1316+
DEAD_CODE_STRIPPING = YES;
13091317
GENERATE_INFOPLIST_FILE = YES;
13101318
MACOSX_DEPLOYMENT_TARGET = 12.1;
13111319
MARKETING_VERSION = 1.0;
@@ -1324,6 +1332,7 @@
13241332
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
13251333
CODE_SIGN_STYLE = Automatic;
13261334
CURRENT_PROJECT_VERSION = 1;
1335+
DEAD_CODE_STRIPPING = YES;
13271336
GENERATE_INFOPLIST_FILE = YES;
13281337
MACOSX_DEPLOYMENT_TARGET = 12.1;
13291338
MARKETING_VERSION = 1.0;
@@ -1376,11 +1385,11 @@
13761385
minimumVersion = 1.4.2;
13771386
};
13781387
};
1379-
628F9A9C28967C120003B6C0 /* XCRemoteSwiftPackageReference "RediStack" */ = {
1388+
62BA27AC29324F0F00ABBC0F /* XCRemoteSwiftPackageReference "RediStack" */ = {
13801389
isa = XCRemoteSwiftPackageReference;
1381-
repositoryURL = "https://github.com/Mordil/RediStack";
1390+
repositoryURL = "https://github.com/chengpan168/RediStack";
13821391
requirement = {
1383-
branch = master;
1392+
branch = feat/username;
13841393
kind = branch;
13851394
};
13861395
};
@@ -1440,11 +1449,16 @@
14401449
package = 6237D030275C954A000ACD6A /* XCRemoteSwiftPackageReference "swift-log" */;
14411450
productName = Logging;
14421451
};
1443-
628F9A9D28967C120003B6C0 /* RediStack */ = {
1452+
62BA27AD29324F0F00ABBC0F /* RediStack */ = {
14441453
isa = XCSwiftPackageProductDependency;
1445-
package = 628F9A9C28967C120003B6C0 /* XCRemoteSwiftPackageReference "RediStack" */;
1454+
package = 62BA27AC29324F0F00ABBC0F /* XCRemoteSwiftPackageReference "RediStack" */;
14461455
productName = RediStack;
14471456
};
1457+
62BA27AF29324F0F00ABBC0F /* RedisTypes */ = {
1458+
isa = XCSwiftPackageProductDependency;
1459+
package = 62BA27AC29324F0F00ABBC0F /* XCRemoteSwiftPackageReference "RediStack" */;
1460+
productName = RedisTypes;
1461+
};
14481462
62D23AAE2818DCA000B2AA3F /* ComposableArchitecture */ = {
14491463
isa = XCSwiftPackageProductDependency;
14501464
package = 62D23AAD2818DCA000B2AA3F /* XCRemoteSwiftPackageReference "swift-composable-architecture" */;

‎redis-pro.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
{
4040
"identity" : "redistack",
4141
"kind" : "remoteSourceControl",
42-
"location" : "https://github.com/Mordil/RediStack",
42+
"location" : "https://github.com/chengpan168/RediStack",
4343
"state" : {
44-
"branch" : "master",
45-
"revision" : "555062c62e1568ed3125a51103ac42a9e4f7a626"
44+
"branch" : "feat/username",
45+
"revision" : "fd298674d753396482e029d0628a7c82316ea199"
4646
}
4747
},
4848
{
@@ -122,17 +122,17 @@
122122
"kind" : "remoteSourceControl",
123123
"location" : "https://github.com/apple/swift-metrics.git",
124124
"state" : {
125-
"revision" : "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
126-
"version" : "2.2.0"
125+
"revision" : "53be78637ecd165d1ddedc4e20de69b8f43ec3b7",
126+
"version" : "2.3.2"
127127
}
128128
},
129129
{
130130
"identity" : "swift-nio",
131131
"kind" : "remoteSourceControl",
132132
"location" : "https://github.com/apple/swift-nio.git",
133133
"state" : {
134-
"revision" : "b4e0a274f7f34210e97e2f2c50ab02a10b549250",
135-
"version" : "2.41.1"
134+
"revision" : "e855380cb5234e96b760d93e0bfdc403e381e928",
135+
"version" : "2.45.0"
136136
}
137137
},
138138
{

‎redis-pro.xcodeproj/project.xcworkspace/xcuserdata/chengpan.xcuserdatad/UserInterfaceState.xcuserstate

-66.3 KB
Binary file not shown.

‎redis-pro.xcodeproj/xcshareddata/xcschemes/redis-pro.xcscheme

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1410"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -47,7 +47,7 @@
4747
skipped = "NO">
4848
<BuildableReference
4949
BuildableIdentifier = "primary"
50-
BlueprintIdentifier = "4301C84926BBE86800C08E19"
50+
BlueprintIdentifier = "CE0290D2278707280058442B"
5151
BuildableName = "redis-proTests.xctest"
5252
BlueprintName = "redis-proTests"
5353
ReferencedContainer = "container:redis-pro.xcodeproj">

‎redis-pro.xcodeproj/xcuserdata/chengpan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

+37-21
Original file line numberDiff line numberDiff line change
@@ -7,80 +7,96 @@
77
<BreakpointProxy
88
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
99
<BreakpointContent
10-
uuid = "1F235176-678E-4370-AF05-A5C7A05EA8C5"
10+
uuid = "A32249BE-C08D-404F-8C04-721C3D133539"
11+
shouldBeEnabled = "No"
12+
ignoreCount = "0"
13+
continueAfterRunningActions = "No"
14+
filePath = "redis-pro/Model/RedisInsanceModel.swift"
15+
startingColumnNumber = "9223372036854775807"
16+
endingColumnNumber = "9223372036854775807"
17+
startingLineNumber = "66"
18+
endingLineNumber = "66"
19+
landmarkName = "connect(_:)"
20+
landmarkType = "7">
21+
</BreakpointContent>
22+
</BreakpointProxy>
23+
<BreakpointProxy
24+
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
25+
<BreakpointContent
26+
uuid = "6945253B-FF99-4C59-88D4-ADE8E67A2DEF"
1127
shouldBeEnabled = "No"
1228
ignoreCount = "0"
1329
continueAfterRunningActions = "No"
1430
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
1531
startingColumnNumber = "9223372036854775807"
1632
endingColumnNumber = "9223372036854775807"
17-
startingLineNumber = "241"
18-
endingLineNumber = "241"
19-
landmarkName = "connectionCreationFailed(_:retryDelay:logger:)"
33+
startingLineNumber = "204"
34+
endingLineNumber = "204"
35+
landmarkName = "_createConnection(retryDelay:startIn:logger:)"
2036
landmarkType = "7">
2137
</BreakpointContent>
2238
</BreakpointProxy>
2339
<BreakpointProxy
2440
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
2541
<BreakpointContent
26-
uuid = "EA7FEBA8-3D4F-4D85-B16B-E1AAEC4055BE"
42+
uuid = "FA0B1998-4489-4999-825D-6C10E55F25C1"
2743
shouldBeEnabled = "No"
2844
ignoreCount = "0"
2945
continueAfterRunningActions = "No"
3046
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/ConnectionPool/ConnectionPool.swift"
3147
startingColumnNumber = "9223372036854775807"
3248
endingColumnNumber = "9223372036854775807"
33-
startingLineNumber = "198"
34-
endingLineNumber = "198"
49+
startingLineNumber = "207"
50+
endingLineNumber = "207"
3551
landmarkName = "_createConnection(retryDelay:startIn:logger:)"
3652
landmarkType = "7">
3753
</BreakpointContent>
3854
</BreakpointProxy>
3955
<BreakpointProxy
4056
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
4157
<BreakpointContent
42-
uuid = "5BE6502F-970F-4408-94FF-3C0CD5C53636"
58+
uuid = "F575DF91-758C-43CB-83FE-2AF52258FB3A"
4359
shouldBeEnabled = "No"
4460
ignoreCount = "0"
4561
continueAfterRunningActions = "No"
4662
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
4763
startingColumnNumber = "9223372036854775807"
4864
endingColumnNumber = "9223372036854775807"
49-
startingLineNumber = "294"
50-
endingLineNumber = "294"
51-
landmarkName = "close()"
65+
startingLineNumber = "208"
66+
endingLineNumber = "208"
67+
landmarkName = "getConnPool()"
5268
landmarkType = "7">
5369
</BreakpointContent>
5470
</BreakpointProxy>
5571
<BreakpointProxy
5672
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
5773
<BreakpointContent
58-
uuid = "C83B50A6-5CE2-4A4F-BC9F-34837FA9E29A"
74+
uuid = "22260EB1-4165-4C46-9FCC-6CAABDD72ECC"
5975
shouldBeEnabled = "No"
6076
ignoreCount = "0"
6177
continueAfterRunningActions = "No"
62-
filePath = "redis-pro/Common/RedisClient/RedisClientSystem.swift"
78+
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
6379
startingColumnNumber = "9223372036854775807"
6480
endingColumnNumber = "9223372036854775807"
65-
startingLineNumber = "22"
66-
endingLineNumber = "22"
67-
landmarkName = "selectDB(_:)"
81+
startingLineNumber = "218"
82+
endingLineNumber = "218"
83+
landmarkName = "getConnPool()"
6884
landmarkType = "7">
6985
</BreakpointContent>
7086
</BreakpointProxy>
7187
<BreakpointProxy
7288
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
7389
<BreakpointContent
74-
uuid = "06DDB51C-119C-4DEF-80DB-9901923A6A49"
90+
uuid = "D30A974A-E026-4F0F-9798-3DCF3A9D1159"
7591
shouldBeEnabled = "No"
7692
ignoreCount = "0"
7793
continueAfterRunningActions = "No"
78-
filePath = "../../../Library/Developer/Xcode/DerivedData/redis-pro-dqdhwgmlxxtepdhgbmpmdcldlrxf/SourcePackages/checkouts/RediStack/Sources/RediStack/Commands/ConnectionCommands.swift"
94+
filePath = "redis-pro/Common/RedisClient/RediStackClient.swift"
7995
startingColumnNumber = "9223372036854775807"
8096
endingColumnNumber = "9223372036854775807"
81-
startingLineNumber = "58"
82-
endingLineNumber = "58"
83-
landmarkName = "select(database:)"
97+
startingLineNumber = "232"
98+
endingLineNumber = "232"
99+
landmarkName = "initConn(host:port:username:pass:database:)"
84100
landmarkType = "7">
85101
</BreakpointContent>
86102
</BreakpointProxy>

0 commit comments

Comments
 (0)