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
0fc7b8cf
Commit
0fc7b8cf
authored
Aug 17, 2019
by
liujiahua123123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
logger fixed
parent
c7584c2d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
16 deletions
+34
-16
mirai-core/src/main/java/module-info.java
mirai-core/src/main/java/module-info.java
+0
-6
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
+6
-4
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
+7
-6
mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.kt
...i-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.kt
+21
-0
No files found.
mirai-core/src/main/java/module-info.java
deleted
100644 → 0
View file @
c7584c2d
module
mirai_core
{
requires
kotlin
.
stdlib
;
requires
lombok
;
exports
net
.
mamoe
.
mirai
;
}
\ No newline at end of file
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
View file @
0fc7b8cf
...
@@ -9,6 +9,7 @@ import net.mamoe.mirai.network.Protocol;
...
@@ -9,6 +9,7 @@ import net.mamoe.mirai.network.Protocol;
import
net.mamoe.mirai.network.Robot
;
import
net.mamoe.mirai.network.Robot
;
import
net.mamoe.mirai.task.MiraiTaskManager
;
import
net.mamoe.mirai.task.MiraiTaskManager
;
import
net.mamoe.mirai.utils.LoggerTextFormat
;
import
net.mamoe.mirai.utils.LoggerTextFormat
;
import
net.mamoe.mirai.utils.MiraiLogger
;
import
net.mamoe.mirai.utils.config.MiraiConfig
;
import
net.mamoe.mirai.utils.config.MiraiConfig
;
import
net.mamoe.mirai.utils.config.MiraiMapSection
;
import
net.mamoe.mirai.utils.config.MiraiMapSection
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
...
@@ -17,7 +18,6 @@ import java.io.File;
...
@@ -17,7 +18,6 @@ import java.io.File;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.Scanner
;
import
java.util.Scanner
;
@Log4j2
public
class
MiraiServer
{
public
class
MiraiServer
{
@Getter
@Getter
private
static
MiraiServer
instance
;
private
static
MiraiServer
instance
;
...
@@ -40,11 +40,11 @@ public class MiraiServer {
...
@@ -40,11 +40,11 @@ public class MiraiServer {
@Getter
@Getter
MiraiTaskManager
taskManager
;
MiraiTaskManager
taskManager
;
@Getter
MiraiLogger
logger
;
MiraiConfig
setting
;
MiraiConfig
setting
;
public
static
Logger
getLogger
()
{
return
log
;
}
protected
MiraiServer
(){
protected
MiraiServer
(){
instance
=
this
;
instance
=
this
;
...
@@ -60,6 +60,7 @@ public class MiraiServer {
...
@@ -60,6 +60,7 @@ public class MiraiServer {
this
.
getEventManager
().
boardcastEvent
(
new
ServerDisableEvent
());
this
.
getEventManager
().
boardcastEvent
(
new
ServerDisableEvent
());
getLogger
().
info
(
LoggerTextFormat
.
SKY_BLUE
+
"Data have been saved"
);
getLogger
().
info
(
LoggerTextFormat
.
SKY_BLUE
+
"Data have been saved"
);
}
}
}
}
...
@@ -67,6 +68,7 @@ public class MiraiServer {
...
@@ -67,6 +68,7 @@ public class MiraiServer {
this
.
parentFolder
=
new
File
(
System
.
getProperty
(
"user.dir"
));
this
.
parentFolder
=
new
File
(
System
.
getProperty
(
"user.dir"
));
this
.
unix
=
!
System
.
getProperties
().
getProperty
(
"os.name"
).
toUpperCase
().
contains
(
"WINDOWS"
);
this
.
unix
=
!
System
.
getProperties
().
getProperty
(
"os.name"
).
toUpperCase
().
contains
(
"WINDOWS"
);
this
.
logger
=
MiraiLogger
.
INSTANCE
;
this
.
eventManager
=
MiraiEventManager
.
getInstance
();
this
.
eventManager
=
MiraiEventManager
.
getInstance
();
this
.
taskManager
=
MiraiTaskManager
.
getInstance
();
this
.
taskManager
=
MiraiTaskManager
.
getInstance
();
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/Robot.kt
View file @
0fc7b8cf
...
@@ -14,6 +14,7 @@ import net.mamoe.mirai.network.packet.Packet
...
@@ -14,6 +14,7 @@ import net.mamoe.mirai.network.packet.Packet
import
net.mamoe.mirai.network.packet.client.Client0825ResponsePacket
import
net.mamoe.mirai.network.packet.client.Client0825ResponsePacket
import
net.mamoe.mirai.network.packet.server.Server0825Packet
import
net.mamoe.mirai.network.packet.server.Server0825Packet
import
net.mamoe.mirai.network.packet.server.ServerPacket
import
net.mamoe.mirai.network.packet.server.ServerPacket
import
net.mamoe.mirai.utils.MiraiLogger
import
java.net.InetSocketAddress
import
java.net.InetSocketAddress
/**
/**
...
@@ -22,7 +23,7 @@ import java.net.InetSocketAddress
...
@@ -22,7 +23,7 @@ import java.net.InetSocketAddress
* @author Him188moe @ Mirai Project
* @author Him188moe @ Mirai Project
*/
*/
class
Robot
(
val
number
:
Long
)
{
class
Robot
(
val
number
:
Long
)
{
private
lateinit
var
ctx
:
ChannelHandlerContext
;
private
lateinit
var
ctx
:
ChannelHandlerContext
internal
fun
onPacketReceived
(
packet
:
Packet
)
{
internal
fun
onPacketReceived
(
packet
:
Packet
)
{
if
(
packet
!
is
ServerPacket
)
{
if
(
packet
!
is
ServerPacket
)
{
...
@@ -56,7 +57,7 @@ class Robot(val number: Long) {
...
@@ -56,7 +57,7 @@ class Robot(val number: Long) {
ch
.
pipeline
().
addLast
(
object
:
SimpleChannelInboundHandler
<
ByteArray
>()
{
ch
.
pipeline
().
addLast
(
object
:
SimpleChannelInboundHandler
<
ByteArray
>()
{
override
fun
channelRead0
(
ctx
:
ChannelHandlerContext
,
bytes
:
ByteArray
)
{
override
fun
channelRead0
(
ctx
:
ChannelHandlerContext
,
bytes
:
ByteArray
)
{
try
{
try
{
this
@Robot
.
ctx
=
ctx
;
this
@Robot
.
ctx
=
ctx
/*val remaining = Reader.read(bytes);
/*val remaining = Reader.read(bytes);
if (Reader.isPacketAvailable()) {
if (Reader.isPacketAvailable()) {
robot.onPacketReceived(Reader.toServerPacket())
robot.onPacketReceived(Reader.toServerPacket())
...
@@ -65,7 +66,7 @@ class Robot(val number: Long) {
...
@@ -65,7 +66,7 @@ class Robot(val number: Long) {
}*/
}*/
this
@Robot
.
onPacketReceived
(
ServerPacket
.
ofByteArray
(
bytes
))
this
@Robot
.
onPacketReceived
(
ServerPacket
.
ofByteArray
(
bytes
))
}
catch
(
e
:
Exception
)
{
}
catch
(
e
:
Exception
)
{
Mirai
Server
.
getLogger
()
.
catching
(
e
)
Mirai
Logger
.
catching
(
e
)
}
}
}
}
...
@@ -74,7 +75,7 @@ class Robot(val number: Long) {
...
@@ -74,7 +75,7 @@ class Robot(val number: Long) {
}
}
override
fun
exceptionCaught
(
ctx
:
ChannelHandlerContext
,
cause
:
Throwable
)
{
override
fun
exceptionCaught
(
ctx
:
ChannelHandlerContext
,
cause
:
Throwable
)
{
Mirai
Server
.
getLogger
()
.
catching
(
cause
)
Mirai
Logger
.
catching
(
cause
)
}
}
})
})
}
}
...
@@ -102,10 +103,10 @@ class Robot(val number: Long) {
...
@@ -102,10 +103,10 @@ class Robot(val number: Long) {
*/
*/
fun
read
(
bytes
:
ByteArray
):
ByteArray
?
{
fun
read
(
bytes
:
ByteArray
):
ByteArray
?
{
checkNotNull
(
this
.
length
)
checkNotNull
(
this
.
length
)
val
needSize
=
length
!!
-
this
.
bytes
.
size
;
//How many bytes we need
val
needSize
=
length
!!
-
this
.
bytes
.
size
//How many bytes we need
if
(
needSize
==
bytes
.
size
||
needSize
>
bytes
.
size
)
{
if
(
needSize
==
bytes
.
size
||
needSize
>
bytes
.
size
)
{
this
.
bytes
+=
bytes
this
.
bytes
+=
bytes
return
null
;
return
null
}
}
//We got more than we need
//We got more than we need
...
...
mirai-core/src/main/java/net/mamoe/mirai/utils/MiraiLogger.kt
0 → 100644
View file @
0fc7b8cf
package
net.mamoe.mirai.utils
import
java.text.SimpleDateFormat
import
java.util.*
object
MiraiLogger
{
fun
info
(
o
:
Any
)
{
this
.
print
(
o
.
toString
())
}
fun
catching
(
e
:
Throwable
){
this
.
print
(
e
.
message
)
this
.
print
(
e
.
localizedMessage
)
this
.
print
(
e
.
cause
.
toString
())
}
private
fun
print
(
value
:
String
?){
val
s
=
SimpleDateFormat
(
"MM-dd HH:mm:ss"
).
format
(
Date
())
System
.
out
.
println
(
LoggerTextFormat
.
BLUE
.
toString
()
+
"[Mirai] $s : $value"
)
}
}
\ No newline at end of file
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