This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 5d92e50f4f fix field-sqlmap.xml database reserved keywords (#6233)
5d92e50f4f is described below
commit 5d92e50f4f568fd034fcf56c659c7e210042b438
Author: L <[email protected]>
AuthorDate: Sat Nov 22 14:52:28 2025 +0800
fix field-sqlmap.xml database reserved keywords (#6233)
* fix field-sqlmap.xml database reserved keywords
* fix field-sqlmap.xml database reserved keywords
* fix field-sqlmap.xml database reserved keywords
* fix field-sqlmap.xml database reserved keywords
* Delete shenyu-examples/pom.xml
* fix
* fix
deleted new dependency
* fix
deleted new dependency
---------
Co-authored-by: aias00 <[email protected]>
---
db/init/mysql/schema.sql | 4 +--
db/init/ob/schema.sql | 4 +--
db/init/og/create-table.sql | 4 +--
db/init/oracle/schema.sql | 4 +--
db/init/pg/create-table.sql | 4 +--
db/upgrade/2.5.0-upgrade-2.5.1-mysql.sql | 4 +--
db/upgrade/2.5.0-upgrade-2.5.1-oracle.sql | 4 +--
db/upgrade/2.5.0-upgrade-2.5.1-pg.sql | 4 +--
.../apache/shenyu/admin/model/entity/FieldDO.java | 32 +++++++++++-----------
.../shenyu/admin/model/entity/ParameterDO.java | 14 +++++-----
.../src/main/resources/mappers/field-sqlmap.xml | 22 +++++++--------
.../main/resources/mappers/parameter-sqlmap.xml | 22 +++++++--------
.../src/main/resources/sql-script/h2/schema.sql | 4 +--
shenyu-examples/pom.xml | 2 --
14 files changed, 63 insertions(+), 65 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 910b8f8a10..c838022633 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -214,7 +214,7 @@ CREATE TABLE `field` (
`self_model_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'which model of this field is',
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT
NULL COMMENT 'field name',
`field_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'field description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields,can store
genericTypes,eg..{"genericTypes":[model_id1,model_id2]}',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
@@ -338,7 +338,7 @@ CREATE TABLE `param` (
`type` int(0) NOT NULL COMMENT
'0-requestPathVariable,1-requestUrlParam,2-requestHeader,3-requestBody,4-responseHeader,5-responseBody',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'the param name',
`param_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the param description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 901d5a30a2..f86b11bcf0 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -214,7 +214,7 @@ CREATE TABLE `field` (
`self_model_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'which model of this field is',
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT
NULL COMMENT 'field name',
`field_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'field description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields,can store
genericTypes,eg..{"genericTypes":[model_id1,model_id2]}',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
@@ -338,7 +338,7 @@ CREATE TABLE `param` (
`type` int(0) NOT NULL COMMENT
'0-requestPathVariable,1-requestUrlParam,2-requestHeader,3-requestBody,4-responseHeader,5-responseBody',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'the param name',
`param_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the param description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 019646bc64..99455e3206 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -253,7 +253,7 @@ CREATE TABLE "public"."field" (
"self_model_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"field_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
@@ -433,7 +433,7 @@ CREATE TABLE "public"."param" (
"type" int4 NOT NULL,
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"param_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 89e42a4e3f..315f754aa7 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -688,7 +688,7 @@ create table param
type NUMBER(10) not null,
name VARCHAR2(255) not null,
param_desc VARCHAR2(1024) not null,
- required NUMBER(3) not null,
+ is_required NUMBER(3) not null,
ext VARCHAR2(1024) not null,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null,
@@ -861,7 +861,7 @@ create table field
self_model_id VARCHAR2(128) not null,
name VARCHAR2(128) not null,
field_desc VARCHAR2(1024) not null,
- required NUMBER(3) not null,
+ is_required NUMBER(3) not null,
ext VARCHAR2(1024) not null,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null,
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 8f9b473ff0..132be93d10 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -250,7 +250,7 @@ CREATE TABLE "public"."field" (
"self_model_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"field_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
@@ -430,7 +430,7 @@ CREATE TABLE "public"."param" (
"type" int4 NOT NULL,
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"param_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
diff --git a/db/upgrade/2.5.0-upgrade-2.5.1-mysql.sql
b/db/upgrade/2.5.0-upgrade-2.5.1-mysql.sql
index f9c9ba9a08..2cfc96e8b5 100644
--- a/db/upgrade/2.5.0-upgrade-2.5.1-mysql.sql
+++ b/db/upgrade/2.5.0-upgrade-2.5.1-mysql.sql
@@ -374,7 +374,7 @@ CREATE TABLE IF NOT EXISTS `param` (
`type` int(0) NOT NULL COMMENT
'0-requestPathVariable,1-requestUrlParam,2-requestHeader,3-requestBody,4-responseHeader,5-responseBody',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the param name',
`param_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the param description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON
UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
@@ -402,7 +402,7 @@ CREATE TABLE IF NOT EXISTS `field` (
`self_model_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'which model of this field is',
`name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT
NULL COMMENT 'field name',
`field_desc` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'field description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extended fields,can store
genericTypes,eg..{"genericTypes":[model_id1,model_id2]}',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON
UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/db/upgrade/2.5.0-upgrade-2.5.1-oracle.sql
b/db/upgrade/2.5.0-upgrade-2.5.1-oracle.sql
index e1701bc74f..ce3b6e398f 100644
--- a/db/upgrade/2.5.0-upgrade-2.5.1-oracle.sql
+++ b/db/upgrade/2.5.0-upgrade-2.5.1-oracle.sql
@@ -511,7 +511,7 @@ create table param
type NUMBER(10) not null,
name VARCHAR2(255) not null,
param_desc VARCHAR2(1024) not null,
- required NUMBER(3) not null,
+ is_required NUMBER(3) not null,
ext VARCHAR2(1024) not null,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null,
@@ -572,7 +572,7 @@ create table field
self_model_id VARCHAR2(128) not null,
name VARCHAR2(128) not null,
field_desc VARCHAR2(1024) not null,
- required NUMBER(3) not null,
+ is_required NUMBER(3) not null,
ext VARCHAR2(1024) not null,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null,
diff --git a/db/upgrade/2.5.0-upgrade-2.5.1-pg.sql
b/db/upgrade/2.5.0-upgrade-2.5.1-pg.sql
index 774cfad9c1..17efe116be 100644
--- a/db/upgrade/2.5.0-upgrade-2.5.1-pg.sql
+++ b/db/upgrade/2.5.0-upgrade-2.5.1-pg.sql
@@ -425,7 +425,7 @@ CREATE TABLE "public"."param" (
"type" int4 NOT NULL,
"name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"param_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
@@ -468,7 +468,7 @@ CREATE TABLE "public"."field" (
"self_model_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"field_desc" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
- "required" int2 NOT NULL,
+ "is_required" int2 NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
index 33dad43735..154db8b089 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/FieldDO.java
@@ -46,9 +46,9 @@ public class FieldDO extends BaseDO {
private String fieldDesc;
/**
- * the required whether to require (0 not required, 1 required).
+ * the is_required whether to require (0 not is_required, 1 is_required).
*/
- private Boolean required;
+ private Boolean isRequired;
/**
* the ext.
@@ -130,19 +130,19 @@ public class FieldDO extends BaseDO {
/**
* getRequired.
*
- * @return required
+ * @return isRequired
*/
public Boolean getRequired() {
- return required;
+ return isRequired;
}
/**
- * set required.
+ * set is_required.
*
- * @param required required
+ * @param isRequired is_required
*/
- public void setRequired(final Boolean required) {
- this.required = required;
+ public void setRequired(final Boolean isRequired) {
+ this.isRequired = isRequired;
}
/**
@@ -179,13 +179,13 @@ public class FieldDO extends BaseDO {
&& Objects.equals(selfModelId, fieldDO.selfModelId)
&& Objects.equals(name, fieldDO.name)
&& Objects.equals(fieldDesc, fieldDO.fieldDesc)
- && Objects.equals(required, fieldDO.required)
+ && Objects.equals(isRequired, fieldDO.isRequired)
&& Objects.equals(ext, fieldDO.ext);
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), modelId, selfModelId, name,
fieldDesc, required, ext);
+ return Objects.hash(super.hashCode(), modelId, selfModelId, name,
fieldDesc, isRequired, ext);
}
/**
@@ -209,7 +209,7 @@ public class FieldDO extends BaseDO {
private String fieldDesc;
- private Boolean required;
+ private Boolean isRequired;
private String ext;
@@ -277,13 +277,13 @@ public class FieldDO extends BaseDO {
}
/**
- * required.
+ * is_required.
*
- * @param required required
+ * @param isRequired is_required
* @return FieldDOBuilder
*/
- public FieldDOBuilder required(final Boolean required) {
- this.required = required;
+ public FieldDOBuilder required(final Boolean isRequired) {
+ this.isRequired = isRequired;
return this;
}
@@ -332,7 +332,7 @@ public class FieldDO extends BaseDO {
fieldDO.setSelfModelId(this.selfModelId);
fieldDO.setName(this.name);
fieldDO.setFieldDesc(this.fieldDesc);
- fieldDO.setRequired(this.required);
+ fieldDO.setRequired(this.isRequired);
fieldDO.setExt(this.ext);
fieldDO.setDateCreated(this.dateCreated);
fieldDO.setDateUpdated(this.dateUpdated);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
index 2915f8f80a..805a617577 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/ParameterDO.java
@@ -54,7 +54,7 @@ public final class ParameterDO extends BaseDO {
/**
* whether to require (0 not required, 1 required).
*/
- private Boolean required;
+ private Boolean isRequired;
/**
* extended fields.
@@ -157,16 +157,16 @@ public final class ParameterDO extends BaseDO {
* @return required
*/
public Boolean getRequired() {
- return required;
+ return isRequired;
}
/**
* set required.
*
- * @param required whether of require
+ * @param isRequired whether of require
*/
- public void setRequired(final Boolean required) {
- this.required = required;
+ public void setRequired(final Boolean isRequired) {
+ this.isRequired = isRequired;
}
/**
@@ -204,13 +204,13 @@ public final class ParameterDO extends BaseDO {
&& Objects.equals(type, parameterDO.type)
&& Objects.equals(name, parameterDO.name)
&& Objects.equals(paramDesc, parameterDO.paramDesc)
- && Objects.equals(required, parameterDO.required)
+ && Objects.equals(isRequired, parameterDO.isRequired)
&& Objects.equals(ext, parameterDO.ext);
}
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), apiId, modelId, type, name,
paramDesc, required, ext);
+ return Objects.hash(super.hashCode(), apiId, modelId, type, name,
paramDesc, isRequired, ext);
}
/**
diff --git a/shenyu-admin/src/main/resources/mappers/field-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/field-sqlmap.xml
index 46bcc97572..891e3f2ea0 100644
--- a/shenyu-admin/src/main/resources/mappers/field-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/field-sqlmap.xml
@@ -25,7 +25,7 @@
<result column="model_id" jdbcType="VARCHAR" property="modelId"/>
<result column="self_model_id" jdbcType="VARCHAR"
property="selfModelId"/>
<result column="field_desc" jdbcType="VARCHAR" property="fieldDesc"/>
- <result column="required" jdbcType="TINYINT" property="required"/>
+ <result column="is_required" jdbcType="TINYINT" property="isRequired"/>
<result column="ext" jdbcType="VARCHAR" property="ext"/>
<result column="date_created" jdbcType="TIMESTAMP"
property="dateCreated"/>
<result column="date_updated" jdbcType="TIMESTAMP"
property="dateUpdated"/>
@@ -37,7 +37,7 @@
model_id,
self_model_id,
field_desc,
- required,
+ is_required,
ext,
date_created,
date_updated
@@ -57,7 +57,7 @@
model_id,
self_model_id,
field_desc,
- required,
+ is_required,
ext,
date_created,
date_updated
@@ -67,7 +67,7 @@
#{modelId, jdbcType=VARCHAR},
#{selfModelId, jdbcType=VARCHAR},
#{fieldDesc, jdbcType=VARCHAR},
- #{required, jdbcType=TINYINT},
+ #{isRequired, jdbcType=TINYINT},
#{ext, jdbcType=VARCHAR},
#{dateCreated,jdbcType=TIMESTAMP},
#{dateUpdated,jdbcType=TIMESTAMP}
@@ -90,8 +90,8 @@
<if test="fieldDesc != null">
field_desc,
</if>
- <if test="required != null">
- required,
+ <if test="isRequired != null">
+ is_required,
</if>
<if test="ext != null">
ext,
@@ -117,8 +117,8 @@
<if test="fieldDesc != null">
#{fieldDesc, jdbcType=VARCHAR},
</if>
- <if test="required != null">
- #{required, jdbcType=TINYINT},
+ <if test="isRequired != null">
+ #{isRequired, jdbcType=TINYINT},
</if>
<if test="ext != null">
#{ext, jdbcType=VARCHAR},
@@ -147,8 +147,8 @@
<if test="fieldDesc != null">
field_desc = #{fieldDesc, jdbcType=VARCHAR},
</if>
- <if test="required != null">
- required = #{required, jdbcType=TINYINT},
+ <if test="isRequired != null">
+ is_required = #{isRequired, jdbcType=TINYINT},
</if>
<if test="ext != null">
ext = #{ext, jdbcType=VARCHAR},
@@ -170,7 +170,7 @@
model_id = #{modelId,jdbcType=VARCHAR},
self_model_id = #{selfModelId,jdbcType=VARCHAR},
field_desc = #{fieldDesc,jdbcType=VARCHAR},
- required = #{required,jdbcType=TINYINT},
+ is_required = #{isRequired,jdbcType=TINYINT},
ext = #{ext,jdbcType=VARCHAR},
date_created = #{dateCreated,jdbcType=TIMESTAMP},
date_updated = #{dateUpdated,jdbcType=TIMESTAMP}
diff --git a/shenyu-admin/src/main/resources/mappers/parameter-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/parameter-sqlmap.xml
index 7c77a7c147..04ad35f20b 100644
--- a/shenyu-admin/src/main/resources/mappers/parameter-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/parameter-sqlmap.xml
@@ -25,7 +25,7 @@
<result column="type" jdbcType="INTEGER" property="type"/>
<result column="name" jdbcType="VARCHAR" property="name"/>
<result column="param_desc" jdbcType="VARCHAR" property="paramDesc"/>
- <result column="required" jdbcType="TINYINT" property="required"/>
+ <result column="is_required" jdbcType="TINYINT" property="isRequired"/>
<result column="ext" jdbcType="VARCHAR" property="ext"/>
<result column="date_created" jdbcType="TIMESTAMP"
property="dateCreated"/>
<result column="date_updated" jdbcType="TIMESTAMP"
property="dateUpdated"/>
@@ -38,7 +38,7 @@
type,
name,
param_desc,
- required,
+ is_required,
ext,
date_created,
date_updated
@@ -59,7 +59,7 @@
type,
name,
param_desc,
- required,
+ is_required,
ext,
date_created,
date_updated)
@@ -70,7 +70,7 @@
#{type, jdbcType=INTEGER},
#{name, jdbcType=VARCHAR},
#{paramDesc, jdbcType=VARCHAR},
- #{required, jdbcType=TINYINT},
+ #{isRequired, jdbcType=TINYINT},
#{ext, jdbcType=VARCHAR},
#{dateCreated,jdbcType=TIMESTAMP},
#{dateUpdated,jdbcType=TIMESTAMP})
@@ -95,8 +95,8 @@
<if test="paramDesc != null">
param_desc,
</if>
- <if test="required != null">
- required,
+ <if test="isRequired != null">
+ is_required,
</if>
<if test="ext != null">
ext,
@@ -125,8 +125,8 @@
<if test="paramDesc != null">
#{paramDesc, jdbcType=VARCHAR},
</if>
- <if test="required != null">
- #{required, jdbcType=TINYINT},
+ <if test="isRequired != null">
+ #{isRequired, jdbcType=TINYINT},
</if>
<if test="ext != null">
#{ext, jdbcType=VARCHAR},
@@ -148,7 +148,7 @@
type = #{type, jdbcType=INTEGER},
name = #{name, jdbcType=VARCHAR},
param_desc = #{paramDesc, jdbcType=VARCHAR},
- required = #{required, jdbcType=TINYINT},
+ is_required = #{isRequired, jdbcType=TINYINT},
ext = #{ext, jdbcType=VARCHAR},
date_created = #{dateCreated,jdbcType=TIMESTAMP},
date_updated = #{dateUpdated,jdbcType=TIMESTAMP}
@@ -173,8 +173,8 @@
<if test="paramDesc != null">
param_desc = #{paramDesc, jdbcType=VARCHAR},
</if>
- <if test="required != null">
- required = #{required, jdbcType=TINYINT},
+ <if test="isRequired != null">
+ is_required = #{isRequired, jdbcType=TINYINT},
</if>
<if test="ext != null">
ext = #{ext, jdbcType=VARCHAR},
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index ad436fa0ce..dc6a0c3854 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -267,7 +267,7 @@ CREATE TABLE IF NOT EXISTS `param` (
`type` int(0) NOT NULL COMMENT
'0-requestPathVariable,1-requestUrlParam,2-requestHeader,3-requestBody,4-responseHeader,5-responseBody',
`name` varchar(255) NOT NULL COMMENT 'the param name',
`param_desc` varchar(1024) NOT NULL COMMENT 'the param description',
- `required` tinyint(4) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(4) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) NOT NULL COMMENT 'extended fields',
`date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT
'create time',
`date_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'update time',
@@ -344,7 +344,7 @@ CREATE TABLE `field` (
`self_model_id` varchar(128) NOT NULL COMMENT 'which model of this field
is',
`name` varchar(128) NOT NULL COMMENT 'field name',
`field_desc` varchar(1024) NOT NULL COMMENT 'field description',
- `required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
+ `is_required` tinyint(0) NOT NULL COMMENT 'whether to require (0 not
required, 1 required)',
`ext` varchar(1024) NOT NULL COMMENT 'extended fields,can store
genericTypes,eg..{"genericTypes":[model_id1,model_id2]}',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON
UPDATE CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/shenyu-examples/pom.xml b/shenyu-examples/pom.xml
index cf56edca27..0b903402dd 100644
--- a/shenyu-examples/pom.xml
+++ b/shenyu-examples/pom.xml
@@ -60,7 +60,6 @@
<module>shenyu-examples-sdk</module>
<module>shenyu-examples-mcp</module>
</modules>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -70,7 +69,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<build>
<plugins>
<plugin>
