From 11f1785631a9dacb9e71a8cadf061f8554a11a5c Mon Sep 17 00:00:00 2001 From: wanghualei Date: Sun, 2 May 2021 09:39:01 +0800 Subject: [PATCH 01/16] update to 2.25.1 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 9e12e63..c0955af 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.25.0-alpha20210429v03' - s.dependency 'FinAppletExt' , '2.25.0-alpha20210429v03' + s.dependency 'FinApplet' , '2.25.1' + s.dependency 'FinAppletExt' , '2.25.1' end From fbccd64c0cc3b4cefa40f11b79dfafbdae95134a Mon Sep 17 00:00:00 2001 From: developer Date: Tue, 1 Jun 2021 17:39:28 +0800 Subject: [PATCH 02/16] release: version:2.27.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 5609837..7862a78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.26.1' +version: '2.27.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 4717c87291db58cb8b6c0ce98790c5b22b960ab5 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Fri, 28 May 2021 16:06:54 +0800 Subject: [PATCH 03/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 41a0aad..fafdb67 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.26.1' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210528v03' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From 14ee9543396018e0b4d562e9608272951063c41a Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 31 May 2021 15:02:17 +0800 Subject: [PATCH 04/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index fafdb67..619f28d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210528v03' + implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v02' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From bfde36837ae001f5fbf1940e824575594b64f401 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 31 May 2021 18:37:28 +0800 Subject: [PATCH 05/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 619f28d..f15c4b6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v02' + implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v03' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From 66641d81907e455f75b24e796472afb23c9906f2 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 31 May 2021 19:40:09 +0800 Subject: [PATCH 06/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index f15c4b6..2b9261f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v03' + implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v04' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From 21e21b5068e93c0bdec620a8622961d39864fe89 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 1 Jun 2021 11:41:50 +0800 Subject: [PATCH 07/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 2b9261f..a33f5ea 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.28.0-alpha20210531v04' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v03' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From de2875b7cda7c61c2a9084d2d3f4d43ba46378d9 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 1 Jun 2021 17:16:25 +0800 Subject: [PATCH 08/16] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index a33f5ea..db26649 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v03' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v04' implementation 'com.finogeeks.mop:plugins:2.26.1' } \ No newline at end of file From fd900dca776c1ec2912aa01a73efd01f8befec42 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 1 Jun 2021 17:52:22 +0800 Subject: [PATCH 09/16] version++ --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index db26649..d0ae117 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v04' - implementation 'com.finogeeks.mop:plugins:2.26.1' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v05' + implementation 'com.finogeeks.mop:plugins:2.27.0-alpha20210601v05' } \ No newline at end of file From b81111727b80c4c89ece38cfe81ef72c1fde3686 Mon Sep 17 00:00:00 2001 From: developer Date: Tue, 1 Jun 2021 19:30:03 +0800 Subject: [PATCH 10/16] release: version:2.27.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 5609837..7862a78 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.26.1' +version: '2.27.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From a7430c2a17d615f915c6ebacc2271ddb0f5d6c90 Mon Sep 17 00:00:00 2001 From: developer Date: Tue, 1 Jun 2021 22:16:16 +0800 Subject: [PATCH 11/16] release: version:2.28.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7862a78..b4c0d8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.27.1' +version: '2.28.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 6060678048deb4aabefda2917267a2e945d6851d Mon Sep 17 00:00:00 2001 From: developer Date: Wed, 2 Jun 2021 10:37:19 +0800 Subject: [PATCH 12/16] release: version:2.28.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7862a78..b4c0d8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.27.1' +version: '2.28.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From b07d449771a78ceac10cbb18b423c9b6f168f378 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Wed, 2 Jun 2021 11:33:07 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userId=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../java/com/finogeeks/mop/api/mop/BaseModule.java | 5 +++++ example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 10 +++++----- lib/mop.dart | 6 ++++-- pubspec.lock | 8 ++++---- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d0ae117..cfbfa27 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v05' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210602v03' implementation 'com.finogeeks.mop:plugins:2.27.0-alpha20210601v05' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index a6ad10b..6c95d06 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java @@ -59,12 +59,17 @@ public class BaseModule extends BaseApi { if (disablePermission == null) { disablePermission = false; } + String userId = null; + if (param.get("userId") != null) { + userId = (String) param.get("userId"); + } FinAppConfig config = new FinAppConfig.Builder() .setSdkKey(appkey) .setSdkSecret(secret) .setApiUrl(apiServer) .setApiPrefix(apiPrefix) .setEncryptionType(cryptType) + .setUserId(userId) .setDebugMode(BuildConfig.DEBUG) .setDisableRequestPermissions(disablePermission) .build(); diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 45782d2..ba384a1 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-04-30 09:33:21.567900","version":"2.0.3"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-06-02 11:08:31.029967","version":"2.3.0-2.0.pre.105"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 75553ba..a7d9bac 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.6.0" boolean_selector: dependency: transitive description: @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.24.7" + version: "2.27.1" path: dependency: transitive description: @@ -106,7 +106,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -157,5 +157,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0" diff --git a/lib/mop.dart b/lib/mop.dart index d8f6d69..643a7f6 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -73,14 +73,16 @@ class Mop { {String apiServer, String apiPrefix, String cryptType, - bool disablePermission}) async { + bool disablePermission, + String userId}) async { final Map ret = await _channel.invokeMethod('initialize', { 'appkey': appkey, 'secret': secret, 'apiServer': apiServer, 'apiPrefix': apiPrefix, 'cryptType': cryptType, - 'disablePermission': disablePermission + 'disablePermission': disablePermission, + 'userId': userId }); return ret; } diff --git a/pubspec.lock b/pubspec.lock index c2442ac..f6eefd7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.6.0" boolean_selector: dependency: transitive description: @@ -92,7 +92,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -127,7 +127,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -143,5 +143,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0" From 79208c63fd2065516bb270a79e778932b4ffeea9 Mon Sep 17 00:00:00 2001 From: developer Date: Wed, 2 Jun 2021 14:21:44 +0800 Subject: [PATCH 14/16] release: version:2.28.1 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 7862a78..b4c0d8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.27.1' +version: '2.28.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From c4bfec4d26409b8dff4086464ea52629e6b665f9 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 2 Jun 2021 15:19:45 +0800 Subject: [PATCH 15/16] =?UTF-8?q?init=20=E6=96=B9=E5=BC=8F=E6=96=B0?= =?UTF-8?q?=E5=A2=9EuserId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.h | 12 +++++++----- ios/Classes/Api/MOP_initialize.m | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.h b/ios/Classes/Api/MOP_initialize.h index 5aff9f6..b10862f 100644 --- a/ios/Classes/Api/MOP_initialize.h +++ b/ios/Classes/Api/MOP_initialize.h @@ -11,12 +11,14 @@ NS_ASSUME_NONNULL_BEGIN @interface MOP_initialize : MOPBaseApi -@property(nonatomic,copy)NSString* appkey; -@property(nonatomic,copy)NSString* secret; -@property(nonatomic,copy)NSString* apiServer; -@property(nonatomic,copy)NSString* apiPrefix; -@property(nonatomic,copy)NSString* cryptType; +@property (nonatomic, copy) NSString *appkey; +@property (nonatomic, copy) NSString *secret; +@property (nonatomic, copy) NSString *apiServer; +@property (nonatomic, copy) NSString *apiPrefix; +@property (nonatomic, copy) NSString *cryptType; +@property (nonatomic, copy) NSString *userId; @property (nonatomic, assign) BOOL disablePermission; + @end NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 14f73ed..9d28e6a 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -34,6 +34,7 @@ { config.cryptType = FATApiCryptTypeMD5; } + config.userId = [self.userId copy]; NSLog(@"disablePermission:%d",self.disablePermission); config.disableAuthorize = self.disablePermission; From 4499ae2f6c1abace9ed8a815b4cf1a101e2a6dff Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 2 Jun 2021 15:19:57 +0800 Subject: [PATCH 16/16] udpate userId --- ios/Classes/Api/MOP_initialize.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 9d28e6a..3db6c33 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -34,7 +34,7 @@ { config.cryptType = FATApiCryptTypeMD5; } - config.userId = [self.userId copy]; + config.currentUserId = [self.userId copy]; NSLog(@"disablePermission:%d",self.disablePermission); config.disableAuthorize = self.disablePermission;