🎨 #12690

Dockerfile

@@ -6,7 +6,7 @@ ADD . /tmp
 
 RUN cd /tmp && mvn install -DskipTests -Pci && mv target/solo/* /opt/b3log/solo/ \
     && mkdir -p /opt/b3log/backup/ && mkdir -p /opt/b3log/tmp/ \
-    && rm -rf /opt/b3log/solo/WEB-INF/classes/local.properties /opt/b3log/solo/WEB-INF/classes/mail.properties /opt/b3log/solo/WEB-INF/classes/latke.properties \
+    && rm -rf /opt/b3log/solo/WEB-INF/classes/local.properties /opt/b3log/solo/WEB-INF/classes/latke.properties \
     && rm -rf /tmp/* && rm -rf ~/.m2
 
 ADD ./src/main/resources/docker/entrypoint.sh $WORKDIR

src/main/resources/docker/entrypoint.sh

@@ -41,13 +41,6 @@ if [ ! -f "/opt/b3log/solo/WEB-INF/classes/local.properties" ]; then
      -e "s|{{SERVER_PORT}}|${SERVER_PORT:-8080}|g" \
     > /opt/b3log/solo/WEB-INF/classes/latke.properties
 
-    cat /opt/b3log/tmp/mail.properties | sed \
-     -e "s|{{EMAIL_ADDRESS}}|${EMAIL_ADDRESS}|g" \
-     -e "s|{{EMAIL_PASSWORD}}|${EMAIL_PASSWORD}|g" \
-     -e "s|{{SMTP_HOST}}|${SMTP_HOST:-smtp.gmail.com}|g" \
-     -e "s|{{SMTP_PROT}}|${SMTP_PROT:-587}|g" \
-     -e "s|{{SMTP_SOCKETFACTORY_PORT}}|${SMTP_SOCKETFACTORY_PORT:-465}|g" \
-    > /opt/b3log/solo/WEB-INF/classes/mail.properties
     rm -rf /opt/b3log/tmp
 fi
 

src/main/resources/docker/mail.properties

-#
-# Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
-#
-# 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/>.
-#
-
-#
-# Description: Solo mail configurations.
-# Version: 1.0.0.4, Jul 19, 2017
-# Author: Liang Ding
-#
-
-mail.user={{EMAIL_ADDRESS}}
-mail.password={{EMAIL_PASSWORD}}
-mail.debug=false
-mail.smtp.host={{SMTP_HOST}}
-mail.smtp.port={{SMTP_PROT}}
-mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-mail.smtp.socketFactory.fallback=false
-mail.smtp.socketFactory.port={{SMTP_SOCKETFACTORY_PORT}}

src/main/resources/lang_en_US.properties

@@ -367,7 +367,6 @@ blogArticleEmptyLabel=Please select articles
 notAllowCommentLabel=Not allow comment!
 nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long.
 categoryTooLongLabel=Sorry, category name must be between 2 and 32 characters long.
-mailCannotEmptyLabel=Mail is empty
 urlInvalidLabel=URL is invalid
 nonNegativeIntegerOnlyLabel=Non-Negative integer only
 commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long.

src/main/resources/lang_zh_CN.properties

@@ -367,7 +367,6 @@ blogArticleEmptyLabel=\u8BF7\u9009\u62E9\u9700\u8981\u5BFC\u5165\u7684\u6587\u7A
 notAllowCommentLabel=\u4E0D\u5141\u8BB8\u8BC4\u8BBA\uFF01
 nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01
 categoryTooLongLabel=\u5206\u7C7B\u540D\u79F0\u53EA\u80FD\u4E3A 2 \u5230 32 \u4E2A\u5B57\u7B26\uFF01
-mailCannotEmptyLabel=\u90AE\u7BB1\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 urlInvalidLabel=\u94FE\u63A5\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01
 nonNegativeIntegerOnlyLabel=\u53EA\u80FD\u4E3A\u975E\u8D1F\u6574\u6570\uFF01
 commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01

src/main/resources/mail.properties

-#
-# Solo - A small and beautiful blogging system written in Java.
-# Copyright (c) 2010-2019, b3log.org & hacpai.com
-#
-# 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/>.
-#
-
-#
-# Description: Solo mail configurations.
-# Version: 1.0.0.6, Jan 18, 2019
-# Author: Liang Ding
-#
-
-mail.user=
-mail.password=
-mail.debug=false
-mail.smtp.host=smtp.qq.com
-mail.smtp.port=465
-mail.smtp.socketFactory.class=javax.net.ssl.SSLSocketFactory
-mail.smtp.socketFactory.fallback=false
-mail.smtp.socketFactory.port=465
-mail.smtp.auth=true
-mail.smtp.starttls.enable=true
\ No newline at end of file

src/main/resources/repository.json

@@ -132,12 +132,6 @@
           "description": "评论时间戳",
           "type": "long"
         },
-        {
-          "name": "commentEmail",
-          "description": "评论人邮箱",
-          "type": "String",
-          "length": 255
-        },
         {
           "name": "commentName",
           "description": "评论人名称",
@@ -383,12 +377,6 @@
           "type": "String",
           "length": 19
         },
-        {
-          "name": "userEmail",
-          "description": "用户邮箱",
-          "type": "String",
-          "length": 255
-        },
         {
           "name": "userName",
           "description": "用户名",

src/main/webapp/admin/admin-label.ftl

@@ -79,7 +79,6 @@
         "statusLabel": "${statusLabel}",
         "versionLabel": "${versionLabel}",
         "userNameLabel": "${userNameLabel}",
-        "commentEmailLabel": "${commentEmailLabel}",
         "roleLabel": "${roleLabel}",
         "administratorLabel": "${administratorLabel}",
         "noSettingLabel": "${noSettingLabel}",