Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/b3log/solo/processor/KanBanNiangProcessor.java

-/*
- * Solo - A small and beautiful blogging system written in Java.
- * Copyright (c) 2010-present, b3log.org
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package org.b3log.solo.processor;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.math.RandomUtils;
-import org.b3log.latke.http.RequestContext;
-import org.b3log.latke.http.annotation.RequestProcessing;
-import org.b3log.latke.http.annotation.RequestProcessor;
-import org.b3log.latke.http.renderer.JsonRenderer;
-import org.b3log.latke.logging.Level;
-import org.b3log.latke.logging.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
-/**
- * KanBanNiang processor. https://github.com/b3log/solo/issues/12472
- *
- * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.0.3, Jan 9, 2020
- * @since 2.9.2
- */
-@RequestProcessor
-public class KanBanNiangProcessor {
-
-    /**
-     * Logger.
-     */
-    private static final Logger LOGGER = Logger.getLogger(KanBanNiangProcessor.class);
-
-    /**
-     * Returns a random model.
-     *
-     * @param context the specified request context
-     */
-    @RequestProcessing(value = "/plugins/kanbanniang/assets/model.json")
-    public void randomModel(final RequestContext context) {
-        final JsonRenderer renderer = new JsonRenderer();
-        context.setRenderer(renderer);
-        try {
-            final String assets = "/plugins/kanbanniang/assets";
-            String model;
-            try (final InputStream inputStream = KanBanNiangProcessor.class.getResourceAsStream(assets + "/model-list.json")) {
-                final JSONArray models = new JSONArray(IOUtils.toString(inputStream, StandardCharsets.UTF_8));
-                final int i = RandomUtils.nextInt(models.length());
-                model = models.getString(i);
-            }
-
-            try (final InputStream modelResource = KanBanNiangProcessor.class.getResourceAsStream(assets + "/model/" + model + "/index.json")) {
-                final JSONObject index = new JSONObject(IOUtils.toString(modelResource, StandardCharsets.UTF_8));
-                final JSONArray textures = index.optJSONArray("textures");
-                if (textures.isEmpty()) {
-                    try (final InputStream texturesRes = KanBanNiangProcessor.class.getResourceAsStream(assets + "/model/" + model + "/textures.json")) {
-                        final JSONArray texturesArray = new JSONArray(IOUtils.toString(texturesRes, StandardCharsets.UTF_8));
-                        final Object element = texturesArray.opt(RandomUtils.nextInt(texturesArray.length()));
-                        if (element instanceof JSONArray) {
-                            index.put("textures", element);
-                        } else {
-                            index.put("textures", new JSONArray().put(element));
-                        }
-                    }
-                }
-                renderer.setJSONObject(index);
-            }
-        } catch (final Exception e) {
-            LOGGER.log(Level.ERROR, "Returns a random KanBanNiang model failed", e);
-        }
-    }
-}

src/main/resources/lang_en_US.properties

@@ -77,7 +77,7 @@ searchLabel=Search
 dynamicLabel=Dynamic
 exportSQLLabel=Export SQL file
 exportJSONLabel=Export JSON file
-exportHexoLabel=Export Hexo file
+exportHexoLabel=Export Markdown file
 footerContent1Label=Footer: 
 userAvatar1Label=Avatar: 
 staticErrorLabel=<h2>Latke Configuraton Error</h2>\

src/main/resources/lang_zh_CN.properties

@@ -77,7 +77,7 @@ searchLabel=\u641C\u7D22
 dynamicLabel=\u52A8\u6001
 exportSQLLabel=\u5BFC\u51FA SQL \u6587\u4EF6
 exportJSONLabel=\u5BFC\u51FA JSON \u6587\u4EF6
-exportHexoLabel=\u5BFC\u51FA Hexo \u6587\u4EF6
+exportHexoLabel=\u5BFC\u51FA Markdown \u6587\u4EF6
 footerContent1Label=\u9875\u811A\uFF1A
 userAvatar1Label=\u5934\u50CF\uFF1A
 staticErrorLabel=<h2><a href='https://hacpai.com/tag/Latke' target='_blank'>Latke</a> \u914D\u7F6E\u9519\u8BEF</h2>\