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
57479e0d
Commit
57479e0d
authored
Feb 19, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all 登陆s with 登录
parent
985f368f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
.../kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
+2
-2
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
...e/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
+2
-2
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt
...mMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt
+2
-2
No files found.
mirai-console-terminal/src/main/kotlin/net/mamoe/mirai/console/MiraiConsoleTerminalUI.kt
View file @
57479e0d
...
@@ -187,8 +187,8 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
...
@@ -187,8 +187,8 @@ object MiraiConsoleTerminalUI : MiraiConsoleUI {
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
{
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
{
pushLog
(
0
,
"[Login Solver]需要进行账户安全认证"
)
pushLog
(
0
,
"[Login Solver]需要进行账户安全认证"
)
pushLog
(
0
,
"[Login Solver]该账户有[设备锁]/[不常用登
陆地点]/[不常用设备登陆
]的问题"
)
pushLog
(
0
,
"[Login Solver]该账户有[设备锁]/[不常用登
录地点]/[不常用设备登录
]的问题"
)
pushLog
(
0
,
"[Login Solver]完成以下账号认证即可成功登
陆
|理论本认证在mirai每个账户中最多出现1次"
)
pushLog
(
0
,
"[Login Solver]完成以下账号认证即可成功登
录
|理论本认证在mirai每个账户中最多出现1次"
)
pushLog
(
0
,
"[Login Solver]请将该链接在QQ浏览器中打开并完成认证, 成功后输入任意字符"
)
pushLog
(
0
,
"[Login Solver]请将该链接在QQ浏览器中打开并完成认证, 成功后输入任意字符"
)
pushLog
(
0
,
"[Login Solver]这步操作将在后续的版本中优化"
)
pushLog
(
0
,
"[Login Solver]这步操作将在后续的版本中优化"
)
pushLog
(
0
,
url
)
pushLog
(
0
,
url
)
...
...
mirai-console/src/main/kotlin/net/mamoe/mirai/console/MiraiConsole.kt
View file @
57479e0d
...
@@ -77,7 +77,7 @@ object MiraiConsole {
...
@@ -77,7 +77,7 @@ object MiraiConsole {
logger
(
"Mirai-console 启动完成"
)
logger
(
"Mirai-console 启动完成"
)
logger
(
"\"/login qqnumber qqpassword \" to login a bot"
)
logger
(
"\"/login qqnumber qqpassword \" to login a bot"
)
logger
(
"\"/login qq号 qq密码 \" 来登
陆
一个BOT"
)
logger
(
"\"/login qq号 qq密码 \" 来登
录
一个BOT"
)
}
}
fun
stop
()
{
fun
stop
()
{
...
@@ -208,7 +208,7 @@ object MiraiConsole {
...
@@ -208,7 +208,7 @@ object MiraiConsole {
}
}
val
bot
:
Bot
?
=
if
(
it
.
size
==
2
)
{
val
bot
:
Bot
?
=
if
(
it
.
size
==
2
)
{
if
(
bots
.
size
==
0
)
{
if
(
bots
.
size
==
0
)
{
logger
(
"还没有BOT登
陆
"
)
logger
(
"还没有BOT登
录
"
)
return
@
onCommand
false
return
@
onCommand
false
}
}
bots
[
0
].
get
()
bots
[
0
].
get
()
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfigurationJvm.kt
View file @
57479e0d
...
@@ -105,8 +105,8 @@ class DefaultLoginSolver(
...
@@ -105,8 +105,8 @@ class DefaultLoginSolver(
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
=
loginSolverLock
.
withLock
{
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
=
loginSolverLock
.
withLock
{
val
logger
=
getLogger
(
bot
)
val
logger
=
getLogger
(
bot
)
logger
.
info
(
"需要进行账户安全认证"
)
logger
.
info
(
"需要进行账户安全认证"
)
logger
.
info
(
"该账户有[设备锁]/[不常用登
陆地点]/[不常用设备登陆
]的问题"
)
logger
.
info
(
"该账户有[设备锁]/[不常用登
录地点]/[不常用设备登录
]的问题"
)
logger
.
info
(
"完成以下账号认证即可成功登
陆
|理论本认证在mirai每个账户中最多出现1次"
)
logger
.
info
(
"完成以下账号认证即可成功登
录
|理论本认证在mirai每个账户中最多出现1次"
)
logger
.
info
(
"请将该链接在QQ浏览器中打开并完成认证, 成功后输入任意字符"
)
logger
.
info
(
"请将该链接在QQ浏览器中打开并完成认证, 成功后输入任意字符"
)
logger
.
info
(
"这步操作将在后续的版本中优化"
)
logger
.
info
(
"这步操作将在后续的版本中优化"
)
logger
.
info
(
url
)
logger
.
info
(
url
)
...
...
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