From 7aa7e54a5e38a23d4f67c4627f8a9a86d5e546d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=94=BE=E7=89=9B=E6=9E=81=E5=AE=A2?= Date: Thu, 13 Sep 2018 10:13:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=88=86=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/main/resources/application-dev.properties | 2 +- src/main/resources/application-pro.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ed4cec5..7208e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ target/ tpid *.iml logs +config.json diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 728e756..dd892bc 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ server.port = 8000 #数据库配置 spring.datasource.name = geekcattle -spring.datasource.url = jdbc:mysql://localhost:3306/geekcattle?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url = jdbc:mysql://localhost:3306/geekcattle1.0?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username = root spring.datasource.password = root # Redis数据库索引（默认为0） diff --git a/src/main/resources/application-pro.properties b/src/main/resources/application-pro.properties index 7441008..8f5b83a 100644 --- a/src/main/resources/application-pro.properties +++ b/src/main/resources/application-pro.properties @@ -3,7 +3,7 @@ server.port = 8001 #数据库配置 spring.datasource.name = geekcattle -spring.datasource.url = jdbc:mysql://localhost:3306/geekcattle?useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url = jdbc:mysql://localhost:3306/geekcattle1.0?useUnicode=true&characterEncoding=UTF-8 spring.datasource.username = geekcattle spring.datasource.password = GeekCattle # Redis数据库索引（默认为0） From dbcde3fec44c9d263d10349e3c03747cdd6bc63d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=94=BE=E7=89=9B=E6=9E=81=E5=AE=A2?= Date: Thu, 13 Sep 2018 11:22:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4yml=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.bak.yml | 51 -------------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/main/resources/application.bak.yml diff --git a/src/main/resources/application.bak.yml b/src/main/resources/application.bak.yml deleted file mode 100644 index 97cc5ab..0000000 --- a/src/main/resources/application.bak.yml +++ /dev/null @@ -1,51 +0,0 @@ -server: - port: 8000 - context-path: / - -logging: - level: - tk.mybatis: DEBUG - -spring: - datasource: -# url: jdbc:sqlserver://192.168.16.200:1433;DatabaseName=test -# username: sa -# password: 123456 -# # 浣跨敤druid鏁版嵁婧 -# type: com.alibaba.druid.pool.DruidDataSource -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - name: geekcattle - url: jdbc:mysql://localhost:3306/geekcattle - username: root - password: root - # 浣跨敤druid鏁版嵁婧 - type: com.alibaba.druid.pool.DruidDataSource - driver-class-name: com.mysql.jdbc.Driver - filters: stat - maxActive: 20 - initialSize: 1 - maxWait: 60000 - minIdle: 1 - timeBetweenEvictionRunsMillis: 60000 - minEvictableIdleTimeMillis: 300000 - validationQuery: select 'x' - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - poolPreparedStatements: true - maxOpenPreparedStatements: 20 - mvc: - view: - prefix: classpath:/templates/ - suffix: .html -# freemarker: -# cache: false -# request-context-attribute: request - thymeleaf: - mode: HTML5 - encoding: UTF-8 - content-type: text/html - cache: false - mapper: - plugin: tk.mybatis.mapper.generator.MapperPlugin - Mapper: com.geekcattle.util.CustomerMapperpper