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
7271ff37
Commit
7271ff37
authored
Apr 24, 2020
by
Karlatemp
Committed by
GitHub
Apr 24, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#257 的追加修正 (#267)
* Rename * Fix resource missing * Fix typo
parent
769b6ce2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
...c/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
+6
-6
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
...ain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
+3
-1
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/WindowHelperJvm.kt
...c/jvmMain/kotlin/net/mamoe/mirai/utils/WindowHelperJvm.kt
+0
-0
No files found.
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.jvm.kt
View file @
7271ff37
...
@@ -37,26 +37,26 @@ class DefaultLoginSolver(
...
@@ -37,26 +37,26 @@ class DefaultLoginSolver(
val
input
:
suspend
()
->
String
,
val
input
:
suspend
()
->
String
,
val
overrideLogger
:
MiraiLogger
?
=
null
val
overrideLogger
:
MiraiLogger
?
=
null
)
:
LoginSolver
()
{
)
:
LoginSolver
()
{
private
val
de
gel
ate
:
LoginSolver
private
val
de
leg
ate
:
LoginSolver
init
{
init
{
if
(
Desktop
.
isDesktopSupported
())
{
if
(
Desktop
.
isDesktopSupported
())
{
de
gel
ate
=
SwingSolver
de
leg
ate
=
SwingSolver
}
else
{
}
else
{
de
gel
ate
=
DefaultLoginSolverImpl
(
input
,
overrideLogger
)
de
leg
ate
=
DefaultLoginSolverImpl
(
input
,
overrideLogger
)
}
}
}
}
override
suspend
fun
onSolvePicCaptcha
(
bot
:
Bot
,
data
:
ByteArray
):
String
?
{
override
suspend
fun
onSolvePicCaptcha
(
bot
:
Bot
,
data
:
ByteArray
):
String
?
{
return
de
gel
ate
.
onSolvePicCaptcha
(
bot
,
data
)
return
de
leg
ate
.
onSolvePicCaptcha
(
bot
,
data
)
}
}
override
suspend
fun
onSolveSliderCaptcha
(
bot
:
Bot
,
url
:
String
):
String
?
{
override
suspend
fun
onSolveSliderCaptcha
(
bot
:
Bot
,
url
:
String
):
String
?
{
return
de
gel
ate
.
onSolveSliderCaptcha
(
bot
,
url
)
return
de
leg
ate
.
onSolveSliderCaptcha
(
bot
,
url
)
}
}
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
{
override
suspend
fun
onSolveUnsafeDeviceLoginVerify
(
bot
:
Bot
,
url
:
String
):
String
?
{
return
de
gel
ate
.
onSolveUnsafeDeviceLoginVerify
(
bot
,
url
)
return
de
leg
ate
.
onSolveUnsafeDeviceLoginVerify
(
bot
,
url
)
}
}
}
}
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/LoginSolver.swing.jvm.kt
View file @
7271ff37
...
@@ -44,7 +44,9 @@ object SwingSolver : LoginSolver() {
...
@@ -44,7 +44,9 @@ object SwingSolver : LoginSolver() {
需要进行账户安全认证<br>
需要进行账户安全认证<br>
该账户有[设备锁]/[不常用登录地点]/[不常用设备登录]的问题<br>
该账户有[设备锁]/[不常用登录地点]/[不常用设备登录]的问题<br>
完成以下账号认证即可成功登录|理论本认证在mirai每个账户中最多出现1次<br>
完成以下账号认证即可成功登录|理论本认证在mirai每个账户中最多出现1次<br>
完成后请关闭该窗口
请将该链接在QQ浏览器中打开并完成认证<br>
成功后请关闭该窗口<br>
这步操作将在后续的版本中优化
"""
.
trimIndent
()
"""
.
trimIndent
()
).
last
()
).
last
()
JTextField
(
url
).
append
()
JTextField
(
url
).
append
()
...
...
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/
JWTHelper
.kt
→
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/
WindowHelperJvm
.kt
View file @
7271ff37
File moved
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