This is an automated email from the ASF dual-hosted git repository.
likeguo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new fb70fe312 [type: fix] ci error (#3421)
fb70fe312 is described below
commit fb70fe312e011a57e886cd1ee8d8fa4574f27f55
Author: xiaoyu <[email protected]>
AuthorDate: Sat May 21 18:57:12 2022 +0800
[type: fix] ci error (#3421)
* [type: fix] ci error
* [type: fix] ci error
* [type: fix] ci error
* [type: fix] ci error
---
.../src/main/java/org/apache/shenyu/admin/aspect/PageableAspect.java | 1 +
shenyu-admin/src/main/resources/mappers/app-auth-sqlmap.xml | 1 -
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 5 ++---
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/aspect/PageableAspect.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/aspect/PageableAspect.java
index 8ac23f0a1..b441a8112 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/aspect/PageableAspect.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/aspect/PageableAspect.java
@@ -68,6 +68,7 @@ public class PageableAspect {
commonPager.setPage(result);
return proceed;
} catch (Throwable throwable) {
+ PageMethod.clearPage();
throw new ShenyuException(throwable);
}
// CHECKSTYLE:ON
diff --git a/shenyu-admin/src/main/resources/mappers/app-auth-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/app-auth-sqlmap.xml
index f4679e813..ea2173a91 100644
--- a/shenyu-admin/src/main/resources/mappers/app-auth-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/app-auth-sqlmap.xml
@@ -78,7 +78,6 @@
<include refid="Base_Column_List"/>
FROM app_auth
WHERE app_key = #{appKey, jdbcType=VARCHAR}
- LIMIT 1
</select>
<select id="selectByQuery"
parameterType="org.apache.shenyu.admin.model.query.AppAuthQuery"
resultMap="BaseResultMap">
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 1031393de..6acac527f 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -264,9 +264,8 @@ CREATE TABLE IF NOT EXISTS `alert_template`
`name` varchar(255) NOT NULL COMMENT 'alert template name',
`strategy_name` varchar(255) NOT NULL COMMENT 'alert template strategy
name',
`content` varchar(1000) NOT NULL COMMENT 'alert template content',
- `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',
- PRIMARY KEY (`id`) USING BTREE
+ `date_created` timestamp NOT NULL DEFAULT now() COMMENT 'create
time',
+ `date_updated` timestamp NOT NULL DEFAULT now() COMMENT 'update
time'
);
/**default admin user**/
