Merge branch 'master' into dev

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 FleyX
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,6 +1,8 @@
 本项目是一个云书签的项目，取名为：签签世界。
 
-访问地址:[bm.tapme.top](http://bm.tapme.top)
+部署教程：[docker-compose部署](https://github.com/FleyX/bookmark/blob/master/bookMarkDocker/README.md)
+
+demo地址:[bm.tapme.top](http://bm.tapme.top)
 
 web端已经完成。
 

bookMarkDocker/docker-compose.yml

@@ -77,6 +77,8 @@ services:
         cd /opt/app && \
         npm --registry https://registry.npm.taobao.org install && \
         node index.js 8012 123456321
+    ports:
+      - 8012:8012
   bookmark-service:
     image: registry.cn-hangzhou.aliyuncs.com/fleyx/node-java-env:v2
     container_name: bookmark-service
@@ -98,19 +100,18 @@ services:
       - |
         sleep 20 && \
         ls -l && \
-        java -jar -Dspring.profiles.actice=prd \
+        java -jar -Dspring.profiles.active=prd \
-        -DjwtSecret=${JWT_SECRET} \
+        -DjwtSecret='${JWT_SECRET}' \
         -Dmybatis-plus.configuration.log-impl=org.apache.ibatis.logging.nologging.NoLoggingImpl \
         -Dspring.mail.host=${SMTP_HOST} \
-        -Dspring.mail.username=${SMTP_USERNAME} \
+        -Dspring.mail.username='${SMTP_USERNAME}' \
-        -Dspring.mail.password=${SMTP_PASSWORD} \
+        -Dspring.mail.password='${SMTP_PASSWORD}' \
-        -Dspring.datasource.druid.password=${MYSQL_PASSWORD} \
+        -Dspring.datasource.druid.password='${MYSQL_PASSWORD}' \
         -Dspring.datasource.druid.url=jdbc:mysql://bookmark-mysql:3306/bookmark?useUnicode=true\&characterEncoding=utf-8\&useSSL=false\&useJDBCCompliantTimezoneShift=true\&useLegacyDatetimeCode=false\&serverTimezone=UTC \
         -Dspring.redis.host=bookmark-redis \
         -Des.host=bookmark-es \
         -DserviceAddress=${BOOKMARK_HOST} \
         -DfileSavePath=/opt/files \
-        -DserviceAddress=https://bm.tapme.top \
         -Dpinyin.base-url=http://bookmark-pinyin:8012 \
         -Dpinyin.token=123456321 \
         service.jar

bookMarkService/common/pom.xml

@@ -82,7 +82,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.56</version>
+            <version>1.2.70</version>
         </dependency>
 
         <!--减负依赖-->