Merge branch 'dev'

Former-commit-id: 988e9f7bf21d9e11a1956f6c853d4b10258dca6c

Author: geekidea

README.md

@@ -1,3 +1,22 @@
+<p align="center">
+  <a href="https://github.com/geekidea/spring-boot-plus">
+   <img alt="spring-boot-plus logo" src="https://raw.githubusercontent.com/geekidea/spring-boot-plus/dev/docs/img/logo.png">
+  </a>
+</p>
+<p align="center">
+  Everyone can develop projects independently, quickly and efficiently！
+</p>
+
+<p align="center">
+  <a href="https://github.com/geekidea/spring-boot-plus/">
+    <img alt="Latest version" src="https://img.shields.io/badge/version-1.1.0--RELEASE-blue">
+  </a>
+
+  <a href="https://www.apache.org/licenses/LICENSE-2.0">
+    <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
+  </a>
+</p>
+<p>&nbsp;</p>
 ## Introduction
 
 ### spring-boot-plus是一套集成spring boot常用开发组件的后台快速开发框架

docs/db/spring_boot_plus.sql

@@ -1,22 +1,19 @@
 /*
- Navicat Premium Data Transfer
-
- Source Server         : mysql-localhost
- Source Server Type    : MySQL
- Source Server Version : 50727
- Source Host           : localhost:3306
- Source Schema         : spring_boot_plus
-
- Target Server Type    : MySQL
- Target Server Version : 50727
- File Encoding         : 65001
-
- Date: 24/07/2019 16:25:18
+ * Copyright 2019-2029 geekidea(https://github.com/geekidea)
+ *
+ * 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.
 */
 
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
 -- ----------------------------
 -- Table structure for ip
 -- ----------------------------
@@ -52,11 +49,3 @@ INSERT INTO `sys_log` VALUES (1060438746056376321, 0, 'A', 100000, '2018-11-08 1
 INSERT INTO `sys_log` VALUES (1060438788502732802, 0, 'B', 100000, '2018-11-08 15:42:08');
 INSERT INTO `sys_log` VALUES (1060438799600861185, 0, 'C', 100000, '2018-11-08 15:42:10');
 INSERT INTO `sys_log` VALUES (1060438809495224322, 0, 'D', 100000, '2018-11-08 15:42:13');
-INSERT INTO `sys_log` VALUES (1060438823319650306, 0, 'E', 100000, '2018-11-08 15:42:16');
-INSERT INTO `sys_log` VALUES (1060438833750884353, 0, 'F', 100000, '2018-11-08 15:42:18');
-INSERT INTO `sys_log` VALUES (1060439062743166977, 0, '1111111111', 100000, '2018-11-08 15:43:13');
-INSERT INTO `sys_log` VALUES (1060439085228830721, 1, 'test redis lock ffbb79f6-9efe-4608-b204-fde5279b107f', 100000, '2018-11-16 16:46:35');
-INSERT INTO `sys_log` VALUES (1068528405778444290, NULL, NULL, NULL, '2018-11-30 23:33:21');
-INSERT INTO `sys_log` VALUES (1068528405778444291, NULL, NULL, NULL, '2018-11-30 23:33:21');
-
-SET FOREIGN_KEY_CHECKS = 1;

docs/img/logo.png

@@ -1,5 +1,5 @@
 springbootplus:
-  isEnableAnsi: false
+  isEnableAnsi: true
   login:
     token:
       valid:
@@ -9,14 +9,16 @@ springbootplus:
 server:
   port: 8888
   servlet:
-    context-path: /api
+    context-path: /
 spring:
   datasource:
-    password: ''
-    url: ''
-    username: ''
+    url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: root
+    password: root
+
   redis:
     database: 0
-    host: ''
-    password: ''
+    host: localhost
+    password:
     port: 6379
+

docs/spring-boot-plus-qq-group.png renamed to docs/img/spring-boot-plus-qq-group.png

@@ -14,7 +14,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: rootroot
+    password: root
 
   redis:
     database: 0