Skip to content

Commit 878a957

Browse files
authored
[type:fix] check sql #5512 (#5565)
* check sql #5512 * check sql #5512 * check sql #5512 * check sql #5512 * check sql #5512
1 parent 7cef16b commit 878a957

File tree

5 files changed

+6
-4
lines changed
  • shenyu-admin/src/main/resources/sql-script/h2
  • shenyu-common/src/main/java/org/apache/shenyu/common/constant
  • shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin
  • shenyu-examples/shenyu-examples-dubbo

5 files changed

+6
-4
lines changed

shenyu-admin/src/main/resources/sql-script/h2/schema.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ INSERT IGNORE INTO plugin_handle (`id`, `plugin_id`,`field`,`label`,`data_type`,
825825
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":""}');
826826
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"}');
827827
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"}');
828-
828+
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\"}');
829829

830830
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":""}');
831831
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":""}');

shenyu-common/src/main/java/org/apache/shenyu/common/constant/DefaultPathConstants.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ public static String buildAppAuthPath(final String appKey) {
7878
* @return the string
7979
*/
8080
public static String buildMetaDataPath(final String path) {
81-
return String.join(PATH_SEPARATOR, META_DATA, path);
81+
String join = String.join(PATH_SEPARATOR, META_DATA, path);
82+
return join.replaceAll("//", PATH_SEPARATOR);
8283
}
8384

8485
/**

shenyu-e2e/shenyu-e2e-client/src/main/java/org/apache/shenyu/e2e/client/admin/AdminClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ public AdminClient(final String scenarioId, final String serviceName, final Stri
121121
*/
122122
public void login() {
123123
final String url = baseURL + "/platform/login?userName={username}&password={password}";
124+
log.info("login, url:{}", url);
124125
ResponseEntity<ShenYuResult> response = template.getForEntity(
125126
url,
126127
ShenYuResult.class,

shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service-xml/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM eclipse-temurin:17-centos7
17+
FROM amazoncorretto:17.0.11-alpine3.19
1818

1919
ENV APP_NAME shenyu-examples-apache-dubbo-service-xml
2020
ENV LOCAL_PATH /opt/${APP_NAME}

shenyu-examples/shenyu-examples-dubbo/shenyu-examples-apache-dubbo-service/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM bellsoft/liberica-openjdk-alpine:17
17+
FROM amazoncorretto:17.0.11-alpine3.19
1818

1919
ENV APP_NAME shenyu-examples-apache-dubbo-service
2020
ENV LOCAL_PATH /opt/${APP_NAME}

0 commit comments

Comments
 (0)