Merge remote-tracking branch 'origin/yijia' into yijia

addons/epay/config.php

@@ -38,11 +38,11 @@ return array (
     ),
     'value' => 
     array (
-      'app_id' => '2016102100728544',
-      'notify_url' => '',
-      'return_url' => '',
-      'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApIVSOQhGhke6xjf0yvd8dBTH34lrzdLnybz0mysN54Zq5r854hBFf2BNyoRG5HL+gUWT+nbB7cfzhsf/Co3cfAb6WLfYc4dKDqJQYNK/AZhxJD/yTXp41jTTRPqqYT9vkIh4Y0H2uOEeBehWql+wx+KOkhhgLFFsanyU0++pR8ZqzzhQI0T1SqNSmK9Y8FjW0+JjCIoYI8E5Kg2ngszBR/Y7bBfMwF8Vw62cisGS9LoHNqz2Q6904MjzZzWi9pxAukD8D8TyAUIh63Ya4UtUgALFcW8fc/zJwSA0asDtgzHwEvEOFcDZKmVVCkEAsS3k45nJXIvZ0Pzrzn/2+ipu5QIDAQAB',
-      'private_key' => 'MIIEpQIBAAKCAQEAuWLcTZsd8mWDJ12rPJrog3/0o0toQqOxf8boG9WeVQ+aUyA7AD6j46xFJgdDlTVqMoOn2ywsaa6rnPtQ06rhSmTgGsLKCNHGfkP4FkAQNa/2LGHYhe4dQ/aek75KjzR4Gabnv0QtgMabIMUcM1c4bbQBo2dSHVL8FExFBLK1jiXIRhyFMA+llD2Ir341Q3Mls5DWuXoTmx+NXlcjwOuN2/u7zsSvCdxGWX8wkkY2is+IKMZ5ODUg72toSCMCr76exkWFlzp4b9WsXPtMei3XZpX4jQk6gy0gu8cAo3R7DpYMxIjNaP4YXOL6i/xTj9ps1S5JBnX5VskZSswXVQe55QIDAQABAoIBAGV3ZJjdU7C+OuCq9fQ/3Q9MU3uk5DXFHnuPRK8nZnesCI2C0Ig7wLv2KAq+YxEhoTRwtsjRDqXxQmCzdPPFTXXIbJh5ENdu6bNmRDz5Z2XbH2P/UeFMCJyQOQ8oUeq7jxiLL8CR8k3PZkyzVdIL5Qi2Q0dKX7lJGEuLyyLdJV3dA/e0eXTAX7XsihNeNh5maEkzmA/yS51MJM/nd9hl1TTAZpzJyuDwrM9jB88XWqM/URoedIIVZZI47KW1lGqYXwTYa8QV5ADAsXw/lXHjIMy9bvuoN9EqMSQ4NhfuOLvyueFG+Gt+Wwpaf0mmUL5htuGAXIK3AUoXl5K5uiJxIKkCgYEA9QLjpertX3IIyBbDa0p1z98zV/LvRwWh/K7f4EinyqQHRPBm7BIZtpgOztSdZYE6U6QG3cYzvbWEZ2Erq7ltpc1Yi9/Qjwp4zeUlxriuCp1Yb5/oQ9Xl75KJuPlFFFwkxGIjVwHVSPQYeJ5vqpSD9Ks9waDG5fFKW7wYioE4excCgYEAwbNh2624Dz+1SaAbbQ9wP5ursTGbbmTuz/092zNss9sXtfbmZHhiVGBV8DEygNQvW/1Sdyv+R0Q/TyHYBav8t55ON+AGaJ0KLexmeYqR1ksZ93RdN4bo/0zFel07qFdD+qKX+sKiazsh79liKg3yjuv7iKyVzAFqWHuNDDDk4GMCgYEAiTI2+3+TsDCQzkpA32FwmxgnDgaRCjoTPQVHg7Xrj0NOdsIPP/3avC5ljFfuUxqL6K4e0izcaEyueZ0l8SECTyevf5Oym4aHovO/tYlQm80D6m2mh+XMvdxWlmeu0PnP9M/nbh8uqY1V7qT5bpF/WpBRIo2/Ep+MvdWUAGrfj70CgYEAh9PGF0ml++tssIg5MyzURYZfyw1CNRNJ80ddjMxuuWA1LEBKJsHUEd7L5HZbN8OSwirNHQwYbtkIm/Dbjn6f5BJ6Puw1Ej6s2K8g3LGyulZHiyJqC3nrALtQ7xFZuB4ZaTOC5zB8vDzm+02wbFUDdf08kQaUtE15yTo6GgZfOIkCgYEAgv+VQZMX5cENxdUo2jw7FsNNo8jsK99iLkjri0R4wpP6x2OFZKBe0oqXN+bIGXRhAEU8F11uD1l+nnZhnRjB3P6vB16JNn691DjQf0R4SNECQcVU+BDb2DHG9PywwYcIM2x0idvd2QEYMLukJ0CPk5k5cIjzHE0mgblN2ktnhVg=',
+      'app_id' => '2021001199650201',
+      'notify_url' => 'http://internalsales.iicn.co/addons/unishop/pay/notify/type/alipay',
+      'return_url' => 'http://internalsales.iicn.co/h5/#/pages/order/order?state=0',
+      'ali_public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq8N4o64A4Wt434t3n2ohBgkulg3DDshTjeiAjSe40R4hyhYtatw6zvVbLHkFedlv9H2xcO/gp4+2AdNlP2w8hskc5IowEfnslLyZlL9TK/Ye6kG7MExbywdmC/E8FI0QIsuD4LECrzPFCDOwf+zoi/7b6B7NA6GkEP05N2N02e2PjucD4QyN1I797DEA+FocpKm2/10WnCSBDfaEA56k/yLCwNyV+DOwxX1DAhm10Kdzew/0souOcmo0nsztg+ZWqDk64/CHco/n/fqFENNdLfm550OU5MtjWf+wsytSxRhcQ1MprSlmRAbgoaQ4fP6RakKMYgFc/7lL3sT3m6nIBQIDAQAB',
+      'private_key' => 'MIIEowIBAAKCAQEA0ttBosJiuTgQkLBu03CgkJ0FHXiiN6iYnWof2U8Qzcg/oIJDdfeb7KnpjHRblqoD108GrsfU8pfHwuqt65OeH0e+gQPQj2GRaQ2XrWqp3kitbFRfWHAcAoE81kHkLjKtUKDgx1afOmiybRJMryNBy9uPn5bUZLSIlMDr/GD6Hq+Z6p0ZAswCBFpZs2GTlPaDXHM/oOPDZEzNkdI05CDTSDCyjg2jCfQHZb6ItM6Xc3fPjbMoSd4quw/z3uqbfnIx62Bc0j7DbLJeup/ItCjuHaZ5gd0ITQPPEQQSxrYCaRKctC88JyW/wmPT/onSuVX/WWUdPOMIS1sZdyecjKncPwIDAQABAoIBADdRwtSavx/s75umTk023UlTiMYEojqMBw41i4mNztDOWrMXue83OTdMFLP+yxCqJjvUxeIRF3NWEti2jU6i+fcm8XoTsCIN7QJsyIB83XguBSHIuQMQ1qhpk7Z6rwzXytS+gHqL5VaDpVwsUuYYD+kV/4ZVIgARxUuRmdgq8TQfUA6X8kjrHMxBUA+LWQjOPWyNxH01AJ3zqGvsy+xhl3kVhZYcJ162jXRiwXj4+kpULZUj4AnpiGV4z71ucG9pneM67TErP1p9hQQoB+BdWGk4s3oWKSAeWDbS/4yySLq5rMHxy1RQ5aRNaxtdD+VAUaQKHPKR947lqPosRP+0t3ECgYEA6efg8JpZ82/IjJVC3HrgUeDE5V76hCojNc9zCXDJHfR7Umd5qZFkXEcqRR52U+OelygifeLW3yYo0HWtgn5hz2GbKAtWsXpSLRBmcsd0fUsgCeP9WK6CnILUb2lswC7au5s4nYoo8XwR3D86ahXzkDcti2lss4bP7sXp53WnN70CgYEA5sYEmB8cmUt+O4Vl9whZk7z3Uo9uLYZjvkxI1q9xBYnUbIOT+3QBoC1Q6J68RNKpudnip/5dpXdJJh4EZxR2Bu3PzP/0TQ9G64NgynB7u2/qCE5A1UER2mzn/LPSsSKCVOEfKHQChhNLg8fiOXcpRvVBlw6HH7h3KG6FKB87tasCgYEAteL8Rdyg6e4Y00kWLwDWApV4RqyuvatOqf9hAwxTOBnu88tHDhbjJeao9gqUFPPBVOV+vMlyMSApSMDZZcoFIRBTaLY4edYWpLhGEicLbIrIpShGz3kUU8RgkSo3yNImgRBY3Bidcfr6oHwCXpAnUBO4NNqMDqZcdt4r3zLcDzkCgYAuheUPNdZyIQIFxdLUhl5opkPF5Rx1GQ6qon5cqWnDkBG+/peqraxWOkyBWN7jkQSebwp+i40denrIsGx6y2kv5GlsDn2Vu2q0t/ufVCXdl6Y6nmv7ke6jdikejLIA+9AChI/fe+O2W9Vxb65vn1I29+KNLWSYRHvhLsaxW/qRmQKBgHsLvFDC95PWDcWXxR10JjPb/QHhrZBEjXPYEsqPryrvFtuohG/D2vKPltKrEh5xGOW5Xx02vPkLL3mf+92DMKVZ6PXBQo/sX3IENT0kHL0XkqEuM6aEcitLi6fLRJyrVjqfdcyI+GY7Yy8AzJZkFJvV9H/cI0kotXxQNiA6lJnK',
       'log' => '1',
     ),
     'rule' => 'required',

addons/epay/library/Service.php

@@ -27,8 +27,8 @@ class Service
                 'orderid'   => $orderid,
                 'type'      => $type,
                 'title'     => $title,
-                'notifyurl' => $notifyurl,
-                'returnurl' => $returnurl,
+                'notify_url' => $notifyurl,
+                'return_url' => $returnurl,
                 'method'    => $method,
             ];
         } else {
@@ -43,8 +43,8 @@ class Service
         $openid = isset($params['openid']) ? $params['openid'] : '';
 
         $request = request();
-        $notifyurl = isset($params['notifyurl']) ? $params['notifyurl'] : $request->root(true) . '/addons/epay/index/' . $type . 'notify';
-        $returnurl = isset($params['returnurl']) ? $params['returnurl'] : $request->root(true) . '/addons/epay/index/' . $type . 'return/out_trade_no/' . $orderid;
+        $notifyurl = isset($params['notify_url']) ? $params['notify_url'] : $request->root(true) . '/addons/epay/index/' . $type . 'notify';
+        $returnurl = isset($params['return_url']) ? $params['return_url'] : $request->root(true) . '/addons/epay/index/' . $type . 'return/out_trade_no/' . $orderid;
         $html = '';
         $config = Service::getConfig($type);
         $config[$type]['notify_url'] = $notifyurl;

addons/epay/library/Yansongda/Pay/Gateways/Alipay/Alipay.php

@@ -15,7 +15,7 @@ abstract class Alipay implements GatewayInterface
     /**
      * @var string
      */
-    protected $gateway = 'https://openapi.alipaydev.com/gateway.do?charset=UTF-8';
+    protected $gateway = 'https://openapi.alipay.com/gateway.do?charset=UTF-8';
 
     /**
      * alipay global config params.
@@ -53,8 +53,8 @@ abstract class Alipay implements GatewayInterface
             'charset'     => 'UTF-8',
             'sign_type'   => 'RSA2',
             'version'     => '1.0',
-            'notifyurl' => \addons\unishop\model\Config::getByName('ali_notify_url')['value'],
-            'returnurl' => \addons\unishop\model\Config::getByName('ali_return_url')['value'],
+            'notify_url' => \addons\unishop\model\Config::getByName('ali_notify_url')['value'],
+            'return_url' => \addons\unishop\model\Config::getByName('ali_return_url')['value'],
             'timestamp'   => date('Y-m-d H:i:s'),
             'sign'        => '',
             'biz_content' => '',

addons/nzf/AliPay.php

@@ -21,7 +21,7 @@ use addons\unishop\model\Config;
 
 class AliPay
 {
-    private static $gatewayUrl = "https://openapi.alipaydev.com/gateway.do";
+    private static $gatewayUrl = "https://openapi.alipay.com/gateway.do";
     /**
      * Des:扫描支付
      * Name: unifiedOrderByOrderIdForSao

application/common/library/Auth.php

@@ -20,8 +20,8 @@ class Auth
     protected $_user = null;
     protected $_token = '';
     //Token默认有效时长
-//    protected $keeptime = 2592000;
-    protected $keeptime = 10;
+    protected $keeptime = 14400;
+    //protected $keeptime = 10;
     protected $requestUri = '';
     protected $rules = [];
     //默认配置