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

1557100211 · Jun 13, 2018 · 92a3f0d · 92a3f0d
2 parents b5211cc + 1a494bd
commit 92a3f0d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 13 deletions.
diff --git a/CHANGE_LOGS.html b/CHANGE_LOGS.html
@@ -26,6 +26,16 @@
     </style>
 </head>
 <body>
+<h2>Release 3.0.0 - Jun 13, 2018</h2>
+<ul>
+    <li><a href="https://github.com/b3log/symphony/issues/486">486 新的帖子类型：问答帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/643">643 细分 401 及 403</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/644">644 去掉签到时间限制</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/646">646 个人设置位置移到隐私中</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/654">654 更新 IP 定位</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/655">655 更新邮箱</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/652">652 帖子快链时丢失查询参数</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+</ul>
 <h2>Release 2.8.0 - May 25, 2018</h2>
 <ul>
     <li><a href="https://github.com/b3log/symphony/issues/507">507 清风明月</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Symphony",
-  "version": "2.8.0",
+  "version": "3.0.0",
   "description": "A modern community (forum/BBS/SNS/blog) platform written in Java. 一个用 Java 实现的现代化社区（论坛/BBS/社交网络/博客）平台。",
   "homepage": "https://sym.b3log.org",
   "repository": {

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Description: Symphony POM.
-    Version: 2.16.6.91, Jun 6, 2018
+    Version: 2.16.6.92, Jun 13, 2018
     Author: Liang Ding
     Author: Zephyr
 -->
@@ -12,11 +12,11 @@
     <groupId>org.b3log</groupId>
     <artifactId>symphony</artifactId>
     <packaging>war</packaging>
-    <version>2.8.0</version>
+    <version>3.0.0</version>
     <name>Symphony</name>
     <url>https://sym.b3log.org</url>
     <description>
-        一个用 Java 实现的现代化社区（论坛/社交网络/博客）平台。
+        一个用 Java 实现的现代化社区（论坛/BBS/社交网络/博客）平台。
         A modern community (forum/BBS/SNS/blog) platform written in Java.
     </description>
     <inceptionYear>2012</inceptionYear>

diff --git a/src/main/java/org/b3log/symphony/SymphonyServletListener.java b/src/main/java/org/b3log/symphony/SymphonyServletListener.java
@@ -60,7 +60,7 @@
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
  * @author Bill Ho
- * @version 3.19.10.9, May 25, 2018
+ * @version 3.19.10.10, Jun 13, 2018
  * @since 0.2.0
  */
 public final class SymphonyServletListener extends AbstractServletListener {
@@ -73,7 +73,7 @@ public final class SymphonyServletListener extends AbstractServletListener {
     /**
      * Symphony version.
      */
-    public static final String VERSION = "2.8.0";
+    public static final String VERSION = "3.0.0";
 
     /**
      * JSONO print indent factor.

diff --git a/src/main/java/org/b3log/symphony/service/VerifycodeQueryService.java b/src/main/java/org/b3log/symphony/service/VerifycodeQueryService.java
@@ -21,10 +21,7 @@
 import org.b3log.latke.ioc.inject.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
-import org.b3log.latke.repository.CompositeFilterOperator;
-import org.b3log.latke.repository.FilterOperator;
-import org.b3log.latke.repository.PropertyFilter;
-import org.b3log.latke.repository.Query;
+import org.b3log.latke.repository.*;
 import org.b3log.latke.service.annotation.Service;
 import org.b3log.symphony.model.Verifycode;
 import org.b3log.symphony.repository.VerifycodeRepository;
@@ -35,7 +32,7 @@
  * Verifycode query service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.2.0.0, Jun 12, 2018
+ * @version 1.2.0.1, Jun 13, 2018
  * @since 1.3.0
  */
 @Service
@@ -65,7 +62,7 @@ public JSONObject getVerifycodeByUserId(final int type, final int bizType, final
                 new PropertyFilter(Verifycode.TYPE, FilterOperator.EQUAL, type),
                 new PropertyFilter(Verifycode.BIZ_TYPE, FilterOperator.EQUAL, bizType),
                 new PropertyFilter(Verifycode.USER_ID, FilterOperator.EQUAL, userId))
-        );
+        ).addSort(Keys.OBJECT_ID, SortDirection.DESCENDING);
 
         try {
             final JSONObject result = verifycodeRepository.get(query);

diff --git a/src/main/webapp/CHANGE_LOGS.html b/src/main/webapp/CHANGE_LOGS.html
@@ -26,6 +26,16 @@
     </style>
 </head>
 <body>
+<h2>Release 3.0.0 - Jun 13, 2018</h2>
+<ul>
+    <li><a href="https://github.com/b3log/symphony/issues/486">486 新的帖子类型：问答帖</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/643">643 细分 401 及 403</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/644">644 去掉签到时间限制</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/646">646 个人设置位置移到隐私中</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/654">654 更新 IP 定位</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/655">655 更新邮箱</a>&nbsp;<span style='background: #84b6eb !important;color:#FFFFFF !important;padding: 1px 4px;'>enhancement</span></li>
+    <li><a href="https://github.com/b3log/symphony/issues/652">652 帖子快链时丢失查询参数</a>&nbsp;<span style='background: #fc2929 !important;color:#FFFFFF !important;padding: 1px 4px;'>bug</span></li>
+</ul>
 <h2>Release 2.8.0 - May 25, 2018</h2>
 <ul>
     <li><a href="https://github.com/b3log/symphony/issues/507">507 清风明月</a>&nbsp;<span style='background: #02e10c !important;color:#FFFFFF !important;padding: 1px 4px;'>feature</span></li>