Skip to content
This repository has been archived by the owner on Jul 5, 2019. It is now read-only.

Add new protocol #65

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add new protocol #65

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a758ce
"auth_sha1_v4",
zhkufish Jan 9, 2018
4105849
change shadowsocks-libev submodule
zhkufish Jan 9, 2018
a3a23b2
Update submodule url.
zhkufish Jan 9, 2018
2779ff9
fix gitmodules url error
zhkufish Jan 10, 2018
cdb438b
fix some pod warning, add logglyLogger back
zhkufish Jan 10, 2018
2a2629f
Update AppInitializer.swift
zhkufish Jan 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ target "Potatso" do
pod 'CocoaLumberjack/Swift', '~> 3.0.0' #抓取crash日志上传
# pod 'Helpshift', '5.6.1' #国外的客服系统
pod 'PSOperations', '~> 3.0.0' #线程管理工具
# pod 'LogglyLogger-CocoaLumberjack', '~> 3.0'
pod 'LogglyLogger-CocoaLumberjack', '~> 3.0'
tunnel
library
fabric
Expand Down
15 changes: 14 additions & 1 deletion Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ PODS:
- CocoaAsyncSocket/RunLoop
- CocoaAsyncSocket/GCD (7.4.3)
- CocoaAsyncSocket/RunLoop (7.4.3)
- CocoaLumberjack (3.0.0):
- CocoaLumberjack/Default (= 3.0.0)
- CocoaLumberjack/Extensions (= 3.0.0)
- CocoaLumberjack/Core (3.0.0)
- CocoaLumberjack/Default (3.0.0):
- CocoaLumberjack/Core
Expand All @@ -37,6 +40,14 @@ PODS:
- KissXML/SwiftNSXML
- KissXML/SwiftNSXML (5.1.2):
- KissXML/Core
- LogglyLogger-CocoaLumberjack (3.0.0):
- CocoaLumberjack (~> 3.0)
- LogglyLogger-CocoaLumberjack/Formatter (= 3.0.0)
- LogglyLogger-CocoaLumberjack/Logger (= 3.0.0)
- LogglyLogger-CocoaLumberjack/Formatter (3.0.0):
- CocoaLumberjack (~> 3.0)
- LogglyLogger-CocoaLumberjack/Logger (3.0.0):
- CocoaLumberjack (~> 3.0)
- MBProgressHUD (1.1.0)
- MMWormhole (2.0.0):
- MMWormhole/Core (= 2.0.0)
Expand Down Expand Up @@ -78,6 +89,7 @@ DEPENDENCIES:
- KeychainAccess
- KissXML
- KissXML/libxml_module
- LogglyLogger-CocoaLumberjack (~> 3.0)
- MBProgressHUD
- MMWormhole (~> 2.0.0)
- ObjectMapper
Expand Down Expand Up @@ -121,6 +133,7 @@ SPEC CHECKSUMS:
ISO8601DateFormatter: 4551b6ce4f83185425f583b0b3feb3c7b59b942c
KeychainAccess: 94c5540b32eabf7bc32bfb976a268e8ea05fd6da
KissXML: 246c842586bb77110e04fb88e19376d96245c856
LogglyLogger-CocoaLumberjack: 16afad0a63fb70179fda1db85e03aeb3ded7fb02
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
MMWormhole: 0cd3fd35a9118b2e2d762b499f54eeaace0be791
ObjectMapper: 20505058f54e5c3ca69e1d6de9897d152a5369a6
Expand All @@ -130,6 +143,6 @@ SPEC CHECKSUMS:
Reveal-iOS-SDK: e2250b3c155bcfac53ae223ddc1f76d08f206c33
SwiftColor: ce45cc128e2a433a20e6f052c41f533590a567b4

PODFILE CHECKSUM: 8612f3909d46404c26d51ccc2e29f24429e3e330
PODFILE CHECKSUM: 132eb8d20813e2fa294d799548f9c74582f8ce7f

COCOAPODS: 1.3.1
10 changes: 6 additions & 4 deletions Potatso.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,7 @@
"${BUILT_PRODUCTS_DIR}/ISO8601DateFormatter/ISO8601DateFormatter.framework",
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
"${BUILT_PRODUCTS_DIR}/KissXML/KissXML.framework",
"${BUILT_PRODUCTS_DIR}/LogglyLogger-CocoaLumberjack/LogglyLogger_CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
"${BUILT_PRODUCTS_DIR}/MMWormhole/MMWormhole.framework",
"${BUILT_PRODUCTS_DIR}/ObjectMapper/ObjectMapper.framework",
Expand All @@ -2997,6 +2998,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ISO8601DateFormatter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KissXML.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LogglyLogger_CocoaLumberjack.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MMWormhole.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ObjectMapper.framework",
Expand Down Expand Up @@ -3345,7 +3347,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = C2456CC9E4E07FDB51C7E8E6 /* Pods-PotatsoLibraryTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
CLANG_ANALYZER_NONNULL = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -3365,7 +3367,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 16E45A00C4849FC6D582F28E /* Pods-PotatsoLibraryTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
CLANG_ANALYZER_NONNULL = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -3487,7 +3489,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 721750A5B5C0DCACE5C63317 /* Pods-Potatso.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Potatso/Potatso.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
Expand Down Expand Up @@ -3540,7 +3542,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 83DE540D7DA7E719057D8E51 /* Pods-Potatso.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = Potatso/Potatso.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
Expand Down
20 changes: 10 additions & 10 deletions Potatso/AppInitializer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation
import ICSMainFramework
import Appirater
import Fabric
//import LogglyLogger_CocoaLumberjack
import LogglyLogger_CocoaLumberjack

let appID = "1070901416"

Expand All @@ -36,15 +36,15 @@ class AppInitializer: NSObject, AppLifeCycleProtocol {
fileLogger?.logFileManager.maximumNumberOfLogFiles = 7
DDLog.add(fileLogger)

// let logglyLogger = LogglyLogger() // Loggy Logger
// logglyLogger.logglyKey = "107d98a8-c275-4369-a881-b36d3564c9ef"
// let fields = LogglyFields()
// fields.userid = User.currentUser.id
// fields.appversion = AppEnv.fullVersion
// let formatter = LogglyFormatter(logglyFieldsDelegate: fields)
// formatter?.alwaysIncludeRawMessage = false
// logglyLogger.logFormatter = formatter
// DDLog.add(logglyLogger)
let logglyLogger = LogglyLogger() // Loggy Logger
logglyLogger.logglyKey = "107d98a8-c275-4369-a881-b36d3564c9ef"
Copy link
Owner

@haxpor haxpor Jan 10, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you please change back to this logglyLogger.logglyKey = InfoInternal.shared.getLogglyAPIKey()?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert back to this logglyLogger.logglyKey = InfoInternal.shared.getLogglyAPIKey()?

let fields = LogglyFields()
fields.userid = User.currentUser.id
fields.appversion = AppEnv.fullVersion
let formatter = LogglyFormatter(logglyFieldsDelegate: fields)
formatter?.alwaysIncludeRawMessage = false
logglyLogger.logFormatter = formatter
DDLog.add(logglyLogger)

#if DEBUG
DDLog.add(DDTTYLogger.sharedInstance()) // TTY = Xcode console
Expand Down
4 changes: 2 additions & 2 deletions PotatsoModel/Proxy.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ open class Proxy: BaseModel {
"auth_sha1_v4",
"auth_aes128_md5",
"auth_aes128_sha1",
"auth_chain_a",
"auth_chain_b"
// "auth_chain_a",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this line and below it.

// "auth_chain_b"
]

open static let ssrSupportedObfs = [
Expand Down