升级2.1.5.RELEASE版本

Author: hengboy

api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java

@@ -45,7 +45,7 @@ public class SwaggerProperties {
     /**
      * 文档版本号
      */
-    private String version = "2.1.4-SNAPSHOT";
+    private String version = "2.1.5.RELEASE";
     /**
      * 文档版权
      */

api-boot-project/api-boot-autoconfigure/src/main/resources/banner.txt

@@ -6,4 +6,4 @@
          |
          '
 :: Based On SpringBoot Version : ${spring-boot.formatted-version} ::
-:: ApiBoot Version : v2.1.5-SNAPSHOT ::
+:: ApiBoot Version : v2.1.5.RELEASE ::

api-boot-project/api-boot-plugins/api-boot-plugin-security/src/main/java/org/minbox/framework/api/boot/plugin/security/ApiBootWebSecurityConfiguration.java

@@ -40,10 +40,9 @@ protected List<String> configureIgnoreUrls() {
      * 排除安全拦截swagger、actuator等路径
      *
      * @param web web安全构建对象
-     * @throws Exception 异常信息
      */
     @Override
-    public void configure(WebSecurity web) throws Exception {
+    public void configure(WebSecurity web) {
         WebSecurity.IgnoredRequestConfigurer ignoredRequestConfigurer = web.ignoring();
         configureIgnoreUrls().stream().forEach(url -> ignoredRequestConfigurer.antMatchers(url));
     }

api-boot-samples/api-boot-sample-alibaba-oss/pom.xml

@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.4-SNAPSHOT</version>
+                <version>2.1.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

api-boot-samples/api-boot-sample-alibaba-oss/src/main/resources/application.yml

@@ -7,10 +7,10 @@ api:
       # oss存储地域
       region: beijing
       # id
-      access-key-id: xxxx
+      access-key-id: LTAIf7S3Ph6u5tV9
       # secret
-      access-key-secret: xxxx
+      access-key-secret: LgFCl1uXjCqIkmvopG7skRfiaY2BA6
       # 存储空间名称
-      bucket-name: xxx
+      bucket-name: chapter-video
       # oss所绑定的域名ApiBootDataSource
-      #domain: http://xxx.xxx.xx
+      domain: http://study.yuqiyu.com

api-boot-samples/api-boot-sample-alibaba-oss/src/test/java/org/minbox/framework/api/boot/sample/ApiBootOssTest.java

@@ -58,7 +58,7 @@ public void uploadBytes() {
      */
     @Test
     public void uploadFile() {
-        ApiBootObjectStorageResponse response = apiBootOssService.upload("11.png", "/Users/yuqiyu/Downloads/logo.png");
+        ApiBootObjectStorageResponse response = apiBootOssService.upload("ApiBoot Security Oauth内存方式集成.mp4", "/Users/yuqiyu/Movies/ApiBoot/ApiBoot Security Oauth内存方式集成.mp4");
         logger.info("文件名称：{}", response.getObjectName());
         logger.info("文件访问路径：{}", response.getObjectUrl());
     }
@@ -70,8 +70,8 @@ public void uploadFile() {
      */
     @Test
     public void uploadInputStream() throws Exception {
-        FileInputStream inputStream = new FileInputStream(new File("/Users/yuqiyu/Downloads/logo.png"));
-        ApiBootObjectStorageResponse response = apiBootOssService.upload("测试.png", inputStream);
+        FileInputStream inputStream = new FileInputStream(new File("/Users/yuqiyu/Downloads/update-release-v10102.apk"));
+        ApiBootObjectStorageResponse response = apiBootOssService.upload("update-release-v10102.apk", inputStream);
         logger.info("文件名称：{}", response.getObjectName());
         logger.info("文件访问路径：{}", response.getObjectUrl());
     }

api-boot-samples/api-boot-sample-alibaba-sms/pom.xml

@@ -31,7 +31,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.4-SNAPSHOT</version>
+                <version>2.1.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

api-boot-samples/api-boot-sample-datasource-switch/pom.xml

@@ -46,7 +46,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.1.4-SNAPSHOT</version>
+                <version>2.1.5.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

api-boot-samples/api-boot-sample-datasource-switch/src/main/java/org/minbox/framework/api/boot/sample/SwitchController.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright [2019] [恒宇少年 - 于起宇]
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ *
+ */
+
+package org.minbox.framework.api.boot.sample;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author 恒宇少年
+ */
+@RestController
+@RequestMapping(value = "/switch")
+public class SwitchController {
+    @Autowired
+    private MasterDataSourceSampleService masterDataSourceSampleService;
+
+    @GetMapping
+    public String print() throws Exception {
+        masterDataSourceSampleService.print();
+        return "success";
+    }
+}

api-boot-samples/api-boot-sample-datasource-switch/src/main/resources/application.yml

@@ -17,11 +17,11 @@ api:
           #driver-class-name: com.mysql.cj.jdbc.Driver
         # slave 1
         slave_1:
-          url: jdbc:mysql://localhost:3306/oauth2?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://localhost:3306/iot-oauth?characterEncoding=utf8&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
         # slave 2
         slave_2:
-          url: jdbc:mysql://localhost:3306/resources?characterEncoding=utf8&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://localhost:3306/iot-logging?characterEncoding=utf8&serverTimezone=Asia/Shanghai
           username: root
           password: 123456