Merge pull request #12221 from b3log/master

rebase

src/main/java/org/b3log/solo/repository/impl/TagRepositoryImpl.java

@@ -16,7 +16,10 @@
 package org.b3log.solo.repository.impl;
 
 
+import java.text.Collator;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import javax.inject.Inject;
 import org.b3log.solo.model.Tag;
@@ -32,6 +35,7 @@ import org.b3log.latke.repository.annotation.Repository;
 import org.b3log.latke.util.CollectionUtils;
 import org.b3log.solo.repository.TagArticleRepository;
 import org.json.JSONArray;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 
@@ -45,6 +49,8 @@ import org.json.JSONObject;
 @Repository
 public class TagRepositoryImpl extends AbstractRepository implements TagRepository {
 
+    private final static Comparator<Object> CHINA_COMPARE = Collator.getInstance(java.util.Locale.CHINA);
+
     /**
      * Public constructor.
      */
@@ -80,7 +86,10 @@ public class TagRepositoryImpl extends AbstractRepository implements TagReposito
         final JSONObject result = get(query);
         final JSONArray array = result.optJSONArray(Keys.RESULTS);
 
-        return CollectionUtils.jsonArrayToList(array);
+        List<JSONObject> tagJoList = CollectionUtils.jsonArrayToList(array);
+        sortJSONTagList(tagJoList);
+
+        return tagJoList;
     }
 
     @Override
@@ -107,4 +116,17 @@ public class TagRepositoryImpl extends AbstractRepository implements TagReposito
     public void setTagArticleRepository(final TagArticleRepository tagArticleRepository) {
         this.tagArticleRepository = tagArticleRepository;
     }
+
+    private void sortJSONTagList(List<JSONObject> tagJoList) {
+        Collections.sort(tagJoList, new Comparator<JSONObject>() {
+            @Override
+            public int compare(JSONObject o1, JSONObject o2) {
+                try {
+                    return CHINA_COMPARE.compare(o1.getString("tagTitle"), o2.getString("tagTitle"));
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+    }
 }