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

README.md

@@ -95,11 +95,6 @@ docker pull b3log/solo
 ```
 
 * 使用 MySQL
-  TBD
-  ```shell
-  docker run --name solo -p 8080:8080 --net=host -d b3log/solo
-  ```
-* 使用 H2 Databse
 
   ```shell
   docker run --detach --name solo --network=host \
@@ -110,7 +105,27 @@ docker pull b3log/solo
       --env JDBC_URL="jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC" \
       b3log/solo --listen_port=8080 --server_scheme=http --server_host=localhost 
   ```
+  为了简单，使用了主机网络模式来连接主机上的 MySQL。
+  
+* 使用 H2 Databse
+
+  ```shell
+  docker run --detach --name solo --volume ~/solo_h2/:/opt/solo/h2/ --publish 8080:8080 \
+      --env RUNTIME_DB="H2" \
+      --env JDBC_USERNAME="root" \
+      --env JDBC_PASSWORD="123456" \
+      --env JDBC_DRIVER="org.h2.Driver" \
+      --env JDBC_URL="jdbc:h2:/opt/solo/h2/db;MODE=MYSQL" \
+      b3log/solo --listen_port=8080 --server_scheme=http --server_host=localhost 
+  ```
+
+启动参数说明：
+
+* `--listen_port`：进程监听端口
+* `--server_scheme`：最终访问协议，如果反代服务启用了 HTTPS 这里也需要改为 `https`
+* `--server_host`：最终访问域名或 IP，不要带端口号，如果是 IP 的话请用公网 IP
 
+完整启动参数的说明可以使用 `-h` 来查看。
 
 ## 文档
 

src/main/java/org/b3log/solo/service/ImportService.java

@@ -21,7 +21,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
 import org.b3log.latke.Keys;
-import org.b3log.latke.Latkes;
 import org.b3log.latke.ioc.Inject;
 import org.b3log.latke.logging.Level;
 import org.b3log.latke.logging.Logger;
@@ -40,7 +39,7 @@ import java.util.*;
  * Import service.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.4, Mar 17, 2019
+ * @version 1.0.1.5, Mar 20, 2019
  * @since 2.2.0
  */
 @Service
@@ -89,12 +88,6 @@ public class ImportService {
                 return;
             }
 
-            String serverHost = Latkes.getLatkeProperty("serverHost");
-            if (StringUtils.isBlank(serverHost)) {
-                serverHost = "localhost";
-                Latkes.setLatkeProperty("serverHost", serverHost);
-            }
-
             final String adminId = admin.optString(Keys.OBJECT_ID);
 
             int succCnt = 0, failCnt = 0;
@@ -146,9 +139,6 @@ public class ImportService {
                 logBuilder.append(" :p");
             }
             LOGGER.info(logBuilder.toString());
-
-            LOGGER.log(Level.INFO, "Imported articles, please restart Solo");
-            System.exit(0);
         }).start();
     }
 

src/main/java/org/b3log/solo/upgrade/V300_310.java

@@ -41,7 +41,7 @@ import java.util.List;
  * Upgrade script from v3.0.0 to v3.1.0.
  *
  * @author <a href="http://88250.b3log.org">Liang Ding</a>
- * @version 1.0.1.0, Mar 4, 2019
+ * @version 1.0.1.1, Mar 20, 2019
  * @since 3.1.0
  */
 public final class V300_310 {
@@ -63,12 +63,6 @@ public final class V300_310 {
         final OptionRepository optionRepository = beanManager.getReference(OptionRepository.class);
         final ArticleRepository articleRepository = beanManager.getReference(ArticleRepository.class);
 
-        String serverHost = Latkes.getLatkeProperty("serverHost");
-        if (StringUtils.isBlank(serverHost)) {
-            serverHost = "localhost";
-            Latkes.setLatkeProperty("serverHost", serverHost);
-        }
-
         try {
             Connection connection = Connections.getConnection();
             Statement statement = connection.createStatement();
@@ -107,9 +101,6 @@ public final class V300_310 {
             }
 
             transaction.commit();
-
-            LOGGER.log(Level.INFO, "Upgraded from version [3.0.0] to version [3.1.0] successfully, please restart Solo");
-            System.exit(0);
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Upgrade failed!", e);