From f566a198449100a683bfa28969f2b4e20b3f7d74 Mon Sep 17 00:00:00 2001 From: Menethil Date: Sun, 15 Jul 2018 20:37:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 30 +++++++++++++++++++ .../src/main/resources/notify.properties | 16 +++++----- 2 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..7a8f6f10 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +stages: + - deploy +deploy: + stage: deploy + script: + - mvn install + - mvn clean package + - rm -rf /root/spring_boot/*.jar + - rm -rf /etc/init.d/litemall-* + - cp -rf litemall-admin-api/target/litemall-admin-api-*-exec.jar /root/spring_boot/litemall-admin-api.jar + - cp -rf litemall-os-api/target/litemall-os-api-*-exec.jar /root/spring_boot/litemall-os-api.jar + - cp -rf litemall-wx-api/target/litemall-wx-api-*-exec.jar /root/spring_boot/litemall-wx-api.jar + - sudo chmod 777 /root/spring_boot/*.jar + - sudo ln -f -s /root/spring_boot/litemall-admin-api.jar /etc/init.d/litemall-admin-api + - sudo ln -f -s /root/spring_boot/litemall-os-api.jar /etc/init.d/litemall-os-api + - sudo ln -f -s /root/spring_boot/litemall-wx-api.jar /etc/init.d/litemall-wx-api + - sudo /etc/init.d/litemall-os-api restart + - sudo /etc/init.d/litemall-wx-api restart + - sudo /etc/init.d/litemall-admin-api restart + - systemctl stop nginx + - rm -rf /root/nginx_web/ + - cd litemall-admin + - cnpm install + - cnpm run build:dep + - mkdir /root/nginx_web + - cp -rf dist/* /root/nginx_web + - sudo chmod 777 /root/nginx_web + - systemctl restart nginx + tags: + - litemall_dev \ No newline at end of file diff --git a/litemall-core/src/main/resources/notify.properties b/litemall-core/src/main/resources/notify.properties index 9579ab7a..afbcaa72 100644 --- a/litemall-core/src/main/resources/notify.properties +++ b/litemall-core/src/main/resources/notify.properties @@ -1,16 +1,16 @@ #\u90AE\u4EF6\u53D1\u9001\u914D\u7F6E -sprint.mail.enable=false +sprint.mail.enable=true spring.mail.host=smtp.exmail.qq.com -spring.mail.username=ex@ex.com.cn -spring.mail.password= -spring.mail.sendto=ex@qq.com +spring.mail.username=menethil@menethil.com.cn +spring.mail.password=VFmZa5zobguGYAXu +spring.mail.sendto=24220394@qq.com #\u77ED\u4FE1\u53D1\u9001\u914D\u7F6E -spring.sms.enable=false -spring.sms.appid= -spring.sms.appkey= -spring.sms.sign= +spring.sms.enable=true +spring.sms.appid=1400111512 +spring.sms.appkey=86b445ba63f211be474d73d9f67ac3f4 +spring.sms.sign=\u53A6\u95E8\u946B\u9F0E\u4FE1 #\u77ED\u4FE1\u6A21\u7248\u6D88\u606F\u914D\u7F6E\uFF0C\u8BF7\u5728\u817E\u8BAF\u77ED\u4FE1\u5E73\u53F0\u914D\u7F6E\u597D\u5404\u4E2A\u901A\u77E5\u6D88\u606F\u7684\u6A21\u7248\uFF0C\u7136\u540E\u5C06\u6A21\u7248ID\u4E00\u4E00\u8D4B\u503C,LitemallNotifyService,NotifyType\u679A\u4E3E\u4E2D\u4E0E\u8FD9\u91CC\u4E00\u4E00\u5BF9\u5E94 spring.sms.template.pay.complated=156349