From d1d49f79733ab818a30545bbf221b6f8ced39a7f Mon Sep 17 00:00:00 2001 From: FleyX Date: Sun, 24 May 2020 10:39:11 +0800 Subject: [PATCH 1/6] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e8f0f03 --- /dev/null +++ b/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. From fda9cb64de51bdb061f42d570bf98fd99f6dc61d Mon Sep 17 00:00:00 2001 From: FleyX Date: Sun, 14 Jun 2020 20:31:07 +0800 Subject: [PATCH 2/6] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad10e9a..489b897 100644 --- a/README.md +++ b/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端已经完成。 From 36e13aaa36d61d2ce90c181fe5c85a463eaf9be8 Mon Sep 17 00:00:00 2001 From: fanxb Date: Mon, 15 Jun 2020 23:30:50 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:fastjson=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E9=81=BF=E5=85=8D=E8=A2=AB=E6=94=BB=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkService/common/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookMarkService/common/pom.xml b/bookMarkService/common/pom.xml index 20ef751..1fc5806 100644 --- a/bookMarkService/common/pom.xml +++ b/bookMarkService/common/pom.xml @@ -82,7 +82,7 @@ com.alibaba fastjson - 1.2.56 + 1.2.70 From fd3538d11f9cd44a979831c42a1d8dbd3530b00d Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 16 Jun 2020 00:06:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/docker-compose.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml index 1e9da7d..c373835 100644 --- a/bookMarkDocker/docker-compose.yml +++ b/bookMarkDocker/docker-compose.yml @@ -99,18 +99,17 @@ services: sleep 20 && \ ls -l && \ java -jar -Dspring.profiles.actice=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.password=${SMTP_PASSWORD} \ - -Dspring.datasource.druid.password=${MYSQL_PASSWORD} \ + -Dspring.mail.username='${SMTP_USERNAME}' \ + -Dspring.mail.password='${SMTP_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 From f3ae2ab5f4dbaf74ea94a820d1580e72c2a44a6a Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 16 Jun 2020 00:33:37 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=AE=BE=E7=BD=AEspr?= =?UTF-8?q?ing.profiles.active=E4=B8=8D=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml index c373835..674ccac 100644 --- a/bookMarkDocker/docker-compose.yml +++ b/bookMarkDocker/docker-compose.yml @@ -98,7 +98,7 @@ services: - | sleep 20 && \ ls -l && \ - java -jar -Dspring.profiles.actice=prd \ + java -jar -Dspring.profiles.active=prd \ -DjwtSecret='${JWT_SECRET}' \ -Dmybatis-plus.configuration.log-impl=org.apache.ibatis.logging.nologging.NoLoggingImpl \ -Dspring.mail.host=${SMTP_HOST} \ From cf42ea4c3ea322a6171b51e04f927d728f2dac08 Mon Sep 17 00:00:00 2001 From: fanxb Date: Mon, 29 Jun 2020 15:00:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?deploy:=E4=BF=AE=E6=94=B9pingyin=E9=83=A8?= =?UTF-8?q?=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookMarkDocker/docker-compose.yml b/bookMarkDocker/docker-compose.yml index 674ccac..6b077f3 100644 --- a/bookMarkDocker/docker-compose.yml +++ b/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