Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
im-pool
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoyanbin
im-pool
Commits
76c32f9d
Commit
76c32f9d
authored
2 years ago
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redis
parent
84a8ba8f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
284 additions
and
54 deletions
+284
-54
rabbitmq.go
dao/mq/rabbitmq.go
+0
-0
simple.go
dao/mq/simple.go
+1
-1
redis.go
dao/redis/redis.go
+27
-0
go.mod
go.mod
+3
-0
go.sum
go.sum
+145
-0
client.go
pool/client.go
+2
-1
init.go
pool/init.go
+18
-11
private.go
pool/private.go
+3
-1
publicApi.go
pool/publicApi.go
+22
-9
ws_client.go
ws_client.go
+57
-30
ws_server.go
ws_server.go
+6
-1
No files found.
dao/rabbitmq.go
→
dao/
mq/
rabbitmq.go
View file @
76c32f9d
File moved
This diff is collapsed.
Click to expand it.
dao/simple.go
→
dao/
mq/
simple.go
View file @
76c32f9d
...
...
@@ -6,7 +6,7 @@ import (
)
func
(
r
*
RabbitMQ
)
PublishSimple
(
message
[]
byte
)
{
err
:=
r
.
channel
.
Publish
(
""
,
r
.
QueueName
,
...
...
This diff is collapsed.
Click to expand it.
dao/redis/redis.go
0 → 100644
View file @
76c32f9d
package
redis
import
(
"fmt"
"github.com/go-redis/redis"
)
const
(
host
=
"39.96.85.45"
port
=
6382
password
=
"saas123456"
db
=
6
)
// 初始化连接
func
Init
()
(
client
*
redis
.
Client
)
{
client
=
redis
.
NewClient
(
&
redis
.
Options
{
Addr
:
fmt
.
Sprintf
(
"%s:%d"
,
host
,
port
),
Password
:
password
,
DB
:
db
,
// use default DB
})
_
,
err
:=
client
.
Ping
()
.
Result
()
if
err
!=
nil
{
fmt
.
Println
(
err
)
}
return
}
This diff is collapsed.
Click to expand it.
go.mod
View file @
76c32f9d
...
...
@@ -3,6 +3,9 @@ module pool
go 1.16
require (
github.com/go-redis/redis v6.15.8+incompatible
github.com/gorilla/websocket v1.5.0
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.23.0 // indirect
github.com/streadway/amqp v1.0.0
)
This diff is collapsed.
Click to expand it.
go.sum
View file @
76c32f9d
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o=
github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
github.com/onsi/ginkgo/v2 v2.3.0/go.mod h1:Eew0uilEqZmIEZr8JrvYlvOM7Rr6xzTmMV8AyFNU9d0=
github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
github.com/onsi/gomega v1.21.1/go.mod h1:iYAIXgPSaDHak0LCMA+AWBpIKBr8WZicMxnE8luStNc=
github.com/onsi/gomega v1.22.1/go.mod h1:x6n7VNe4hw0vkyYUM4mjIXx3JbLiPaBPNgB7PRQ1tuM=
github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo=
github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
This diff is collapsed.
Click to expand it.
pool/client.go
View file @
76c32f9d
...
...
@@ -26,7 +26,7 @@ const (
//
closeWait
=
60
*
30
*
time
.
Second
//
endDate
=
60
*
30
*
time
.
Second
endDate
=
60
*
2
*
time
.
Second
)
var
upgrader
=
websocket
.
Upgrader
{
...
...
@@ -132,6 +132,7 @@ func (c *Client) readPump() {
close
(
c
.
sendPing
)
c
.
grpool
.
Close
()
c
.
hub
.
RemoveClient
(
c
)
Redis
.
HDel
(
"clients"
,
c
.
Id
)
dump
()
}()
Loop
:
...
...
This diff is collapsed.
Click to expand it.
pool/init.go
View file @
76c32f9d
...
...
@@ -2,11 +2,13 @@ package pool
import
(
"fmt"
"pool/dao"
"github.com/go-redis/redis"
"pool/dao/mq"
)
var
wsSever
*
Server
var
RabbitMQ
*
mq
.
RabbitMQ
var
Redis
*
redis
.
Client
//连接池的结构体
type
Server
struct
{
...
...
@@ -22,15 +24,20 @@ func InitWsPool(errfun func(err interface{})) {
wsSever
.
ErrFun
=
errfun
go
wsSever
.
hub
.
run
()
//开启服务
//go wsSever.hub.ticker() //开启定时服务
initWsPoolData
()
}
func
InitRabbit
(){
//forever := make(chan bool)
//RabbitMQ = mq.NewRabbitMQSimple("ttt")
fmt
.
Println
(
"rabbitMq start success"
)
// 在没有消息处理后 进行阻塞
//<-forever //不让协程终止
}
\ No newline at end of file
func
initWsPoolData
()
{
clientsData
:=
Redis
.
HGetAll
(
"clients"
)
clientsAll
:=
clientsData
.
Val
()
for
_
,
v
:=
range
clientsAll
{
if
v
==
""
{
continue
}
client
:=
new
(
Config
)
UnserislizeJson
([]
byte
(
v
),
client
)
NewClient
(
client
)
}
fmt
.
Println
(
wsSever
.
hub
.
clients
)
}
This diff is collapsed.
Click to expand it.
pool/private.go
View file @
76c32f9d
...
...
@@ -2,6 +2,7 @@ package pool
import
(
"encoding/json"
"fmt"
)
...
...
@@ -27,7 +28,8 @@ func searchStrArray(arr []string, ch string) bool {
}
func
SerializeJson
(
data
interface
{})
[]
byte
{
reply
,
_
:=
json
.
Marshal
(
data
)
reply
,
err
:=
json
.
Marshal
(
data
)
fmt
.
Println
(
err
)
return
reply
}
...
...
This diff is collapsed.
Click to expand it.
pool/publicApi.go
View file @
76c32f9d
...
...
@@ -10,6 +10,8 @@ import (
"time"
)
var
toSendDataLock
sync
.
Mutex
type
SetMsgReq
struct
{
ProcedureType
int
`json:"procedureType"`
GroupId
string
`json:"groupId" db:"group_id"`
...
...
@@ -76,6 +78,8 @@ func NewClient(conf *Config) *Client {
client
.
OnPing
(
nil
)
client
.
OnPong
(
nil
)
wsSever
.
hub
.
AddClient
(
client
)
jsonData
:=
string
(
SerializeJson
(
conf
))
Redis
.
HSet
(
"clients"
,
client
.
Id
,
jsonData
)
return
client
}
...
...
@@ -429,7 +433,6 @@ func SaveMsg(msg *SendMsg) {
//删除连接信息
DelToSendData
(
msg
.
FromClientId
,
msg
.
ToClientId
)
DelToSendData
(
msg
.
ToClientId
,
msg
.
FromClientId
)
}
//离线
...
...
@@ -469,7 +472,6 @@ func SaveMsg(msg *SendMsg) {
mqData
.
Finish
=
"5"
//删除连接信息
DelToSendData
(
msg
.
FromClientId
,
msg
.
ToClientId
)
DelToSendData
(
msg
.
ToClientId
,
msg
.
FromClientId
)
}
if
mqData
.
ProcedureType
!=
0
{
...
...
@@ -516,14 +518,21 @@ func SetEnd() {
}
SaveMsg
(
mqData
)
//发送结束会话给客户端
wsSever
.
hub
.
clients
[
clientsId
]
.
readMessage
(
mqData
)
_
,
isSet
:=
wsSever
.
hub
.
clients
[
clientsId
]
if
isSet
==
true
{
wsSever
.
hub
.
clients
[
clientsId
]
.
readMessage
(
mqData
)
}
toMqData
:=
&
SendMsg
{
ProcedureType
:
8
,
ToClientId
:
clientsId
,
FromClientId
:
vToSendData
.
toSendId
,
SendTime
:
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
}
wsSever
.
hub
.
clients
[
vToSendData
.
toSendId
]
.
readMessage
(
toMqData
)
_
,
isSet
=
wsSever
.
hub
.
clients
[
vToSendData
.
toSendId
]
if
isSet
==
true
{
wsSever
.
hub
.
clients
[
vToSendData
.
toSendId
]
.
readMessage
(
toMqData
)
}
}
}
}
...
...
@@ -532,15 +541,19 @@ func SetEnd() {
}
func
AppendToSendData
(
clientId
,
toClientId
,
sendTime
string
)
{
toSendData
:=
ToSendData
{
toSendTime
:
sendTime
,
toSendId
:
clientId
}
wsSever
.
hub
.
clients
[
toClientId
]
.
ToSendData
=
append
(
wsSever
.
hub
.
clients
[
toClientId
]
.
ToSendData
,
toSendData
)
sendData
:=
ToSendData
{
toSendTime
:
sendTime
,
toSendId
:
clientId
}
toSendDataLock
.
Lock
()
wsSever
.
hub
.
clients
[
toClientId
]
.
ToSendData
=
append
(
wsSever
.
hub
.
clients
[
toClientId
]
.
ToSendData
,
sendData
)
toSendDataLock
.
Unlock
()
return
}
func
DelToSendData
(
clientId
,
toClientId
string
)
{
for
k
,
v
:=
range
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
{
if
v
.
toSendId
==
toClientId
{
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
=
append
(
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
[
:
k
],
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
[
k
+
1
:
]
...
)
for
kclientId
,
vclientId
:=
range
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
{
if
vclientId
.
toSendId
==
toClientId
{
toSendDataLock
.
Lock
()
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
=
append
(
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
[
:
kclientId
],
wsSever
.
hub
.
clients
[
clientId
]
.
ToSendData
[
kclientId
+
1
:
]
...
)
toSendDataLock
.
Unlock
()
}
}
return
...
...
This diff is collapsed.
Click to expand it.
ws_client.go
View file @
76c32f9d
...
...
@@ -18,7 +18,7 @@ var addr2 = flag.String("addr", "127.0.0.1:11001", "http service address")
func
main
()
{
runtime
.
GOMAXPROCS
(
runtime
.
NumCPU
())
for
i
:=
0
;
i
<
1500
;
i
++
{
for
i
:=
1
;
i
<
5
;
i
++
{
go
wsClient2
(
fmt
.
Sprintf
(
"lA6fUNMamyUBlOokPOeiGg==_1_%d"
,
i
))
}
select
{}
...
...
@@ -56,28 +56,55 @@ func wsClient2(id string) {
})
done
:=
make
(
chan
struct
{})
//t := grand.N(30, 90)
//go func() {
// ticker1 := time.NewTicker(time.Duration(t) * time.Second)
// defer func() {
// ticker1.Stop()
// close(done)
// }()
// for {
// _, message, err := c.ReadMessage()
// if err != nil {
// log.Printf("read:%s", err.Error())
// return
// }
// log.Printf("recv: %s", message)
// /*select {
// case <-ticker1.C:
//
// return
// }*/
// }
//
//}()
msg1
:=
&
pool
.
SendMsg
{
ToClientId
:
""
,
FromClientId
:
id
,
ProcedureType
:
1
,
SendTime
:
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
Msg
:
"test"
+
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
}
m1
:=
pool
.
SerializeJson
(
msg1
)
fmt
.
Println
(
1
)
err
=
c
.
WriteMessage
(
websocket
.
BinaryMessage
,
m1
)
if
err
!=
nil
{
fmt
.
Println
(
"write:"
,
err
.
Error
())
return
}
time
.
Sleep
(
5
*
time
.
Second
)
msg2
:=
&
pool
.
SendMsg
{
ToClientId
:
""
,
FromClientId
:
id
,
ProcedureType
:
2
,
SendTime
:
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
Msg
:
"{
\"
petName
\"
:
\"
gogogo
\"
,
\"
petAge
\"
:
\"
1.1
\"
,
\"
question
\"
:
\"
eye
\"
}"
,
}
m2
:=
pool
.
SerializeJson
(
msg2
)
fmt
.
Println
(
2
)
err
=
c
.
WriteMessage
(
websocket
.
BinaryMessage
,
m2
)
if
err
!=
nil
{
fmt
.
Println
(
"write:"
,
err
.
Error
())
return
}
time
.
Sleep
(
5
*
time
.
Second
)
msg3
:=
&
pool
.
SendMsg
{
ToClientId
:
id
,
FromClientId
:
"6_2_14"
,
ProcedureType
:
3
,
SendTime
:
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
}
m3
:=
pool
.
SerializeJson
(
msg3
)
fmt
.
Println
(
3
)
err
=
c
.
WriteMessage
(
websocket
.
BinaryMessage
,
m3
)
if
err
!=
nil
{
fmt
.
Println
(
"write:"
,
err
.
Error
())
return
}
ticker
:=
time
.
NewTicker
(
10
*
time
.
Second
)
ticker1
:=
time
.
NewTicker
(
20
*
time
.
Second
)
...
...
@@ -92,24 +119,24 @@ func wsClient2(id string) {
ToClientId
:
"6_2_14"
,
FromClientId
:
id
,
ProcedureType
:
6
,
SendTime
:
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
Msg
:
"test"
+
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
),
//Channel: chann,
}
m
:=
pool
.
SerializeJson
(
msg
)
fmt
.
Println
(
msg
)
fmt
.
Println
(
6
)
err
:=
c
.
WriteMessage
(
websocket
.
BinaryMessage
,
m
)
if
err
!=
nil
{
log
.
Printf
(
"write:%s
"
,
err
.
Error
())
fmt
.
Println
(
"write:
"
,
err
.
Error
())
return
}
case
<-
interrupt
:
log
.
Printf
(
"interrupt"
)
fmt
.
Println
(
"interrupt"
)
// Cleanly close the connection by sending a close message and then
// waiting (with timeout) for the server to close the connection.
err
:=
c
.
WriteMessage
(
websocket
.
CloseMessage
,
websocket
.
FormatCloseMessage
(
websocket
.
CloseNormalClosure
,
""
))
if
err
!=
nil
{
log
.
Printf
(
"write close:%s
"
,
err
.
Error
())
fmt
.
Println
(
"write close:
"
,
err
.
Error
())
return
}
select
{
...
...
@@ -120,13 +147,13 @@ func wsClient2(id string) {
case
<-
ping
:
err
:=
c
.
WriteMessage
(
websocket
.
PongMessage
,
nil
)
if
err
!=
nil
{
log
.
Printf
(
"write pong:%s
"
,
err
.
Error
())
fmt
.
Println
(
"write pong:
"
,
err
.
Error
())
return
}
case
<-
ticker1
.
C
:
err
:=
c
.
WriteMessage
(
websocket
.
PingMessage
,
nil
)
if
err
!=
nil
{
log
.
Printf
(
"write pong:%s
"
,
err
.
Error
())
fmt
.
Println
(
"write pong:
"
,
err
.
Error
())
return
}
//return
...
...
This diff is collapsed.
Click to expand it.
ws_server.go
View file @
76c32f9d
...
...
@@ -5,7 +5,8 @@ import (
"fmt"
"net/http"
"net/http/pprof"
mq
"pool/dao"
"pool/dao/mq"
"pool/dao/redis"
"pool/pool"
"runtime"
"time"
...
...
@@ -31,6 +32,10 @@ func main() {
pool
.
RabbitMQ
=
mq
.
NewRabbitMQSimple
(
"im"
)
fmt
.
Println
(
"rabbitMq start success"
)
pool
.
Redis
=
redis
.
Init
()
fmt
.
Println
(
"redis start success"
)
//初骀化连接池
pool
.
InitWsPool
(
func
(
err
interface
{})
{
//接收连接池中的运行时错误信息
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment