Commit 48a3d2e1 authored by Liang Ding's avatar Liang Ding

🎨 上传配置文案

parent 70506356
......@@ -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.
*/
......
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment