Skip to content

Commit 7c1d11e

Browse files
bigrocsbigrocs
committed
demo
1 parent d26a3a1 commit 7c1d11e

File tree

7 files changed

+23
-26
lines changed

7 files changed

+23
-26
lines changed

‎resources/mixes/vue-omnipay/dist/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html><html><head><meta charset=utf-8><title>vue-omnipay</title><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><script>window.config = {
22
apiUrl: 'http://corecmf.dev/api/omnipay/main',
3-
csrfToken: '',
3+
csrfToken: 'o36NWdCrHmgaNquxyII3g5YKRBrEjyDSpemADlMv',
44
data:{"wechat":{"appOrder":{"appid":"wxd18b8356c98591dc","partnerid":"10035597","prepayid":"wx20171003110733c20650cf6f0915936445","package":"Sign=WXPay","noncestr":"52e7873269ac678ea9f8c56ded7d493d","timestamp":1507000139,"sign":"A09455F6674D6022BBCA7EA74BA0B39E"},"jsOrder":{"appId":"wxd18b8356c98591dc","package":"prepay_id=wx20171003110733c20650cf6f0915936445","nonceStr":"461df0e5157622b2f3ea96d643701139","timeStamp":"1507000139","signType":"MD5","paySign":"7A37FEEB4DC1CF593878CD120E2EF4CC"},"webOrder":"weixin:\/\/wxpay\/bizpayurl?pr=woVPPxd"},"order":{"order_id":"20171003030858637674","uid":0,"name":"\u6d4b\u8bd5\u8ba2\u5355[\u9a71\u52a8:wechat]","fee":16.8,"gateway":"wechat","updated_at":"2017-10-03 03:08:58","created_at":"2017-10-03 03:08:59","id":73}},
5-
}</script><link href=/vendor/omnipay/css/app.min.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/vendor/omnipay/js/manifest.min.js></script><script type=text/javascript src=/vendor/omnipay/js/vendor.min.js></script><script type=text/javascript src=/vendor/omnipay/js/app.min.js></script></body></html>
5+
}</script><script src=//localhost:6001/socket.io/socket.io.js></script><link href=/vendor/omnipay/css/app.min.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/vendor/omnipay/js/manifest.min.js></script><script type=text/javascript src=/vendor/omnipay/js/vendor.min.js></script><script type=text/javascript src=/vendor/omnipay/js/app.min.js></script></body></html>

‎resources/mixes/vue-omnipay/dist/vendor/omnipay/js/app.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/mixes/vue-omnipay/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<script>
1010
window.config = {
1111
apiUrl: 'http://corecmf.dev/api/omnipay/main',
12-
csrfToken: '',
1312
data:{"wechat":{"appOrder":{"appid":"wxd18b8356c98591dc","partnerid":"10035597","prepayid":"wx20171003110733c20650cf6f0915936445","package":"Sign=WXPay","noncestr":"52e7873269ac678ea9f8c56ded7d493d","timestamp":1507000139,"sign":"A09455F6674D6022BBCA7EA74BA0B39E"},"jsOrder":{"appId":"wxd18b8356c98591dc","package":"prepay_id=wx20171003110733c20650cf6f0915936445","nonceStr":"461df0e5157622b2f3ea96d643701139","timeStamp":"1507000139","signType":"MD5","paySign":"7A37FEEB4DC1CF593878CD120E2EF4CC"},"webOrder":"weixin:\/\/wxpay\/bizpayurl?pr=woVPPxd"},"order":{"order_id":"20171003030858637674","uid":0,"name":"\u6d4b\u8bd5\u8ba2\u5355[\u9a71\u52a8:wechat]","fee":16.8,"gateway":"wechat","updated_at":"2017-10-03 03:08:58","created_at":"2017-10-03 03:08:59","id":73}},
1413
}
1514
</script>
15+
<script src="//localhost:6001/socket.io/socket.io.js"></script>
1616
</head>
1717

1818
<body>

‎resources/mixes/vue-omnipay/src/main.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,23 @@ import Echo from 'laravel-echo'
55
import Pusher from 'pusher-js'
66
import BuilderVueElement from 'builder-vue-element'
77
Vue.use(BuilderVueElement)
8+
window.Laravel = {
9+
csrfToken: window.config.csrfToken
10+
}
811
window.Pusher = Pusher
9-
window.Echo = new Echo({
10-
host: 'corecmf.dev',
11-
broadcaster: 'pusher',
12-
key: '22317447f90c25aef80ce73cca5648fe'
13-
encrypted: true
12+
window.echo = new Echo({
13+
broadcaster: 'socket.io',
14+
host: 'http://corecmf.dev:6001'
15+
// broadcaster: 'pusher',
16+
// key: '059ed477866087f99056b595fbd80c80',
1417
})
15-
window.Echo.private('App.User.1').listen('order.status.updated', (e) => {
16-
console.log('dazles01')
17-
console.log(e)
18-
}).listen('OrderStatusUpdated', (e) => {
18+
console.log(window.echo.private('App.User.1'))
19+
window.echo.private('App.User.1')
20+
.listen('.CoreCMF\\Omnipay\\App\\Events\\OrderStatusUpdated', (e) => {
1921
console.log('dazles02')
2022
console.log(e)
2123
})
24+
2225
/* eslint-disable no-new */
2326
new Vue({
2427
el: '#app',

‎src/App/Events/OrderStatusUpdated.php‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,30 @@
33

44
use Auth;
55
use Illuminate\Queue\SerializesModels;
6-
use Illuminate\Broadcasting\Channel;
76
use Illuminate\Broadcasting\PrivateChannel;
8-
use Illuminate\Broadcasting\PresenceChannel;
9-
use Illuminate\Broadcasting\InteractsWithSockets;
107
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
118

129
class OrderStatusUpdated implements ShouldBroadcast
1310
{
1411
use SerializesModels;
1512

1613
// protected $orderModel;
17-
public $data;
14+
public $order;
15+
public $user;
1816

1917
/**
2018
* 创建一个新的事件实例.
2119
*
2220
* @param Order $order
2321
* @return void
2422
*/
25-
public function __construct($order)
23+
public function __construct($user,$order)
2624
{
27-
// $this->orderModel = $order;
28-
$data = ['as'];
25+
$this->user = $user;
26+
$this->order = $order;
2927
}
3028
public function broadcastOn()
3129
{
32-
return new PrivateChannel('App.User.'.Auth::id());
33-
}
34-
public function broadcastWith()
35-
{
36-
return ['id' => 1];
30+
return new PrivateChannel('App.User.'.$this->user->id);
3731
}
3832
}

‎src/App/Models/Order.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class Order extends Model
2121
*/
2222
public function getOrder($orderId)
2323
{
24-
event(new OrderStatusUpdated($this)); //支付完成事件
2524
return $this->where('order_id', $orderId)->first();
2625
}
2726
/**

‎src/OmnipayServiceProvider.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace CoreCMF\Omnipay;
44

5+
use Redis;
56
use Route;
67
use Illuminate\Support\ServiceProvider;
78
use CoreCMF\Omnipay\App\Models\Config;

0 commit comments

Comments
 (0)