10.11

assets/bby.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDOjCCAiICCQCB7JjvHmBpDjANBgkqhkiG9w0BAQsFADBfMQswCQYDVQQGEwJB
+VTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0
+cyBQdHkgTHRkMRgwFgYDVQQDDA9iYnkuYmFuZ2h1by5uZXQwHhcNMjEwODI4MDY1
+NDA1WhcNMjIwODI4MDY1NDA1WjBfMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29t
+ZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMRgwFgYD
+VQQDDA9iYnkuYmFuZ2h1by5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCxiGDOhJ5ordJ4DPpOJqMnwvrGGcEHnLKIbGvCmSmxw1E+ERGvKG/pWvUN
+phoQoaIDxoyYn9QbIHku2ojJxqQEYPRo8EDe/6cGZg2j9JuRu6In4pVzqzIZIVt1
+1M3uBLG/t/V0/2X3uHLYWFlkEYynhhAKXLnfhUv/IJfMtAvGMvRGdC6VXKEeieP5
+skZqME9YkIx3a5QJAjbehcTrkmjVum9kkKt+qAMBrPbbss0OmY99uI0903L8te0y
+qUf4iUfpZFs4S7dEs3vyT5QOp/j0VbobHVwEwbr6cpk+8XfkgFeblLN6foadz2kU
+98zgTyjn+ARWFBadvuuAxzPTjH+XAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAKpZ
+0L4ZdsszZLEOIvMi/gcxlwkckRoe5FB+mgmnDzpbeMpoySnZd4FeOYbnYRsk/8Nf
+WAvKYrLlfhtqvJWezNSojGVLOSs12Go6Ee3jVmplOjB+J93HLr6yjZtMtvOwTAdi
+EsPmmkgigz2KCmBEOxj9Xd2+d119z3JNVeE9tdZDdhkgBCDC5Xna1p5bE0pz1kst
+SQuk7P5S6NwTfsoBJFnYRNIcckwr1vguPnL7qDPo2DBGEdowBdgYGiFs6WK3ZRJk
+VH+bVFxOpk9Xk1wkfu1Zd+unDckezpshtjYHHKcr2Y+Tpevjf0u7Ei0YkbJ6cn3Q
+BjR423Zm3LxfsQO39nQ=
+-----END CERTIFICATE-----

ios/Runner/AppDelegate.swift

@@ -10,21 +10,5 @@ import Flutter
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
-  func connectionShouldUseCredentialStorage(_ connection: NSURLConnection) -> Bool {
-          return true
-      }
 
-      func connection(_ connection: NSURLConnection, willSendRequestFor challenge: URLAuthenticationChallenge) {
-          if let previous = challenge.previousFailureCount as? ssize_t {
-              print(String(format: "didReceiveAuthenticationChallenge %@ %zd", challenge.protectionSpace.authenticationMethod, previous))
-          }
-          if challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust {
-              challenge.sender?.use(URLCredential(for: challenge.protectionSpace.serverTrust), for: challenge)
-              challenge.sender?.continueWithoutCredential(for: challenge)
-          }
-      }
-
-      func connection(_ connection: NSURLConnection, canAuthenticateAgainstProtectionSpace protectionSpace: URLProtectionSpace) -> Bool {
-          return protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust
-      }
 }

lib/beans/pay_by_we_chat_bean_entity.dart

@@ -1,4 +1,5 @@
 import 'package:bbyyy/generated/json/base/json_convert_content.dart';
