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
de239cff
Commit
de239cff
authored
Aug 22, 2019
by
Him188moe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
30e0d76c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
3 deletions
+42
-3
mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt
...ava/net/mamoe/mirai/network/packet/client/ClientPacket.kt
+1
-1
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
...ava/net/mamoe/mirai/network/packet/server/ServerPacket.kt
+2
-1
mirai-core/src/main/java/net/mamoe/mirai/util/Utils.kt
mirai-core/src/main/java/net/mamoe/mirai/util/Utils.kt
+39
-1
No files found.
mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/ClientPacket.kt
View file @
de239cff
...
@@ -53,7 +53,7 @@ abstract class ClientPacket : ByteArrayDataOutputStream(), Packet {
...
@@ -53,7 +53,7 @@ abstract class ClientPacket : ByteArrayDataOutputStream(), Packet {
}
}
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
this
.
javaClass
.
simpleName
+
this
.
javaClass
.
declaredFields
.
joinToString
(
", "
,
"{"
,
"}"
)
{
it
.
trySetAccessible
();
it
.
name
+
"="
+
it
.
get
(
this
)
}
return
this
.
javaClass
.
simpleName
+
this
.
getAllDeclaredFields
()
.
joinToString
(
", "
,
"{"
,
"}"
)
{
it
.
trySetAccessible
();
it
.
name
+
"="
+
it
.
get
(
this
)
}
}
}
}
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
View file @
de239cff
...
@@ -5,6 +5,7 @@ import net.mamoe.mirai.network.packet.client.toHexString
...
@@ -5,6 +5,7 @@ import net.mamoe.mirai.network.packet.client.toHexString
import
net.mamoe.mirai.network.packet.server.login.*
import
net.mamoe.mirai.network.packet.server.login.*
import
net.mamoe.mirai.network.packet.server.touch.ServerTouchResponsePacket
import
net.mamoe.mirai.network.packet.server.touch.ServerTouchResponsePacket
import
net.mamoe.mirai.network.packet.server.touch.ServerTouchResponsePacketEncrypted
import
net.mamoe.mirai.network.packet.server.touch.ServerTouchResponsePacketEncrypted
import
net.mamoe.mirai.util.getAllDeclaredFields
import
net.mamoe.mirai.util.toHexString
import
net.mamoe.mirai.util.toHexString
import
java.io.DataInputStream
import
java.io.DataInputStream
...
@@ -168,7 +169,7 @@ DataArrived >> AnalyMessage
...
@@ -168,7 +169,7 @@ DataArrived >> AnalyMessage
}
}
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
this
.
javaClass
.
simpleName
+
this
.
javaClass
.
declaredFields
.
joinToString
(
", "
,
"{"
,
"}"
)
{
it
.
trySetAccessible
();
it
.
name
+
"="
+
it
.
get
(
this
)
}
return
this
.
javaClass
.
simpleName
+
this
.
getAllDeclaredFields
()
.
joinToString
(
", "
,
"{"
,
"}"
)
{
it
.
trySetAccessible
();
it
.
name
+
"="
+
it
.
get
(
this
)
}
}
}
}
}
...
...
mirai-core/src/main/java/net/mamoe/mirai/util/Utils.kt
View file @
de239cff
package
net.mamoe.mirai.util
package
net.mamoe.mirai.util
import
net.mamoe.mirai.network.Protocol
import
net.mamoe.mirai.network.Protocol
import
java.io.ByteArrayInputStream
import
java.io.ByteArrayOutputStream
import
java.io.ByteArrayOutputStream
import
java.io.DataInputStream
import
java.io.DataOutputStream
import
java.io.DataOutputStream
import
java.lang.reflect.Field
import
java.util.*
import
java.util.*
import
java.util.zip.CRC32
import
java.util.zip.CRC32
...
@@ -47,6 +50,7 @@ fun Byte.toHexString(): String = this.toUByte().toString(16)
...
@@ -47,6 +50,7 @@ fun Byte.toHexString(): String = this.toUByte().toString(16)
@ExperimentalUnsignedTypes
@ExperimentalUnsignedTypes
fun
String
.
hexToBytes
():
ByteArray
=
Protocol
.
hexToBytes
(
this
)
fun
String
.
hexToBytes
():
ByteArray
=
Protocol
.
hexToBytes
(
this
)
@ExperimentalUnsignedTypes
@ExperimentalUnsignedTypes
fun
String
.
hexToUBytes
():
UByteArray
=
Protocol
.
hexToUBytes
(
this
)
fun
String
.
hexToUBytes
():
UByteArray
=
Protocol
.
hexToUBytes
(
this
)
...
@@ -72,3 +76,37 @@ fun getRandomKey(length: Int): ByteArray {
...
@@ -72,3 +76,37 @@ fun getRandomKey(length: Int): ByteArray {
}
}
fun
getCrc32
(
key
:
ByteArray
):
Int
=
CRC32
().
let
{
it
.
update
(
key
);
it
.
value
.
toInt
()
}
fun
getCrc32
(
key
:
ByteArray
):
Int
=
CRC32
().
let
{
it
.
update
(
key
);
it
.
value
.
toInt
()
}
/**
* 获取类的所有字段(类成员变量), 包括父类的和私有的. <br></br>
* 相当于将这个类和它所有父类的 [Class.getDeclaredFields] 都合并成一个 [List] <br></br>
* 不会排除重名的字段. <br></br>
*
* @param clazz class
*
* @return field list
*/
@Throws
(
SecurityException
::
class
)
fun
Any
.
getAllDeclaredFields
():
List
<
Field
>
{
val
clazz
:
Class
<
out
Any
>
=
this
.
javaClass
;
val
list
=
LinkedList
<
Field
>()
loop
@
do
{
list
.
addAll
(
listOf
(*
clazz
.
declaredFields
))
if
(
this
.
javaClass
==
DataOutputStream
::
class
)
{
continue
}
when
(
this
.
javaClass
)
{
DataOutputStream
::
class
,
ByteArrayDataOutputStream
::
class
,
DataInputStream
::
class
,
ByteArrayInputStream
::
class
-> {
break@loop;
}
else -> {
}
}
//clazz = clazz.superclass!!
} while (clazz !=
Any
::
class
.
java
)
return
list
}
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