This is an automated email from the ASF dual-hosted git repository.
hefengen 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 878a9570a4 [type:fix] check sql #5512 (#5565)
878a9570a4 is described below
commit 878a9570a4832409d71905ab9f2c8dd7cce4f2d3
Author: aias00 <[email protected]>
AuthorDate: Mon May 20 23:28:15 2024 +0800
[type:fix] check sql #5512 (#5565)
* check sql #5512
* check sql #5512
* check sql #5512
* check sql #5512
* check sql #5512
---
shenyu-admin/src/main/resources/sql-script/h2/schema.sql | 2 +-
.../java/org/apache/shenyu/common/constant/DefaultPathConstants.java | 3 ++-
.../src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java | 1 +
.../shenyu-examples-apache-dubbo-service-xml/Dockerfile | 2 +-
.../shenyu-examples-apache-dubbo-service/Dockerfile | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
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 7714667d6b..385574888b 100755
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -825,7 +825,7 @@ INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172895', '38', 'password', 'password', 2, 3, 7,
'{"required":"1","defaultValue":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172896', '38', 'engine', 'engine', 3, 3, 8,
'{"required":"0","defaultValue":"MergeTree"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172897', '38', 'clusterName', 'clusterName', 3, 3, 9,
'{"required":"1","defaultValue":"cluster"}');
-
+INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1529402613204172777', '38', 'ttl', 'ttl', 3, 3, 10,
'{\"required\":\"0\",\"defaultValue\":\"30\"}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570590990341775360', '39', 'endpoint', 'casdoor endpoint', 2, 3, 0,
'{"required":"1","rule":""}');
INSERT IGNORE INTO plugin_handle (`id`,
`plugin_id`,`field`,`label`,`data_type`,`type`,`sort`,`ext_obj`) VALUES
('1570591047635968000', '39', 'client_id', 'client_id', 2, 3, 0,
'{"required":"1","rule":""}');
diff --git
a/shenyu-common/src/main/java/org/apache/shenyu/common/constant/DefaultPathConstants.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/constant/DefaultPathConstants.java
index 22dc436921..ff14dc0ea1 100644
---
a/shenyu-common/src/main/java/org/apache/shenyu/common/constant/DefaultPathConstants.java
+++
b/shenyu-common/src/main/java/org/apache/shenyu/common/constant/DefaultPathConstants.java
@@ -78,7 +78,8 @@ public final class DefaultPathConstants implements Constants {
* @return the string
*/
public static String buildMetaDataPath(final String path) {
- return String.join(PATH_SEPARATOR, META_DATA, path);
+ String join = String.join(PATH_SEPARATOR, META_DATA, path);
+ return join.replaceAll("//", PATH_SEPARATOR);
}
/**
diff --git
a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
index 95e4ef818a..97e4c1f16f 100644
---
a/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
+++
b/shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java
@@ -121,6 +121,7 @@ public class AdminClient extends BaseClient {
*/
public void login() {
final String url = baseURL +
"/platform/login?userName={username}&password={password}";
+ log.info("login, url:{}", url);
ResponseEntity<ShenYuResult> response = template.getForEntity(
url,
ShenYuResult.class,
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
index 804dc3213f..f7583ce639 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM eclipse-temurin:17-centos7
+FROM amazoncorretto:17.0.11-alpine3.19
ENV APP_NAME shenyu-examples-apache-dubbo-service-xml
ENV LOCAL_PATH /opt/${APP_NAME}
diff --git
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
index 68bf4eb2ac..0bcaf01c76 100644
---
a/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
+++
b/shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM bellsoft/liberica-openjdk-alpine:17
+FROM amazoncorretto:17.0.11-alpine3.19
ENV APP_NAME shenyu-examples-apache-dubbo-service
ENV LOCAL_PATH /opt/${APP_NAME}
