Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
469181e2
Commit
469181e2
authored
Feb 28, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix imageUpload
parent
ccec3e95
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
mirai-api-http/build.gradle.kts
mirai-api-http/build.gradle.kts
+3
-5
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
...tlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
+6
-1
No files found.
mirai-api-http/build.gradle.kts
View file @
469181e2
@
file
:
Suppress
(
"UNUSED_VARIABLE"
)
@
file
:
Suppress
(
"UNUSED_VARIABLE"
)
import
org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
plugins
{
plugins
{
id
(
"kotlinx-atomicfu"
)
id
(
"kotlinx-atomicfu"
)
kotlin
(
"jvm"
)
kotlin
(
"jvm"
)
...
@@ -24,9 +22,9 @@ val ktorVersion: String by rootProject.ext
...
@@ -24,9 +22,9 @@ val ktorVersion: String by rootProject.ext
val
serializationVersion
:
String
by
rootProject
.
ext
val
serializationVersion
:
String
by
rootProject
.
ext
fun
KotlinDependencyHandler
.
kotlinx
(
id
:
String
,
version
:
String
)
=
"org.jetbrains.kotlinx:kotlinx-$id:$version"
fun
kotlinx
(
id
:
String
,
version
:
String
)
=
"org.jetbrains.kotlinx:kotlinx-$id:$version"
fun
KotlinDependencyHandler
.
ktor
(
id
:
String
,
version
:
String
=
ktorVersion
)
=
"io.ktor:ktor-$id:$version"
fun
ktor
(
id
:
String
,
version
:
String
=
this
@Build_gradle
.
ktorVersion
)
=
"io.ktor:ktor-$id:$version"
kotlin
{
kotlin
{
...
@@ -42,7 +40,7 @@ kotlin {
...
@@ -42,7 +40,7 @@ kotlin {
implementation
(
ktor
(
"server-cio"
))
implementation
(
ktor
(
"server-cio"
))
implementation
(
kotlinx
(
"io-jvm"
,
kotlinXIoVersion
))
implementation
(
kotlinx
(
"io-jvm"
,
kotlinXIoVersion
))
implementation
(
ktor
(
"http-jvm"
))
implementation
(
ktor
(
"http-jvm"
))
implementation
(
"org.slf4j:slf4j-simple:1.7.
26
"
)
implementation
(
"org.slf4j:slf4j-simple:1.7.
30
"
)
}
}
}
}
...
...
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt
View file @
469181e2
...
@@ -36,7 +36,7 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
...
@@ -36,7 +36,7 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
data
:
Any
,
data
:
Any
,
dataSize
:
Int
,
dataSize
:
Int
,
fileMd5
:
ByteArray
,
fileMd5
:
ByteArray
,
sizePerPacket
:
Int
=
8
000
sizePerPacket
:
Int
=
8
192
):
Flow
<
ByteReadPacket
>
{
):
Flow
<
ByteReadPacket
>
{
ByteArrayPool
.
checkBufferSize
(
sizePerPacket
)
ByteArrayPool
.
checkBufferSize
(
sizePerPacket
)
require
(
data
is
Input
||
data
is
InputStream
||
data
is
ByteReadChannel
)
{
"unsupported data: ${data::class.simpleName}"
}
require
(
data
is
Input
||
data
is
InputStream
||
data
is
ByteReadChannel
)
{
"unsupported data: ${data::class.simpleName}"
}
...
@@ -52,6 +52,7 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
...
@@ -52,6 +52,7 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
else
->
error
(
"unreachable code"
)
else
->
error
(
"unreachable code"
)
}
}
var
offset
=
0L
return
flow
.
map
{
chunkedInput
->
return
flow
.
map
{
chunkedInput
->
buildPacket
{
buildPacket
{
val
head
=
CSDataHighwayHead
.
ReqDataHighwayHead
(
val
head
=
CSDataHighwayHead
.
ReqDataHighwayHead
(
...
@@ -68,7 +69,9 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
...
@@ -68,7 +69,9 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
localeId
=
localId
localeId
=
localId
),
),
msgSeghead
=
CSDataHighwayHead
.
SegHead
(
msgSeghead
=
CSDataHighwayHead
.
SegHead
(
cacheAddr
=
812157193
,
datalength
=
chunkedInput
.
bufferSize
,
datalength
=
chunkedInput
.
bufferSize
,
dataoffset
=
offset
,
filesize
=
dataSize
.
toLong
(),
filesize
=
dataSize
.
toLong
(),
serviceticket
=
uKey
,
serviceticket
=
uKey
,
md5
=
net
.
mamoe
.
mirai
.
utils
.
md5
(
chunkedInput
.
buffer
,
0
,
chunkedInput
.
bufferSize
),
md5
=
net
.
mamoe
.
mirai
.
utils
.
md5
(
chunkedInput
.
buffer
,
0
,
chunkedInput
.
bufferSize
),
...
@@ -80,6 +83,8 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
...
@@ -80,6 +83,8 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
msgLoginSigHead
=
null
msgLoginSigHead
=
null
).
toByteArray
(
CSDataHighwayHead
.
ReqDataHighwayHead
.
serializer
())
).
toByteArray
(
CSDataHighwayHead
.
ReqDataHighwayHead
.
serializer
())
offset
+=
chunkedInput
.
bufferSize
writeByte
(
40
)
writeByte
(
40
)
writeInt
(
head
.
size
)
writeInt
(
head
.
size
)
writeInt
(
chunkedInput
.
bufferSize
)
writeInt
(
chunkedInput
.
bufferSize
)
...
...
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