Skip to content

Commit aa4662e

Browse files
author
geekidea
committed
dev与local配置文件同步
Former-commit-id: 6c9497e49cf70a7ce2f2f09ee8a05eed98ce3fa3
1 parent 8ac50b3 commit aa4662e

File tree

3 files changed

+23
-32
lines changed

3 files changed

+23
-32
lines changed

docs/db/spring_boot_plus.sql

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
/*
2-
Navicat Premium Data Transfer
3-
4-
Source Server : mysql-localhost
5-
Source Server Type : MySQL
6-
Source Server Version : 50727
7-
Source Host : localhost:3306
8-
Source Schema : spring_boot_plus
9-
10-
Target Server Type : MySQL
11-
Target Server Version : 50727
12-
File Encoding : 65001
13-
14-
Date: 24/07/2019 16:25:18
2+
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1515
*/
1616

17-
SET NAMES utf8mb4;
18-
SET FOREIGN_KEY_CHECKS = 0;
19-
2017
-- ----------------------------
2118
-- Table structure for ip
2219
-- ----------------------------
@@ -52,11 +49,3 @@ INSERT INTO `sys_log` VALUES (1060438746056376321, 0, 'A', 100000, '2018-11-08 1
5249
INSERT INTO `sys_log` VALUES (1060438788502732802, 0, 'B', 100000, '2018-11-08 15:42:08');
5350
INSERT INTO `sys_log` VALUES (1060438799600861185, 0, 'C', 100000, '2018-11-08 15:42:10');
5451
INSERT INTO `sys_log` VALUES (1060438809495224322, 0, 'D', 100000, '2018-11-08 15:42:13');
55-
INSERT INTO `sys_log` VALUES (1060438823319650306, 0, 'E', 100000, '2018-11-08 15:42:16');
56-
INSERT INTO `sys_log` VALUES (1060438833750884353, 0, 'F', 100000, '2018-11-08 15:42:18');
57-
INSERT INTO `sys_log` VALUES (1060439062743166977, 0, '1111111111', 100000, '2018-11-08 15:43:13');
58-
INSERT INTO `sys_log` VALUES (1060439085228830721, 1, 'test redis lock ffbb79f6-9efe-4608-b204-fde5279b107f', 100000, '2018-11-16 16:46:35');
59-
INSERT INTO `sys_log` VALUES (1068528405778444290, NULL, NULL, NULL, '2018-11-30 23:33:21');
60-
INSERT INTO `sys_log` VALUES (1068528405778444291, NULL, NULL, NULL, '2018-11-30 23:33:21');
61-
62-
SET FOREIGN_KEY_CHECKS = 1;
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
springbootplus:
2-
isEnableAnsi: false
2+
isEnableAnsi: true
33
login:
44
token:
55
valid:
@@ -9,14 +9,16 @@ springbootplus:
99
server:
1010
port: 8888
1111
servlet:
12-
context-path: /api
12+
context-path: /
1313
spring:
1414
datasource:
15-
password: ''
16-
url: ''
17-
username: ''
15+
url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
16+
username: root
17+
password: root
18+
1819
redis:
1920
database: 0
20-
host: ''
21-
password: ''
21+
host: localhost
22+
password:
2223
port: 6379
24+

src/main/resources/config/application-local.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spring:
1414
datasource:
1515
url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
1616
username: root
17-
password: rootroot
17+
password: root
1818

1919
redis:
2020
database: 0

0 commit comments

Comments
 (0)