Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
48a3d2e1
Unverified
Commit
48a3d2e1
authored
Feb 10, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
上传配置文案
parent
70506356
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
src/main/java/org/b3log/solo/model/Common.java
src/main/java/org/b3log/solo/model/Common.java
+5
-0
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
...n/java/org/b3log/solo/processor/console/AdminConsole.java
+2
-0
src/main/java/org/b3log/solo/util/Solos.java
src/main/java/org/b3log/solo/util/Solos.java
+10
-4
No files found.
src/main/java/org/b3log/solo/model/Common.java
View file @
48a3d2e1
...
...
@@ -27,6 +27,11 @@ package org.b3log.solo.model;
*/
public
final
class
Common
{
/**
* Key of upload msg.
*/
public
static
final
String
UPLOAD_MSG
=
"uploadMsg"
;
/**
* Key of upload URL.
*/
...
...
src/main/java/org/b3log/solo/processor/console/AdminConsole.java
View file @
48a3d2e1
...
...
@@ -163,10 +163,12 @@ public class AdminConsole {
// 内置 HTTPS+CDN 文件存储 https://github.com/b3log/solo/issues/12556
dataModel
.
put
(
Common
.
UPLOAD_TOKEN
,
""
);
dataModel
.
put
(
Common
.
UPLOAD_URL
,
""
);
dataModel
.
put
(
Common
.
UPLOAD_MSG
,
""
);
final
JSONObject
upload
=
Solos
.
getUploadToken
(
context
);
if
(
null
!=
upload
)
{
dataModel
.
put
(
Common
.
UPLOAD_TOKEN
,
upload
.
optString
(
Common
.
UPLOAD_TOKEN
));
dataModel
.
put
(
Common
.
UPLOAD_URL
,
upload
.
optString
(
Common
.
UPLOAD_URL
));
dataModel
.
put
(
Common
.
UPLOAD_MSG
,
upload
.
optString
(
Common
.
UPLOAD_MSG
));
}
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Admin index render failed"
,
e
);
...
...
src/main/java/org/b3log/solo/util/Solos.java
View file @
48a3d2e1
...
...
@@ -167,6 +167,7 @@ public final class Solos {
private
static
long
uploadTokenTime
;
private
static
String
uploadToken
=
""
;
private
static
String
uploadURL
=
"https://hacpai.com/upload/client"
;
private
static
String
uploadMsg
=
""
;
/**
* Gets upload token.
...
...
@@ -191,13 +192,15 @@ public final class Solos {
if
(
3600000
>=
now
-
uploadTokenTime
)
{
return
new
JSONObject
().
put
(
Common
.
UPLOAD_TOKEN
,
uploadToken
).
put
(
Common
.
UPLOAD_URL
,
uploadURL
);
put
(
Common
.
UPLOAD_URL
,
uploadURL
).
put
(
Common
.
UPLOAD_MSG
,
uploadMsg
);
}
if
(
15000
>=
now
-
uploadTokenCheckTime
)
{
return
new
JSONObject
().
put
(
Common
.
UPLOAD_TOKEN
,
uploadToken
).
put
(
Common
.
UPLOAD_URL
,
uploadURL
);
put
(
Common
.
UPLOAD_URL
,
uploadURL
).
put
(
Common
.
UPLOAD_MSG
,
uploadMsg
);
}
final
JSONObject
requestJSON
=
new
JSONObject
().
put
(
User
.
USER_NAME
,
userName
).
put
(
UserExt
.
USER_B3_KEY
,
userB3Key
);
...
...
@@ -210,7 +213,8 @@ public final class Solos {
res
.
charset
(
"UTF-8"
);
final
JSONObject
result
=
new
JSONObject
(
res
.
bodyText
());
if
(
0
!=
result
.
optInt
(
Keys
.
CODE
))
{
LOGGER
.
log
(
Level
.
ERROR
,
result
.
optString
(
Keys
.
MSG
));
uploadMsg
=
result
.
optString
(
Keys
.
MSG
);
LOGGER
.
log
(
Level
.
ERROR
,
uploadMsg
);
return
null
;
}
...
...
@@ -219,10 +223,12 @@ public final class Solos {
uploadTokenTime
=
now
;
uploadToken
=
data
.
optString
(
"uploadToken"
);
uploadURL
=
data
.
optString
(
"uploadURL"
);
uploadMsg
=
""
;
return
new
JSONObject
().
put
(
Common
.
UPLOAD_TOKEN
,
uploadToken
).
put
(
Common
.
UPLOAD_URL
,
uploadURL
);
put
(
Common
.
UPLOAD_URL
,
uploadURL
).
put
(
Common
.
UPLOAD_MSG
,
uploadMsg
);
}
catch
(
final
Exception
e
)
{
LOGGER
.
log
(
Level
.
ERROR
,
"Gets upload token failed"
,
e
);
...
...
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