From 50e76cd7cb357d2af523445ee8136c126f2ffbf6 Mon Sep 17 00:00:00 2001 From: jeesun Date: Fri, 9 Aug 2019 13:50:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=94=9F=E6=88=90=E9=A1=B5=E9=9D=A2=EF=BC=8CUI?= =?UTF-8?q?=E4=B8=BA=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/vue/table/code_generate.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/src/main/resources/templates/vue/table/code_generate.html b/web/src/main/resources/templates/vue/table/code_generate.html index f82f2ba..53780e0 100644 --- a/web/src/main/resources/templates/vue/table/code_generate.html +++ b/web/src/main/resources/templates/vue/table/code_generate.html @@ -208,11 +208,13 @@ this.$refs[formName].validate((valid) => { if (valid) { // 遍历ruleForm.columns，如果是uiType是Select选择器，extraInfo必须有值。 - for(let i = 0, len = this.ruleForm.columns.length; i < len; i++) { - if (this.ruleForm.columns[i].uiType === 'Select' && !this.ruleForm.columns[i].extraInfo) { - parent.closeLoading(); - this.$message.error(this.ruleForm.columns[i].name + "属性UI是选择器，但未设置选择器数据"); - return false; + if (this.ruleForm.genModules.join(",").indexOf("controllerAndPage") >= 0) { + for(let i = 0, len = this.ruleForm.columns.length; i < len; i++) { + if (this.ruleForm.columns[i].uiType === 'Select' && !this.ruleForm.columns[i].extraInfo) { + parent.closeLoading(); + this.$message.error(this.ruleForm.columns[i].name + "属性UI是选择器，但未设置选择器数据"); + return false; + } } } this.$http.post(requestUrls.url, this.ruleForm).then((response) => { -- Gitee From 6b4381f5d11fac4872a4d06fb4af53eeee51cb41 Mon Sep 17 00:00:00 2001 From: jeesun Date: Tue, 13 Aug 2019 11:22:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=97=B6=EF=BC=8Csql=20server=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=87=E5=AE=9A=E8=A1=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- common/src/main/java/com/simon/common/utils/DbUtil.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4c4ec67..0fe3395 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ oauthserver是一个基于Spring Boot Oauth2的完整的独立的Oauth2 Server - MySQL - Oracle - PostgreSQL -- SQL Server +- Microsoft SQL Server ## 功能概览 ### api @@ -97,7 +97,7 @@ IntelliJ IDEA或Eclipse请先安装lombok插件。 连接信息在`application-oracle.yml`里。修改完数据库连接信息后，还需要设置`application-common.yml`的`spring.profiles.active=oracle`。 - PostgreSQL 连接信息在`application-pg.yml`里。修改完数据库连接信息后，还需要设置`application-common.yml`的`spring.profiles.active=pg`。 -- SQL Server +- Microsoft SQL Server 连接信息在`application-sqlserver.yml`里。修改完数据库连接信息后，还需要设置`application-common.yml`的`spring.profiles.active=sqlserver`。 ### 4. 运行 现在，一切已准备就绪。运行项目，当程序成功启动时，即表明你已配置成功。 diff --git a/common/src/main/java/com/simon/common/utils/DbUtil.java b/common/src/main/java/com/simon/common/utils/DbUtil.java index 7859e05..7e711b3 100644 --- a/common/src/main/java/com/simon/common/utils/DbUtil.java +++ b/common/src/main/java/com/simon/common/utils/DbUtil.java @@ -374,7 +374,7 @@ public class DbUtil { "\t\tAND a.colid = g.minor_id \n" + "\t) t \n" + "WHERE\n" + - "\tTABLE_NAME LIKE '%" + tableName + "%'"; + "\tTABLE_NAME = '" + tableName + "'"; } else { throw new Exception("暂不支持其他数据库"); } -- Gitee