+import 'package:bbyyy/generated/json/base/json_field.dart';
 
 class PayByWeChatBeanEntity with JsonConvert<PayByWeChatBeanEntity> {
 	PayByWeChatBeanData data;
@@ -6,11 +7,20 @@ class PayByWeChatBeanEntity with JsonConvert<PayByWeChatBeanEntity> {
 }
 
 class PayByWeChatBeanData with JsonConvert<PayByWeChatBeanData> {
-	String partnerid;
-	String prepayid;
-	String noncestr;
-	String timestamp;
+	@JSONField(name: "return_code")
+	String returnCode;
+	@JSONField(name: "return_msg")
+	String returnMsg;
+	@JSONField(name: "nonce_str")
+	String nonceStr;
+	@JSONField(name: "result_code")
+	String resultCode;
+	@JSONField(name: "mch_id")
+	String mchId;
+	@JSONField(name: "prepay_id")
+	String prepayId;
 	String sign;
-	String package;
+	@JSONField(name: "trade_type")
+	String tradeType;
 	String appid;
 }

lib/generated/json/pay_by_we_chat_bean_entity_helper.dart

@@ -18,23 +18,29 @@ Map<String, dynamic> payByWeChatBeanEntityToJson(PayByWeChatBeanEntity entity) {
 }
 
 payByWeChatBeanDataFromJson(PayByWeChatBeanData data, Map<String, dynamic> json) {
-	if (json['partnerid'] != null) {
-		data.partnerid = json['partnerid'].toString();
+	if (json['return_code'] != null) {
+		data.returnCode = json['return_code'].toString();
 	}
-	if (json['prepayid'] != null) {
-		data.prepayid = json['prepayid'].toString();
+	if (json['return_msg'] != null) {
+		data.returnMsg = json['return_msg'].toString();
 	}
-	if (json['noncestr'] != null) {
-		data.noncestr = json['noncestr'].toString();
+	if (json['nonce_str'] != null) {
+		data.nonceStr = json['nonce_str'].toString();
 	}
-	if (json['timestamp'] != null) {
-		data.timestamp = json['timestamp'].toString();
+	if (json['result_code'] != null) {
+		data.resultCode = json['result_code'].toString();
+	}
+	if (json['mch_id'] != null) {
+		data.mchId = json['mch_id'].toString();
+	}
+	if (json['prepay_id'] != null) {
+		data.prepayId = json['prepay_id'].toString();
 	}
 	if (json['sign'] != null) {
 		data.sign = json['sign'].toString();
 	}
-	if (json['package'] != null) {
-		data.package = json['package'].toString();
+	if (json['trade_type'] != null) {
+		data.tradeType = json['trade_type'].toString();
 	}
 	if (json['appid'] != null) {
 		data.appid = json['appid'].toString();
@@ -44,12 +50,14 @@ payByWeChatBeanDataFromJson(PayByWeChatBeanData data, Map<String, dynamic> json)
 
 Map<String, dynamic> payByWeChatBeanDataToJson(PayByWeChatBeanData entity) {
 	final Map<String, dynamic> data = new Map<String, dynamic>();
-	data['partnerid'] = entity.partnerid;
-	data['prepayid'] = entity.prepayid;
-	data['noncestr'] = entity.noncestr;
-	data['timestamp'] = entity.timestamp;
+	data['return_code'] = entity.returnCode;
+	data['return_msg'] = entity.returnMsg;
+	data['nonce_str'] = entity.nonceStr;
+	data['result_code'] = entity.resultCode;
+	data['mch_id'] = entity.mchId;
+	data['prepay_id'] = entity.prepayId;
 	data['sign'] = entity.sign;
-	data['package'] = entity.package;
+	data['trade_type'] = entity.tradeType;
 	data['appid'] = entity.appid;
 	return data;
 }

lib/https/MyDio.dart

@@ -54,11 +54,8 @@ class MyDio {
       };
     }
     dio = Dio(options);
-    (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
-      client.badCertificateCallback=(X509Certificate cert, String host, int port){
-          return true;
-      };
-    };
+    print('fmamisfmaifmasi1');
+
   }
 
   cancelRequest(){
@@ -66,6 +63,20 @@ class MyDio {
   }
 
   post(String url, data, SCallBack sCallBack, FCallBack fCallBack) async {
+    // (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
+    //   client.badCertificateCallback=(X509Certificate cert, String host, int port){
+    //     print('fmamisfmaifmasi');
+    //     return true;
+    //   };
+    // };
+    // (dio.httpClientAdapter as DefaultHttpClientAdapter).onHttpClientCreate  = (client) {
+    //   print('fmamisfmaifmasi');
+    //   SecurityContext sc = SecurityContext();
+    //   // file is the path of certificate
+    //   sc.setTrustedCertificates('assets/bby.crt');
+    //   HttpClient httpClient = HttpClient(context: sc);
+    //   return httpClient;
+    // };
     logger.info(MyCookie().getServer() + url);
     try {
       logger.info(json.encode(data));

lib/main.dart

@@ -131,7 +131,7 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
     // TODO: implement createElement
     WidgetsBinding.instance.addObserver(this);
     // MyCookie().initP();
-
+    MyDio().initDio();
     _initFluwx();
     EventBus().on('hasNewOrder', (arg) {
       newOrder = arg;

lib/my_tools/my_cookie.dart

@@ -22,8 +22,8 @@ class MyCookie {
   //工厂构造函数
   factory MyCookie() => _singleton;
 
- // String server = '172.16.104.19';
-   String server = 'bby.banghuo.net';
+ String server = '172.16.104.34';
+   // String server = 'bby.banghuo.net';
 //  String server = '39.108.225.84';
   SharedPreferences prefs;
   PackageInfo packageInfo;
@@ -40,7 +40,7 @@ class MyCookie {
   }
 
   getServer() {
-    return 'https://$server:4001';
+    return 'http://$server:4001';
   }
 
   initP() async {

lib/paegs/gang_page/gang_in_page/gang_in_page.dart

@@ -301,8 +301,7 @@ class _GangInPageState extends State<GangInPage> {
                           ],
                         ),
                       ),
-                    if (MyCookie().getUID() == widget.data.ownerUid &&
-                        !widget.data.privateShop)
+                    if (MyCookie().getUID() == widget.data.ownerUid )
                       PopupMenuItem<String>(
                         value: '收款二维码',
                         child: Row(

lib/paegs/pay_page/order_information_page.dart

@@ -684,7 +684,7 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
                     }
                   }),
                 ),
-              if (weChat)
+              if (true)
                 CupertinoActionSheetAction(
                   child: Row(
                     children: [
@@ -702,13 +702,13 @@ class _OrderInformationPageState extends State<OrderInformationPage> {
                     mainAxisAlignment: MainAxisAlignment.center,
                   ),
                   onPressed: (() {
-                    if (weChat) {
+                    // if (weChat) {
                       payWay = 2;
                       setState(() {});
                       Navigator.pop(context, 'Edit');
-                    } else {
-                      showToast('微信支付暂不可用');
-                    }
+                    // } else {
+                    //   showToast('微信支付暂不可用');
+                    // }
                   }),
                 ),
               CupertinoActionSheetAction(

lib/paegs/pay_page/pay_page.dart

@@ -547,11 +547,11 @@ class _PayPageState extends State<PayPage> with WidgetsBindingObserver {
         });
         payWithWeChat(
           appId: entity.data.appid,
-          partnerId: entity.data.partnerid,
-          prepayId: entity.data.prepayid,
-          packageValue: entity.data.package,
-          nonceStr:entity.data.noncestr,
-          timeStamp: int.parse(entity.data.timestamp),
+          partnerId: entity.data.mchId,
+          prepayId: entity.data.prepayId,
+          packageValue: 'Sign=WXPay',
+          nonceStr:entity.data.nonceStr,
+          timeStamp: DateTime.now().millisecondsSinceEpoch,
           sign: entity.data.sign,
         );
       }