From 54c22edd2b3beb2d7a7ae61a83ef7d744c19c514 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 16 Feb 2019 21:15:20 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ .../src/main/resources/templates/props/generator.properties | 2 +- doc/nacos/blade-dev.yaml | 2 +- doc/nacos/blade-prod.yaml | 2 +- doc/nacos/blade-test.yaml | 2 +- pom.xml | 4 ++-- 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6b7fe405..50b98805 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ * 创建多租户模式，发布简单，数据隔离轻松 * 项目分包明确，规范微服务的开发模式 +## 商业授权 +* 您一旦开始复制、下载、安装或者使用本产品，即被视为完全理解并接受本协议的各项条款 +* 更多详情请看：[BladeX商业授权许可协议](https://gitee.ltd/blade/BladeX/src/master/LICENSE) + ## 官网 * 官网地址：[https://bladex.vip](https://bladex.vip) diff --git a/blade-ops/blade-develop/src/main/resources/templates/props/generator.properties b/blade-ops/blade-develop/src/main/resources/templates/props/generator.properties index 89b298c0..2f9caa73 100644 --- a/blade-ops/blade-develop/src/main/resources/templates/props/generator.properties +++ b/blade-ops/blade-develop/src/main/resources/templates/props/generator.properties @@ -1,5 +1,5 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false +spring.datasource.url=jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&serverTimezone=GMT%2B8 spring.datasource.username=root spring.datasource.password=root author=BladeX diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index 15735267..42aa8616 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -17,6 +17,6 @@ blade: #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: dev: - url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root password: root diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 82ae8c61..3f3985a2 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -17,6 +17,6 @@ blade: #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: prod: - url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true + url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root password: root diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index 861cca81..7c7f4fc2 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -17,6 +17,6 @@ blade: #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: test: - url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true + url: jdbc:mysql://192.168.186.129:3306/bladex?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8 username: root password: root diff --git a/pom.xml b/pom.xml index eb2f6641..21f23f65 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom - 2.0.0.RC1 + 2.0.0.RC2 2.0.0.RC1 1.8 @@ -20,7 +20,7 @@ 4.0.1 1.6.0 0.2.1.RELEASE - 2.0.2 + 2.1.2 2.1.2.RELEASE Greenwich.RELEASE