From c458676b5626d9c356055140b4a6b8c1c184f105 Mon Sep 17 00:00:00 2001 From: lishangbu Date: Sat, 29 Sep 2018 23:15:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:bookmark:=E5=8F=91=E5=B8=83=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E7=89=88=E6=9C=AC:1.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pigx-config/src/main/resources/config/pigx-codegen-dev.yml | 5 ----- pigx-config/src/main/resources/config/pigx-upms-dev.yml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml index 19fde2cb1..1247ffb3a 100644 --- a/pigx-config/src/main/resources/config/pigx-codegen-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-codegen-dev.yml @@ -19,8 +19,3 @@ spring: date-format: yyyy-MM-dd HH:mm:ss resources: static-locations: classpath:/static/,classpath:/views/ - -# mybaits 模块配置 -mybatis-plus: - typeAliasesPackage: com.pig4cloud.pigx.codegen.entity - diff --git a/pigx-config/src/main/resources/config/pigx-upms-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-dev.yml index bfa68b9c9..7f7c71a9d 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-dev.yml @@ -15,10 +15,6 @@ spring: password: root url: jdbc:mysql://127.0.0.1:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false -# mybaits 模块配置 -mybatis-plus: - typeAliasesPackage: com.pig4cloud.pigx.admin.api.entity - # swagger相关配置,覆盖全局配置 swagger: authorization: From 0e4ad03e989eaee9af6cfbe1bc042f1bf10c25d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 30 Sep 2018 09:41:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'pigx-config/src/main/?= =?UTF-8?q?resources/config/pigx-upms-dev.yml'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit :wrench: 修改配置文件。支持多SQL执行 --- pigx-config/src/main/resources/config/pigx-upms-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pigx-config/src/main/resources/config/pigx-upms-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-dev.yml index 7f7c71a9d..becfc823e 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-dev.yml @@ -13,7 +13,7 @@ spring: driver-class-name: com.mysql.jdbc.Driver username: root password: root - url: jdbc:mysql://127.0.0.1:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/pigx?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true # swagger相关配置,覆盖全局配置 swagger: