This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 1fff6b327 [type: feature] e2e-spring-cloud e2e yaml change (#4837)
1fff6b327 is described below
commit 1fff6b3277dde58d0e958223122d2df63346673d
Author: SeaChess <[email protected]>
AuthorDate: Thu Jul 13 10:53:04 2023 +0800
[type: feature] e2e-spring-cloud e2e yaml change (#4837)
* change e2e action 01
* change e2e action 03
* change e2e action 04
* change e2e action 05
* change e2e action 06
* change e2e action 07
* change e2e action 08
* change e2e action 09
* change e2e action 10
* change e2e action 11
* change e2e action 12
* change e2e action 13
* change e2e action 14
* change e2e action 15
* change path
* change path 01
* change e2e action 16
* change e2e action 17
* new change e2e action 01
* new change e2e action 02
* new change e2e action 03
* new change e2e action 04
* change-e2e-action 01
* change-e2e-action 02
* change-e2e-action 03
* change-e2e-action 04
* change-e2e-action 05
* change-e2e-action 06
* test-e2e-apollo 01
* test-e2e-apollo 02
* test-e2e-apollo 03
* test-e2e-apollo 04
* test-e2e-apollo 05
* 01
* 02
* e2e-yaml-change 01
---
.github/workflows/e2e.yaml | 56 +-
.../shenyu-e2e-case-spring-cloud/pom.xml | 8 -
.../testcase/springcloud/DataSynApolloTest.java | 75 ---
.../springcloud/SpringCloudPluginCases.java | 2 +-
.../springcloud/SpringCloudPluginTest.java | 4 +-
.../src/test/resources/admin-application.yml | 119 ++++
.../src/test/resources/apolloconfigdb.sql | 613 ---------------------
.../src/test/resources/apolloportaldb.sql | 543 ------------------
.../src/test/resources/bootstrap-application.yml | 200 +++++++
.../src/test/resources/docker-compose.mysql.yml | 96 +---
.../shenyu/e2e/client/admin/AdminClient.java | 7 +-
.../shenyu/e2e/model/data/RuleCacheData.java | 20 +-
.../e2e/engine/service/DockerServiceCompose.java | 51 +-
13 files changed, 444 insertions(+), 1350 deletions(-)
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e30d62f70..a49187121 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -57,7 +57,7 @@ jobs:
cache: maven
- name: Build Apache ShenYu with Maven
- run: ./mvnw -B clean -Prelease -Dmaven.javadoc.skip=true -B
-Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests package
+ run: ./mvnw -B clean install -Prelease -Dmaven.javadoc.skip=true -B
-Drat.skip=true -Djacoco.skip=true -DskipITs -DskipTests package
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
@@ -142,12 +142,66 @@ jobs:
bash ./shenyu-e2e/script/storage_init.sh
./mvnw -B -f ./shenyu-e2e/pom.xml -pl
shenyu-e2e-case/shenyu-e2e-case-http -Dstorage=${{ matrix.storage }} test
+ e2e-case:
+ runs-on: ubuntu-latest
+ needs:
+ - changes
+ - build-docker-images
+ if: ${{ needs.changes.outputs.e2e == 'true' }}
+ strategy:
+ matrix:
+ case: [ "shenyu-e2e-case-spring-cloud" ]
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+
+ - name: Set up JDK 8 for Building ShenYu
+ uses: actions/setup-java@v3
+ with:
+ java-version: '8'
+ distribution: 'temurin'
+ cache: maven
+
+ - uses: actions/download-artifact@v3
+ with:
+ name: shenyu-images
+ path: /tmp/
+
+ - name: Load ShenYu Docker Images
+ run: |
+ docker load --input /tmp/apache-shenyu-admin.tar
+ docker load --input /tmp/apache-shenyu-bootstrap.tar
+ docker image ls -a
+
+ - name: Build examples with Maven
+ run: ./mvnw -B clean install -Pexample -Dmaven.javadoc.skip=true
-Dmaven.test.skip=true -f ./shenyu-examples/pom.xml
+
+ - uses: actions/checkout@v3
+ with:
+ submodules: true
+
+ - name: Set up JDK 11
+ uses: actions/setup-java@v3
+ with:
+ java-version: '11'
+ distribution: 'temurin'
+ cache: maven
+
+ - name: Run ShenYu E2E Tests
+ env:
+ storage: mysql
+ run: |
+ bash ./shenyu-e2e/script/storage_init.sh
+ ./mvnw -B -f ./shenyu-e2e/pom.xml -pl shenyu-e2e-case/${{
matrix.case }} -Dstorage=mysql test
+
requirement:
name: e2e
if: ${{ needs.changes.outputs.e2e == 'true' }}
needs:
- changes
- e2e
+ - e2e-case
runs-on: ubuntu-latest
steps:
- name: checking job status
diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/pom.xml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/pom.xml
index 7610e6ff1..2095013ec 100644
--- a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/pom.xml
+++ b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/pom.xml
@@ -28,12 +28,4 @@
<artifactId>shenyu-e2e-case-spring-cloud</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-base</artifactId>
- <version>2.6.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynApolloTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynApolloTest.java
deleted file mode 100644
index 1c6cbc0ce..000000000
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynApolloTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.e2e.testcase.springcloud;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.apache.shenyu.e2e.client.admin.AdminClient;
-import org.apache.shenyu.e2e.client.gateway.GatewayClient;
-import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
-import org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure;
-import org.apache.shenyu.e2e.model.data.MetaData;
-import org.apache.shenyu.e2e.model.data.RuleCacheData;
-import org.apache.shenyu.e2e.model.data.SelectorCacheData;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-/**
- * Testing the correctness of Apollo data synchronization method.
- */
-@ShenYuTest(
- mode = ShenYuEngineConfigure.Mode.DOCKER,
- services = {
- @ShenYuTest.ServiceConfigure(
- serviceName = "admin",
- port = 9095,
- baseUrl = "http://{hostname:localhost}:9095";,
- parameters = {
- @ShenYuTest.Parameter(key = "username", value
= "admin"),
- @ShenYuTest.Parameter(key = "password", value
= "123456"),
- @ShenYuTest.Parameter(key = "dataSyn", value =
"admin_apollo")
- }
- ),
- @ShenYuTest.ServiceConfigure(
- serviceName = "gateway",
- port = 9195,
- baseUrl = "http://{hostname:localhost}:9195";,
- type =
ShenYuEngineConfigure.ServiceType.SHENYU_GATEWAY,
- parameters = {
- @ShenYuTest.Parameter(key = "application",
value = "spring.cloud.discovery.enabled:true,eureka.client.enabled:true"),
- @ShenYuTest.Parameter(key = "dataSyn", value =
"gateway_apollo")
- }
- )
- },
- dockerComposeFile = "classpath:./docker-compose.mysql.yml"
-)
-public class DataSynApolloTest {
-
- @Test
- void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
- adminClient.login();
- Thread.sleep(10000);
- List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
- List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
- List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
- Assertions.assertEquals(2, selectorCacheList.size());
- Assertions.assertEquals(13, metaDataCacheList.size());
- Assertions.assertEquals(14, ruleCacheList.size());
- }
-}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginCases.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginCases.java
index 23a1e8e5d..4cbfc4a34 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginCases.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginCases.java
@@ -45,7 +45,7 @@ import static
org.apache.shenyu.e2e.engine.scenario.function.HttpCheckers.notExi
public class SpringCloudPluginCases implements ShenYuScenarioProvider {
- private static final String TEST = "/springboot/test";
+ private static final String TEST = "/springcloud/test";
private static final ObjectMapper MAPPER = new ObjectMapper();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
index a57e87b61..b1d9d5cf3 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
@@ -98,7 +98,7 @@ public class SpringCloudPluginTest {
formData.add("enabled", "true");
formData.add("role", "Proxy");
formData.add("sort", "200");
- adminClient.startPlugin("8", formData);
+ adminClient.changePluginStatus("8", formData);
String id = "";
for (SelectorDTO selectorDTO : selectorDTOList) {
if (!"".equals(selectorDTO.getHandle())) {
@@ -149,7 +149,7 @@ public class SpringCloudPluginTest {
formData.add("enabled", "false");
formData.add("role", "Proxy");
formData.add("sort", "200");
- client.startPlugin("8", formData);
+ client.changePluginStatus("8", formData);
}
}
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/admin-application.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/admin-application.yml
new file mode 100755
index 000000000..504485f9f
--- /dev/null
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/admin-application.yml
@@ -0,0 +1,119 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+server:
+ port: 9095
+ address: 0.0.0.0
+
+spring:
+ profiles:
+ active: h2
+ thymeleaf:
+ cache: true
+ encoding: utf-8
+ enabled: true
+ prefix: classpath:/static/
+ suffix: .html
+ mvc:
+ pathmatch:
+ matching-strategy: ant_path_matcher
+ jackson:
+ time-zone: GMT+8 # GMT , Asia/Shanghai
+ messages:
+ basename: message/i18n
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include:
+ - 'health'
+ - 'prometheus'
+ enabled-by-default: true
+
+mybatis:
+ config-location: classpath:/mybatis/mybatis-config.xml
+ mapper-locations: classpath:/mappers/*.xml
+
+shenyu:
+ register:
+ registerType: http #http #zookeeper #etcd #nacos #consul
+ serverLists: #localhost:2181 #http://localhost:2379 #localhost:8848
+ props:
+ sessionTimeout: 5000
+ connectionTimeout: 2000
+ checked: true
+ zombieCheckThreads: 10
+ zombieCheckTimes: 5
+ scheduledTime: 10
+ nacosNameSpace: ShenyuRegisterCenter
+ sync:
+ websocket:
+ enabled: true
+ messageMaxSize: 10240
+ allowOrigins: ws://localhost:9095;ws://localhost:9195;
+ ldap:
+ enabled: false
+ url: ldap://xxxx:xxx
+ bind-dn: cn=xxx,dc=xxx,dc=xxx
+ password: xxxx
+ base-dn: ou=xxx,dc=xxx,dc=xxx
+ object-class: person
+ login-field: cn
+ jwt:
+ expired-seconds: 86400000
+ shiro:
+ white-list:
+ - /
+ - /favicon.*
+ - /static/**
+ - /index**
+ - /platform/login
+ - /websocket
+ - /error
+ - /actuator/health
+ - /actuator/health/** # /actuator/health/readiness
/actuator/health/liveness
+ - /actuator/prometheus
+ - /swagger-ui.html
+ - /webjars/**
+ - /swagger-resources/**
+ - /v2/api-docs
+ - /csrf
+ swagger:
+ enable: true
+ dashboard:
+ core:
+ onlySuperAdminPermission:
+ - system:manager:add
+ - system:manager:edit
+ - system:manager:delete
+ - system:role:add
+ - system:role:edit
+ - system:role:delete
+ - system:resource:addButton
+ - system:resource:addMenu
+ - system:resource:editButton
+ - system:resource:editMenu
+ - system:resource:deleteButton
+ - system:resource:deleteMenu
+
+logging:
+ level:
+ root: info
+ org.springframework.boot: info
+ org.apache.ibatis: info
+ org.apache.shenyu.bonuspoint: info
+ org.apache.shenyu.lottery: info
+ org.apache.shenyu: info
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloconfigdb.sql
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloconfigdb.sql
deleted file mode 100644
index f55c26220..000000000
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloconfigdb.sql
+++ /dev/null
@@ -1,613 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-CREATE DATABASE IF NOT EXISTS ApolloConfigDB DEFAULT CHARACTER SET = utf8mb4;
-
-Use ApolloConfigDB;
-
---
--- Table structure for table `AccessKey`
---
-
-DROP TABLE IF EXISTS `AccessKey`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `AccessKey` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `Secret` varchar(128) NOT NULL DEFAULT '' COMMENT 'Secret',
- `IsEnabled` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: enabled, 0: disabled',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_Secret_DeletedAt` (`AppId`,`Secret`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='访问密钥';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `AccessKey`
---
-
-LOCK TABLES `AccessKey` WRITE;
-/*!40000 ALTER TABLE `AccessKey` DISABLE KEYS */;
-/*!40000 ALTER TABLE `AccessKey` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `App`
---
-
-DROP TABLE IF EXISTS `App`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `App` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
- `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
- `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
- `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Name` (`Name`(191))
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='应用表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `App`
---
-
-LOCK TABLES `App` WRITE;
-/*!40000 ALTER TABLE `App` DISABLE KEYS */;
-INSERT INTO `App` VALUES (1,'SampleApp','Sample
App','TEST1','样例部门1','apollo','[email protected]',_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'shenyu','application','TEST1','样例部门1','apollo','[email protected]',_binary
'\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08 09:26:47');
-/*!40000 ALTER TABLE `App` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `AppNamespace`
---
-
-DROP TABLE IF EXISTS `AppNamespace`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `AppNamespace` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
- `Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT
'namespace的format类型',
- `IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
- `Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
- KEY `Name_AppId` (`Name`,`AppId`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='应用namespace定义';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `AppNamespace`
---
-
-LOCK TABLES `AppNamespace` WRITE;
-/*!40000 ALTER TABLE `AppNamespace` DISABLE KEYS */;
-INSERT INTO `AppNamespace` VALUES
(1,'application','SampleApp','properties',_binary '\0','default app
namespace',_binary '\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'application','shenyu','properties',_binary '\0','default app
namespace',_binary '\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08
09:26:47');
-/*!40000 ALTER TABLE `AppNamespace` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Audit`
---
-
-DROP TABLE IF EXISTS `Audit`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Audit` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `EntityName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '表名',
- `EntityId` int unsigned DEFAULT NULL COMMENT '记录ID',
- `OpName` varchar(50) NOT NULL DEFAULT 'default' COMMENT '操作类型',
- `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='日志审计表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Audit`
---
-
-LOCK TABLES `Audit` WRITE;
-/*!40000 ALTER TABLE `Audit` DISABLE KEYS */;
-INSERT INTO `Audit` VALUES (1,'App',2,'INSERT',NULL,_binary
'\0',0,'apollo','2023-06-08 09:26:47',NULL,'2023-06-08
09:26:47'),(2,'AppNamespace',2,'INSERT',NULL,_binary
'\0',0,'apollo','2023-06-08 09:26:47',NULL,'2023-06-08
09:26:47'),(3,'Cluster',2,'INSERT',NULL,_binary '\0',0,'apollo','2023-06-08
09:26:47',NULL,'2023-06-08 09:26:47'),(4,'Namespace',2,'INSERT',NULL,_binary
'\0',0,'apollo','2023-06-08 09:26:47',NULL,'2023-06-08
09:26:47'),(5,'Cluster',3,'INSERT',NULL,_binary '\0',0,'apoll [...]
-/*!40000 ALTER TABLE `Audit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Cluster`
---
-
-DROP TABLE IF EXISTS `Cluster`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Cluster` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `Name` varchar(32) NOT NULL DEFAULT '' COMMENT '集群名字',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'App id',
- `ParentClusterId` int unsigned NOT NULL DEFAULT '0' COMMENT '父cluster',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
- KEY `IX_ParentClusterId` (`ParentClusterId`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='集群';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Cluster`
---
-
-LOCK TABLES `Cluster` WRITE;
-/*!40000 ALTER TABLE `Cluster` DISABLE KEYS */;
-INSERT INTO `Cluster` VALUES (1,'default','SampleApp',0,_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'default','shenyu',0,_binary '\0',0,'apollo','2023-06-08
09:26:47','apollo','2023-06-08 09:26:47'),(3,'test','shenyu',0,_binary
'\0',0,'apollo','2023-06-08 09:27:01','apollo','2023-06-08 09:27:01');
-/*!40000 ALTER TABLE `Cluster` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Commit`
---
-
-DROP TABLE IF EXISTS `Commit`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Commit` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `ChangeSets` longtext NOT NULL COMMENT '修改变更集',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
- `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT
'namespaceName',
- `Comment` varchar(500) DEFAULT NULL COMMENT '备注',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `AppId` (`AppId`(191)),
- KEY `ClusterName` (`ClusterName`(191)),
- KEY `NamespaceName` (`NamespaceName`(191))
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='commit 历史表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Commit`
---
-
-LOCK TABLES `Commit` WRITE;
-/*!40000 ALTER TABLE `Commit` DISABLE KEYS */;
-INSERT INTO `Commit` VALUES
(1,'{\"createItems\":[{\"namespaceId\":3,\"key\":\"shenyu.plugin.json\",\"type\":0,\"value\":\"{\\\"request\\\":{\\\"id\\\":\\\"20\\\",\\\"name\\\":\\\"request\\\",\\\"role\\\":\\\"HttpProcess\\\",\\\"enabled\\\":false,\\\"sort\\\":120},\\\"loggingPulsar\\\":{\\\"id\\\":\\\"35\\\",\\\"name\\\":\\\"loggingPulsar\\\",\\\"config\\\":\\\"{\\\\\\\"topic\\\\\\\":\\\\\\\"shenyu-access-logging\\\\\\\",
\\\\\\\"serviceUrl\\\\\\\": \\\\\\\"pulsar://localhost:6650\\\\\\\ [...]
-/*!40000 ALTER TABLE `Commit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `GrayReleaseRule`
---
-
-DROP TABLE IF EXISTS `GrayReleaseRule`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `GrayReleaseRule` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
- `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Namespace
Name',
- `BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'branch name',
- `Rules` varchar(16000) DEFAULT '[]' COMMENT '灰度规则',
- `ReleaseId` int unsigned NOT NULL DEFAULT '0' COMMENT '灰度对应的release',
- `BranchStatus` tinyint DEFAULT '1' COMMENT '灰度分支状态: 0:删除分支,1:正在使用的规则 2：全量发布',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='灰度规则表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `GrayReleaseRule`
---
-
-LOCK TABLES `GrayReleaseRule` WRITE;
-/*!40000 ALTER TABLE `GrayReleaseRule` DISABLE KEYS */;
-/*!40000 ALTER TABLE `GrayReleaseRule` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Instance`
---
-
-DROP TABLE IF EXISTS `Instance`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Instance` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
- `DataCenter` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Data Center
Name',
- `Ip` varchar(32) NOT NULL DEFAULT '' COMMENT 'instance ip',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_UNIQUE_KEY` (`AppId`,`ClusterName`,`Ip`,`DataCenter`),
- KEY `IX_IP` (`Ip`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='使用配置的应用实例';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Instance`
---
-
-LOCK TABLES `Instance` WRITE;
-/*!40000 ALTER TABLE `Instance` DISABLE KEYS */;
-/*!40000 ALTER TABLE `Instance` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `InstanceConfig`
---
-
-DROP TABLE IF EXISTS `InstanceConfig`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `InstanceConfig` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `InstanceId` int unsigned DEFAULT NULL COMMENT 'Instance Id',
- `ConfigAppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'Config App Id',
- `ConfigClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config
Cluster Name',
- `ConfigNamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'Config
Namespace Name',
- `ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
- `ReleaseDeliveryTime` timestamp NULL DEFAULT NULL COMMENT '配置获取时间',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_UNIQUE_KEY`
(`InstanceId`,`ConfigAppId`,`ConfigNamespaceName`),
- KEY `IX_ReleaseKey` (`ReleaseKey`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Valid_Namespace`
(`ConfigAppId`,`ConfigClusterName`,`ConfigNamespaceName`,`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='应用实例的配置信息';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `InstanceConfig`
---
-
-LOCK TABLES `InstanceConfig` WRITE;
-/*!40000 ALTER TABLE `InstanceConfig` DISABLE KEYS */;
-/*!40000 ALTER TABLE `InstanceConfig` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Item`
---
-
-DROP TABLE IF EXISTS `Item`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Item` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `NamespaceId` int unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
- `Key` varchar(128) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
- `Type` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '配置项类型，0: String，1:
Number，2: Boolean，3: JSON',
- `Value` longtext NOT NULL COMMENT '配置项值',
- `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
- `LineNum` int unsigned DEFAULT '0' COMMENT '行号',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_GroupId` (`NamespaceId`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='配置项目';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Item`
---
-
-LOCK TABLES `Item` WRITE;
-/*!40000 ALTER TABLE `Item` DISABLE KEYS */;
-INSERT INTO `Item` VALUES (1,1,'timeout',0,'100','sample timeout配置',1,_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,3,'shenyu.plugin.json',0,'{\"request\":{\"id\":\"20\",\"name\":\"request\",\"role\":\"HttpProcess\",\"enabled\":false,\"sort\":120},\"loggingPulsar\":{\"id\":\"35\",\"name\":\"loggingPulsar\",\"config\":\"{\\\"topic\\\":\\\"shenyu-access-logging\\\",
\\\"serviceUrl\\\":
\\\"pulsar://localhost:6650\\\"}\",\"role\":\"Logging\",\"enabled\":false,\
[...]
-/*!40000 ALTER TABLE `Item` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Namespace`
---
-
-DROP TABLE IF EXISTS `Namespace`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Namespace` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Cluster Name',
- `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'Namespace
Name',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_ClusterName_NamespaceName_DeletedAt`
(`AppId`(191),`ClusterName`(191),`NamespaceName`(191),`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_NamespaceName` (`NamespaceName`(191))
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='命名空间';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Namespace`
---
-
-LOCK TABLES `Namespace` WRITE;
-/*!40000 ALTER TABLE `Namespace` DISABLE KEYS */;
-INSERT INTO `Namespace` VALUES (1,'SampleApp','default','application',_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'shenyu','default','application',_binary
'\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08
09:26:47'),(3,'shenyu','test','application',_binary '\0',0,'apollo','2023-06-08
09:27:01','apollo','2023-06-08 09:27:01');
-/*!40000 ALTER TABLE `Namespace` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `NamespaceLock`
---
-
-DROP TABLE IF EXISTS `NamespaceLock`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `NamespaceLock` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增id',
- `NamespaceId` int unsigned NOT NULL DEFAULT '0' COMMENT '集群NamespaceId',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- `IsDeleted` bit(1) DEFAULT b'0' COMMENT '软删除',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_NamespaceId_DeletedAt` (`NamespaceId`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='namespace的编辑锁';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `NamespaceLock`
---
-
-LOCK TABLES `NamespaceLock` WRITE;
-/*!40000 ALTER TABLE `NamespaceLock` DISABLE KEYS */;
-/*!40000 ALTER TABLE `NamespaceLock` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Release`
---
-
-DROP TABLE IF EXISTS `Release`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Release` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `ReleaseKey` varchar(64) NOT NULL DEFAULT '' COMMENT '发布的Key',
- `Name` varchar(64) NOT NULL DEFAULT 'default' COMMENT '发布名字',
- `Comment` varchar(256) DEFAULT NULL COMMENT '发布说明',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
- `NamespaceName` varchar(500) NOT NULL DEFAULT 'default' COMMENT
'namespaceName',
- `Configurations` longtext NOT NULL COMMENT '发布配置',
- `IsAbandoned` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否废弃',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_ReleaseKey_DeletedAt` (`ReleaseKey`,`DeletedAt`),
- KEY `AppId_ClusterName_GroupName`
(`AppId`(191),`ClusterName`(191),`NamespaceName`(191)),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='发布';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Release`
---
-
-LOCK TABLES `Release` WRITE;
-/*!40000 ALTER TABLE `Release` DISABLE KEYS */;
-INSERT INTO `Release` VALUES
(1,'20161009155425-d3a0749c6e20bc15','20161009155424-release','Sample发布','SampleApp','default','application','{\"timeout\":\"100\"}',_binary
'\0',_binary '\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'20230608190248-4a371fc6c67a5bd9','publish config
data','','shenyu','test','application','{\"shenyu.plugin.json\":\"{\\\"request\\\":{\\\"id\\\":\\\"20\\\",\\\"name\\\":\\\"request\\\",\\\"role\\\":\\\"HttpProcess\\\",\\\"enabled\\\":false,\
[...]
-/*!40000 ALTER TABLE `Release` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ReleaseHistory`
---
-
-DROP TABLE IF EXISTS `ReleaseHistory`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ReleaseHistory` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(64) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `ClusterName` varchar(32) NOT NULL DEFAULT 'default' COMMENT 'ClusterName',
- `NamespaceName` varchar(32) NOT NULL DEFAULT 'default' COMMENT
'namespaceName',
- `BranchName` varchar(32) NOT NULL DEFAULT 'default' COMMENT '发布分支名',
- `ReleaseId` int unsigned NOT NULL DEFAULT '0' COMMENT '关联的Release Id',
- `PreviousReleaseId` int unsigned NOT NULL DEFAULT '0' COMMENT
'前一次发布的ReleaseId',
- `Operation` tinyint unsigned NOT NULL DEFAULT '0' COMMENT '发布类型，0: 普通发布，1:
回滚，2: 灰度发布，3: 灰度规则更新，4: 灰度合并回主分支发布，5: 主分支发布灰度自动发布，6: 主分支回滚灰度自动发布，7: 放弃灰度',
- `OperationContext` longtext NOT NULL COMMENT '发布上下文信息',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_Namespace` (`AppId`,`ClusterName`,`NamespaceName`,`BranchName`),
- KEY `IX_ReleaseId` (`ReleaseId`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_PreviousReleaseId` (`PreviousReleaseId`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='发布历史';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ReleaseHistory`
---
-
-LOCK TABLES `ReleaseHistory` WRITE;
-/*!40000 ALTER TABLE `ReleaseHistory` DISABLE KEYS */;
-INSERT INTO `ReleaseHistory` VALUES
(1,'SampleApp','default','application','default',1,0,0,'{}',_binary
'\0',0,'apollo','2023-06-08 09:24:45','apollo','2023-06-08
09:24:45'),(2,'shenyu','test','application','test',2,0,0,'{\"isEmergencyPublish\":false}',_binary
'\0',0,'apollo','2023-06-08 11:02:48','apollo','2023-06-08
11:02:48'),(3,'shenyu','test','application','test',3,2,0,'{\"isEmergencyPublish\":false}',_binary
'\0',0,'apollo','2023-06-08 11:02:49','apollo','2023-06-08 11:02:49'),(4,'
[...]
-/*!40000 ALTER TABLE `ReleaseHistory` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ReleaseMessage`
---
-
-DROP TABLE IF EXISTS `ReleaseMessage`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ReleaseMessage` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `Message` varchar(1024) NOT NULL DEFAULT '' COMMENT '发布的消息内容',
- `DataChange_LastTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Message` (`Message`(191))
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='发布消息';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ReleaseMessage`
---
-
-LOCK TABLES `ReleaseMessage` WRITE;
-/*!40000 ALTER TABLE `ReleaseMessage` DISABLE KEYS */;
-INSERT INTO `ReleaseMessage` VALUES
(1,'SampleApp+default+application','2023-06-08
09:24:45'),(4,'shenyu+test+application','2023-06-08 11:02:49');
-/*!40000 ALTER TABLE `ReleaseMessage` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ServerConfig`
---
-
-DROP TABLE IF EXISTS `ServerConfig`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ServerConfig` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
- `Cluster` varchar(32) NOT NULL DEFAULT 'default' COMMENT
'配置对应的集群，default为不针对特定的集群',
- `Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
- `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_Key_Cluster_DeletedAt` (`Key`,`Cluster`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='配置服务自身配置';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ServerConfig`
---
-
-LOCK TABLES `ServerConfig` WRITE;
-/*!40000 ALTER TABLE `ServerConfig` DISABLE KEYS */;
-INSERT INTO `ServerConfig` VALUES
(1,'eureka.service.url','default','http://apollo-configservice:8080/eureka/','Eureka服务Url，多个service以英文逗号分隔',_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(2,'namespace.lock.switch','default','false','一次发布只能有一个人修改开关',_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08
09:24:45'),(3,'item.key.length.limit','default','128','item key 最大长度限制',_binary
'\0',0,'default','2023-06-08 09:24:45','','2023-06-08 09:24:45'),(4,'item [...]
-/*!40000 ALTER TABLE `ServerConfig` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ServiceRegistry`
---
-
-DROP TABLE IF EXISTS `ServiceRegistry`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ServiceRegistry` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ServiceName` varchar(64) NOT NULL COMMENT '服务名',
- `Uri` varchar(64) NOT NULL COMMENT '服务地址',
- `Cluster` varchar(64) NOT NULL COMMENT '集群，可以用来标识apollo.cluster或者网络分区',
- `Metadata` varchar(1024) NOT NULL DEFAULT '{}' COMMENT '元数据，key value结构的json
object，为了方面后面扩展功能而不需要修改表结构',
- `DataChange_CreatedTime` timestamp NOT NULL COMMENT '创建时间',
- `DataChange_LastTime` timestamp NOT NULL COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `IX_UNIQUE_KEY` (`ServiceName`,`Uri`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
COMMENT='注册中心';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ServiceRegistry`
---
-
-LOCK TABLES `ServiceRegistry` WRITE;
-/*!40000 ALTER TABLE `ServiceRegistry` DISABLE KEYS */;
-/*!40000 ALTER TABLE `ServiceRegistry` ENABLE KEYS */;
-UNLOCK TABLES;
-
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloportaldb.sql
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloportaldb.sql
deleted file mode 100644
index 7a0610824..000000000
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/apolloportaldb.sql
+++ /dev/null
@@ -1,543 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-
-CREATE DATABASE IF NOT EXISTS ApolloPortalDB DEFAULT CHARACTER SET = utf8mb4;
-
-Use ApolloPortalDB;
-
---
--- Table structure for table `App`
---
-
-DROP TABLE IF EXISTS `App`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `App` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
- `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
- `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
- `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_Name` (`Name`(191))
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='应用表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `App`
---
-
-LOCK TABLES `App` WRITE;
-/*!40000 ALTER TABLE `App` DISABLE KEYS */;
-INSERT INTO `App` VALUES (1,'SampleApp','Sample
App','TEST1','样例部门1','apollo','[email protected]',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(2,'shenyu','application','TEST1','样例部门1','apollo','[email protected]',_binary
'\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08 09:26:47');
-/*!40000 ALTER TABLE `App` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `AppNamespace`
---
-
-DROP TABLE IF EXISTS `AppNamespace`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `AppNamespace` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增主键',
- `Name` varchar(32) NOT NULL DEFAULT '' COMMENT 'namespace名字，注意，需要全局唯一',
- `AppId` varchar(64) NOT NULL DEFAULT '' COMMENT 'app id',
- `Format` varchar(32) NOT NULL DEFAULT 'properties' COMMENT
'namespace的format类型',
- `IsPublic` bit(1) NOT NULL DEFAULT b'0' COMMENT 'namespace是否为公共',
- `Comment` varchar(64) NOT NULL DEFAULT '' COMMENT '注释',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_Name_DeletedAt` (`AppId`,`Name`,`DeletedAt`),
- KEY `Name_AppId` (`Name`,`AppId`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='应用namespace定义';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `AppNamespace`
---
-
-LOCK TABLES `AppNamespace` WRITE;
-/*!40000 ALTER TABLE `AppNamespace` DISABLE KEYS */;
-INSERT INTO `AppNamespace` VALUES
(1,'application','SampleApp','properties',_binary '\0','default app
namespace',_binary '\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(2,'application','shenyu','properties',_binary '\0','default app
namespace',_binary '\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08
09:26:47');
-/*!40000 ALTER TABLE `AppNamespace` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Authorities`
---
-
-DROP TABLE IF EXISTS `Authorities`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Authorities` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `Username` varchar(64) NOT NULL,
- `Authority` varchar(50) NOT NULL,
- PRIMARY KEY (`Id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Authorities`
---
-
-LOCK TABLES `Authorities` WRITE;
-/*!40000 ALTER TABLE `Authorities` DISABLE KEYS */;
-INSERT INTO `Authorities` VALUES (1,'apollo','ROLE_user');
-/*!40000 ALTER TABLE `Authorities` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Consumer`
---
-
-DROP TABLE IF EXISTS `Consumer`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Consumer` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `Name` varchar(500) NOT NULL DEFAULT 'default' COMMENT '应用名',
- `OrgId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '部门Id',
- `OrgName` varchar(64) NOT NULL DEFAULT 'default' COMMENT '部门名字',
- `OwnerName` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerName',
- `OwnerEmail` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'ownerEmail',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_AppId_DeletedAt` (`AppId`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='开放API消费者';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Consumer`
---
-
-LOCK TABLES `Consumer` WRITE;
-/*!40000 ALTER TABLE `Consumer` DISABLE KEYS */;
-INSERT INTO `Consumer` VALUES
(1,'shenyu','application','TEST1','样例部门1','apollo','[email protected]',_binary
'\0',0,'apollo','2023-06-08 09:26:30','apollo','2023-06-08 09:26:30');
-/*!40000 ALTER TABLE `Consumer` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ConsumerAudit`
---
-
-DROP TABLE IF EXISTS `ConsumerAudit`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ConsumerAudit` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int unsigned DEFAULT NULL COMMENT 'Consumer Id',
- `Uri` varchar(1024) NOT NULL DEFAULT '' COMMENT '访问的Uri',
- `Method` varchar(16) NOT NULL DEFAULT '' COMMENT '访问的Method',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_ConsumerId` (`ConsumerId`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='consumer审计表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ConsumerAudit`
---
-
-LOCK TABLES `ConsumerAudit` WRITE;
-/*!40000 ALTER TABLE `ConsumerAudit` DISABLE KEYS */;
-INSERT INTO `ConsumerAudit` VALUES
(1,1,'/openapi/v1/envs/dev/apps/shenyu/clusters/test/namespaces/application/items/shenyu.plugin.json?createIfNotExists=true','PUT','2023-06-08
11:01:47','2023-06-08
11:01:47'),(2,1,'/openapi/v1/envs/dev/apps/shenyu/clusters/test/namespaces/application/items/shenyu.plugin.json?createIfNotExists=true','PUT','2023-06-08
11:02:48','2023-06-08
11:02:48'),(3,1,'/openapi/v1/envs/dev/apps/shenyu/clusters/test/namespaces/application/releases','POST','2023-06-08
[...]
-/*!40000 ALTER TABLE `ConsumerAudit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ConsumerRole`
---
-
-DROP TABLE IF EXISTS `ConsumerRole`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ConsumerRole` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int unsigned DEFAULT NULL COMMENT 'Consumer Id',
- `RoleId` int unsigned DEFAULT NULL COMMENT 'Role Id',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_ConsumerId_RoleId_DeletedAt`
(`ConsumerId`,`RoleId`,`DeletedAt`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_RoleId` (`RoleId`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='consumer和role的绑定表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ConsumerRole`
---
-
-LOCK TABLES `ConsumerRole` WRITE;
-/*!40000 ALTER TABLE `ConsumerRole` DISABLE KEYS */;
-INSERT INTO `ConsumerRole` VALUES (1,1,7,_binary '\0',0,'apollo','2023-06-08
11:02:36','apollo','2023-06-08 11:02:36'),(2,1,8,_binary
'\0',0,'apollo','2023-06-08 11:02:36','apollo','2023-06-08 11:02:36');
-/*!40000 ALTER TABLE `ConsumerRole` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ConsumerToken`
---
-
-DROP TABLE IF EXISTS `ConsumerToken`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ConsumerToken` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `ConsumerId` int unsigned DEFAULT NULL COMMENT 'ConsumerId',
- `Token` varchar(128) NOT NULL DEFAULT '' COMMENT 'token',
- `Expires` datetime NOT NULL DEFAULT '2099-01-01 00:00:00' COMMENT
'token失效时间',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_Token_DeletedAt` (`Token`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='consumer token表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ConsumerToken`
---
-
-LOCK TABLES `ConsumerToken` WRITE;
-/*!40000 ALTER TABLE `ConsumerToken` DISABLE KEYS */;
-INSERT INTO `ConsumerToken` VALUES
(1,1,'38d8911b852cd84ea4fe8c05227d5d0014bc3a95b9da42b0771ee7d9915aa379','2099-01-01
00:00:00',_binary '\0',0,'apollo','2023-06-08 09:26:30','apollo','2023-06-08
09:26:30');
-/*!40000 ALTER TABLE `ConsumerToken` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Favorite`
---
-
-DROP TABLE IF EXISTS `Favorite`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Favorite` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
- `UserId` varchar(32) NOT NULL DEFAULT 'default' COMMENT '收藏的用户',
- `AppId` varchar(500) NOT NULL DEFAULT 'default' COMMENT 'AppID',
- `Position` int NOT NULL DEFAULT '10000' COMMENT '收藏顺序',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_UserId_AppId_DeletedAt` (`UserId`,`AppId`,`DeletedAt`),
- KEY `AppId` (`AppId`(191)),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='应用收藏表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Favorite`
---
-
-LOCK TABLES `Favorite` WRITE;
-/*!40000 ALTER TABLE `Favorite` DISABLE KEYS */;
-/*!40000 ALTER TABLE `Favorite` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Permission`
---
-
-DROP TABLE IF EXISTS `Permission`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Permission` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `PermissionType` varchar(32) NOT NULL DEFAULT '' COMMENT '权限类型',
- `TargetId` varchar(256) NOT NULL DEFAULT '' COMMENT '权限对象类型',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_TargetId_PermissionType_DeletedAt`
(`TargetId`,`PermissionType`,`DeletedAt`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='permission表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Permission`
---
-
-LOCK TABLES `Permission` WRITE;
-/*!40000 ALTER TABLE `Permission` DISABLE KEYS */;
-INSERT INTO `Permission` VALUES (1,'CreateCluster','SampleApp',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(2,'CreateNamespace','SampleApp',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(3,'AssignRole','SampleApp',_binary '\0',0,'default','2023-06-08
09:24:46','','2023-06-08
09:24:46'),(4,'ModifyNamespace','SampleApp+application',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(5,'ReleaseNamespace','SampleAp [...]
-/*!40000 ALTER TABLE `Permission` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Role`
---
-
-DROP TABLE IF EXISTS `Role`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Role` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `RoleName` varchar(256) NOT NULL DEFAULT '' COMMENT 'Role name',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_RoleName_DeletedAt` (`RoleName`,`DeletedAt`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='角色表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Role`
---
-
-LOCK TABLES `Role` WRITE;
-/*!40000 ALTER TABLE `Role` DISABLE KEYS */;
-INSERT INTO `Role` VALUES (1,'Master+SampleApp',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(2,'ModifyNamespace+SampleApp+application',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(3,'ReleaseNamespace+SampleApp+application',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(4,'CreateApplication+SystemRole',_binary
'\0',0,'apollo','2023-06-08 09:26:00','apollo','2023-06-08
09:26:00'),(5,'Master+shenyu',_binary [...]
-/*!40000 ALTER TABLE `Role` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `RolePermission`
---
-
-DROP TABLE IF EXISTS `RolePermission`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `RolePermission` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `RoleId` int unsigned DEFAULT NULL COMMENT 'Role Id',
- `PermissionId` int unsigned DEFAULT NULL COMMENT 'Permission Id',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_RoleId_PermissionId_DeletedAt`
(`RoleId`,`PermissionId`,`DeletedAt`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_PermissionId` (`PermissionId`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='角色和权限的绑定表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `RolePermission`
---
-
-LOCK TABLES `RolePermission` WRITE;
-/*!40000 ALTER TABLE `RolePermission` DISABLE KEYS */;
-INSERT INTO `RolePermission` VALUES (1,1,1,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08 09:24:46'),(2,1,2,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08 09:24:46'),(3,1,3,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08 09:24:46'),(4,2,4,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08 09:24:46'),(5,3,5,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08 09:24:46'),(6,4,6,_binary
'\0',0,'apollo','2023-06-08 09:26:00','ap [...]
-/*!40000 ALTER TABLE `RolePermission` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SPRING_SESSION`
---
-
-DROP TABLE IF EXISTS `SPRING_SESSION`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `SPRING_SESSION` (
- `PRIMARY_ID` char(36) NOT NULL,
- `SESSION_ID` char(36) NOT NULL,
- `CREATION_TIME` bigint NOT NULL,
- `LAST_ACCESS_TIME` bigint NOT NULL,
- `MAX_INACTIVE_INTERVAL` int NOT NULL,
- `EXPIRY_TIME` bigint NOT NULL,
- `PRINCIPAL_NAME` varchar(100) DEFAULT NULL,
- PRIMARY KEY (`PRIMARY_ID`),
- UNIQUE KEY `SPRING_SESSION_IX1` (`SESSION_ID`),
- KEY `SPRING_SESSION_IX2` (`EXPIRY_TIME`),
- KEY `SPRING_SESSION_IX3` (`PRINCIPAL_NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SPRING_SESSION`
---
-
-LOCK TABLES `SPRING_SESSION` WRITE;
-/*!40000 ALTER TABLE `SPRING_SESSION` DISABLE KEYS */;
-INSERT INTO `SPRING_SESSION` VALUES
('41e72606-2ba5-446c-8e96-22c9cd191a8c','468b226f-617f-4504-8b72-f95c729c92e5',1686222119655,1686222248216,1800,1686224048216,'apollo');
-/*!40000 ALTER TABLE `SPRING_SESSION` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `SPRING_SESSION_ATTRIBUTES`
---
-
-DROP TABLE IF EXISTS `SPRING_SESSION_ATTRIBUTES`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `SPRING_SESSION_ATTRIBUTES` (
- `SESSION_PRIMARY_ID` char(36) NOT NULL,
- `ATTRIBUTE_NAME` varchar(200) NOT NULL,
- `ATTRIBUTE_BYTES` blob NOT NULL,
- PRIMARY KEY (`SESSION_PRIMARY_ID`,`ATTRIBUTE_NAME`),
- CONSTRAINT `SPRING_SESSION_ATTRIBUTES_FK` FOREIGN KEY (`SESSION_PRIMARY_ID`)
REFERENCES `SPRING_SESSION` (`PRIMARY_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci
ROW_FORMAT=DYNAMIC;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `SPRING_SESSION_ATTRIBUTES`
---
-
-LOCK TABLES `SPRING_SESSION_ATTRIBUTES` WRITE;
-/*!40000 ALTER TABLE `SPRING_SESSION_ATTRIBUTES` DISABLE KEYS */;
-INSERT INTO `SPRING_SESSION_ATTRIBUTES` VALUES
('41e72606-2ba5-446c-8e96-22c9cd191a8c','SPRING_SECURITY_CONTEXT',_binary
'{\"@class\":\"org.springframework.security.core.context.SecurityContextImpl\",\"authentication\":{\"@class\":\"org.springframework.security.authentication.UsernamePasswordAuthenticationToken\",\"authorities\":[\"java.util.Collections$UnmodifiableRandomAccessList\",[{\"@class\":\"org.springframework.security.core.authority.SimpleGrantedAuthority\",\"authority\":\"ROLE_
[...]
-/*!40000 ALTER TABLE `SPRING_SESSION_ATTRIBUTES` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ServerConfig`
---
-
-DROP TABLE IF EXISTS `ServerConfig`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `ServerConfig` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `Key` varchar(64) NOT NULL DEFAULT 'default' COMMENT '配置项Key',
- `Value` varchar(2048) NOT NULL DEFAULT 'default' COMMENT '配置项值',
- `Comment` varchar(1024) DEFAULT '' COMMENT '注释',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_Key_DeletedAt` (`Key`,`DeletedAt`),
- KEY `DataChange_LastTime` (`DataChange_LastTime`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='配置服务自身配置';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ServerConfig`
---
-
-LOCK TABLES `ServerConfig` WRITE;
-/*!40000 ALTER TABLE `ServerConfig` DISABLE KEYS */;
-INSERT INTO `ServerConfig` VALUES
(1,'apollo.portal.envs','dev','可支持的环境列表',_binary '\0',0,'default','2023-06-08
09:24:46','','2023-06-08
09:24:46'),(2,'organizations','[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]','部门列表',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(3,'superAdmin','apollo','Portal超级管理员',_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(4,'api.readTimeout','10000','http接口read [...]
-/*!40000 ALTER TABLE `ServerConfig` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `UserRole`
---
-
-DROP TABLE IF EXISTS `UserRole`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `UserRole` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `UserId` varchar(128) DEFAULT '' COMMENT '用户身份标识',
- `RoleId` int unsigned DEFAULT NULL COMMENT 'Role Id',
- `IsDeleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '1: deleted, 0: normal',
- `DeletedAt` bigint NOT NULL DEFAULT '0' COMMENT 'Delete timestamp based on
milliseconds',
- `DataChange_CreatedBy` varchar(64) NOT NULL DEFAULT 'default' COMMENT
'创建人邮箱前缀',
- `DataChange_CreatedTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
COMMENT '创建时间',
- `DataChange_LastModifiedBy` varchar(64) DEFAULT '' COMMENT '最后修改人邮箱前缀',
- `DataChange_LastTime` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT '最后修改时间',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_UserId_RoleId_DeletedAt` (`UserId`,`RoleId`,`DeletedAt`),
- KEY `IX_DataChange_LastTime` (`DataChange_LastTime`),
- KEY `IX_RoleId` (`RoleId`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='用户和role的绑定表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `UserRole`
---
-
-LOCK TABLES `UserRole` WRITE;
-/*!40000 ALTER TABLE `UserRole` DISABLE KEYS */;
-INSERT INTO `UserRole` VALUES (1,'apollo',1,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(2,'apollo',2,_binary '\0',0,'default','2023-06-08
09:24:46','','2023-06-08 09:24:46'),(3,'apollo',3,_binary
'\0',0,'default','2023-06-08 09:24:46','','2023-06-08
09:24:46'),(4,'apollo',5,_binary '\0',0,'apollo','2023-06-08
09:26:47','apollo','2023-06-08 09:26:47'),(5,'apollo',7,_binary
'\0',0,'apollo','2023-06-08 09:26:47','apollo','2023-06-08
09:26:47'),(6,'apollo',8,_bi [...]
-/*!40000 ALTER TABLE `UserRole` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Users`
---
-
-DROP TABLE IF EXISTS `Users`;
-/*!40101 SET @saved_cs_client = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `Users` (
- `Id` int unsigned NOT NULL AUTO_INCREMENT COMMENT '自增Id',
- `Username` varchar(64) NOT NULL DEFAULT 'default' COMMENT '用户登录账户',
- `Password` varchar(512) NOT NULL DEFAULT 'default' COMMENT '密码',
- `UserDisplayName` varchar(512) NOT NULL DEFAULT 'default' COMMENT '用户名称',
- `Email` varchar(64) NOT NULL DEFAULT 'default' COMMENT '邮箱地址',
- `Enabled` tinyint DEFAULT NULL COMMENT '是否有效',
- PRIMARY KEY (`Id`),
- UNIQUE KEY `UK_Username` (`Username`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4
COLLATE=utf8mb4_0900_ai_ci COMMENT='用户表';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `Users`
---
-
-LOCK TABLES `Users` WRITE;
-/*!40000 ALTER TABLE `Users` DISABLE KEYS */;
-INSERT INTO `Users` VALUES
(1,'apollo','$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS','apollo','[email protected]',1);
-/*!40000 ALTER TABLE `Users` ENABLE KEYS */;
-UNLOCK TABLES;
-
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/bootstrap-application.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/bootstrap-application.yml
new file mode 100644
index 000000000..74c817c46
--- /dev/null
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/bootstrap-application.yml
@@ -0,0 +1,200 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+server:
+ port: 9195
+ address: 0.0.0.0
+
+spring:
+ main:
+ allow-bean-definition-overriding: true
+ application:
+ name: shenyu-bootstrap
+ codec:
+ max-in-memory-size: 2MB
+ cloud:
+ discovery:
+ enabled: false
+ nacos:
+ discovery:
+ server-addr: 127.0.0.1:8848 # Spring Cloud Alibaba Dubbo use this.
+ enabled: false
+ namespace: ShenyuRegisterCenter
+
+eureka:
+ client:
+ enabled: false
+ serviceUrl:
+ defaultZone: http://localhost:8761/eureka/
+ instance:
+ prefer-ip-address: true
+
+management:
+ health:
+ redis:
+ enabled: false
+ elasticsearch:
+ enabled: false
+ endpoint:
+ health:
+ enabled: true
+ show-details: always
+ endpoints:
+ web:
+ exposure:
+ include: "*" # or health,info
+
+
+shenyu:
+ selectorMatchCache:
+ cache:
+ enabled: false
+ initialCapacity: 10000 # initial capacity in cache
+ maximumSize: 10000 # max size in cache
+ trie:
+ enabled: false
+ cacheSize: 128 # the number of plug-ins
+ matchMode: antPathMatch
+ ruleMatchCache:
+ cache:
+ enabled: true
+ initialCapacity: 10000 # initial capacity in cache
+ maximumSize: 65536 # max size in cache
+ trie:
+ enabled: false
+ cacheSize: 1024 # the number of selectors
+ matchMode: antPathMatch
+ netty:
+ http:
+ webServerFactoryEnabled: true
+ selectCount: 1
+ workerCount: 8
+ accessLog: false
+ serverSocketChannel:
+ soRcvBuf: 87380
+ soBackLog: 128
+ soReuseAddr: false
+ connectTimeoutMillis: 10000
+ writeBufferHighWaterMark: 65536
+ writeBufferLowWaterMark: 32768
+ writeSpinCount: 16
+ autoRead: false
+ allocType: "pooled"
+ messageSizeEstimator: 8
+ singleEventExecutorPerGroup: true
+ socketChannel:
+ soKeepAlive: false
+ soReuseAddr: false
+ soLinger: -1
+ tcpNoDelay: true
+ soRcvBuf: 87380
+ soSndBuf: 16384
+ ipTos: 0
+ allowHalfClosure: false
+ connectTimeoutMillis: 10000
+ writeBufferHighWaterMark: 65536
+ writeBufferLowWaterMark: 32768
+ writeSpinCount: 16
+ autoRead: false
+ allocType: "pooled"
+ messageSizeEstimator: 8
+ singleEventExecutorPerGroup: true
+ sni:
+ enabled: false
+ mod: k8s #manul
+ defaultK8sSecretNamespace: shenyu-ingress
+ defaultK8sSecretName: default-cert
+ register:
+ enabled: false
+ registerType: zookeeper #etcd #consul
+ serverLists: localhost:2181 #http://localhost:2379 #localhost:8848
+ props:
+ cross:
+ enabled: true
+ allowedHeaders:
+ allowedMethods: "*"
+ allowedAnyOrigin: true # the same of Access-Control-Allow-Origin: "*"
+ allowedExpose: ""
+ maxAge: "18000"
+ allowCredentials: true
+
+ switchConfig:
+ local: true
+ collapseSlashes: false
+ file:
+ enabled: true
+ maxSize : 10
+ sync:
+ websocket:
+ urls: ws://localhost:9095/websocket
+ allowOrigin: ws://localhost:9195
+ exclude:
+ enabled: false
+ paths:
+ - /favicon.ico
+ fallback:
+ enabled: false
+ paths:
+ - /fallback/hystrix
+ - /fallback/resilience4j
+ - /fallback/sentinel
+ health:
+ enabled: true
+ paths:
+ - /actuator
+ - /health_check
+ extPlugin:
+ path:
+ enabled: true
+ threads: 1
+ scheduleTime: 300
+ scheduleDelay: 30
+ scheduler:
+ enabled: false
+ type: fixed
+ threads: 16
+ upstreamCheck:
+ enabled: false
+ poolSize: 10
+ timeout: 3000
+ healthyThreshold: 1
+ unhealthyThreshold: 1
+ interval: 5000
+ printEnabled: true
+ printInterval: 60000
+ springCloudCache:
+ enabled: false
+ ribbon:
+ serverListRefreshInterval: 10000
+ metrics:
+ enabled: false
+ name : prometheus
+ host: 127.0.0.1
+ port: 8090
+ jmxConfig:
+ props:
+ jvm_enabled: true
+ local:
+ enabled: false
+ sha512Key:
"BA3253876AED6BC22D4A6FF53D8406C6AD864195ED144AB5C87621B6C233B548BAEAE6956DF346EC8C17F5EA10F35EE3CBC514797ED7DDD3145464E2A0BAB413"
+
+logging:
+ level:
+ root: info
+ org.springframework.boot: info
+ org.apache.ibatis: info
+ org.apache.shenyu.bonuspoint: info
+ org.apache.shenyu.lottery: info
+ org.apache.shenyu: info
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
index ab8c14874..3b0b7eacc 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/resources/docker-compose.mysql.yml
@@ -25,7 +25,6 @@ services:
- 2181
nacos:
-# image: nacos/nacos-server:v2.2.3-slim
image: nacos/nacos-server:v2.2.3
environment:
- TZ=Asia/Shanghai
@@ -40,7 +39,7 @@ services:
- "9849:9849"
admin:
- image: apache/shenyu-admin:latest
+ image: shenyu/admin:latest
expose:
- 9095
ports:
@@ -56,10 +55,10 @@ services:
retries: 3
start_period: 5s
depends_on:
- apollo-portal:
+ springcloud:
condition: service_healthy
volumes:
- -
../../../../../shenyu-admin/target/classes/application.yml:/opt/shenyu-admin/conf/application.yml
+ -
../../target/test-classes/admin-application.yml:/opt/shenyu-admin/conf/application.yml
-
/tmp/shenyu-e2e/mysql/mysql-connector.jar:/opt/shenyu-admin/ext-lib/mysql-connector.jar
eureka:
@@ -69,8 +68,11 @@ services:
- 8761
ports:
- "8761:8761"
- depends_on:
- - admin
+ healthcheck:
+ test: [ "CMD-SHELL", "wget -q -O - http://eureka:8761/actuator/health |
grep UP || exit 1" ]
+ timeout: 2s
+ retries: 3
+ start_period: 5s
springcloud:
image: shenyu-examples-springcloud:latest
@@ -83,10 +85,16 @@ services:
ports:
- "8884:8884"
depends_on:
- - eureka
+ eureka:
+ condition: service_healthy
+ healthcheck:
+ test: [ "CMD-SHELL", "wget -q -O -
http://springcloud:8884/actuator/health | grep UP || exit 1" ]
+ timeout: 2s
+ retries: 5
+ start_period: 8s
gateway:
- image: apache/shenyu-bootstrap:latest
+ image: shenyu/bootstrap:latest
environment:
- eureka.client.serviceUrl.defaultZone=http://eureka:8761/eureka/
expose:
@@ -97,7 +105,7 @@ services:
admin:
condition: service_healthy
volumes:
- -
../../../../../shenyu-bootstrap/target/classes/application.yml:/opt/shenyu-bootstrap/conf/application.yml
+ -
../../target/test-classes/bootstrap-application.yml:/opt/shenyu-bootstrap/conf/application.yml
mysql:
image: mysql:8
@@ -111,72 +119,4 @@ services:
timeout: 20s
retries: 10
volumes:
- - ./apolloconfigdb.sql:/docker-entrypoint-initdb.d/apolloconfigdb.sql
- - ./apolloportaldb.sql:/docker-entrypoint-initdb.d/apolloportaldb.sql
- - /tmp/shenyu-e2e/mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql
-
- apollo-configservice:
- image: apolloconfig/apollo-configservice:2.1.0
- restart: always
- ports:
- - "8080:8080"
- environment:
- - TZ='Asia/Shanghai'
- - SERVER_PORT=8080
- - EUREKA_INSTANCE_IP_ADDRESS=localhost
- - EUREKA_INSTANCE_HOME_PAGE_URL=http://apollo-configservice:8080
- -
SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/ApolloConfigDB?characterEncoding=utf8&serverTimezone=Asia/Shanghai
- - SPRING_DATASOURCE_USERNAME=shenyue2e
- - SPRING_DATASOURCE_PASSWORD=123456
- healthcheck:
- test: [ "CMD", "curl", "-f", "http://apollo-configservice:8080/health"; ]
- interval: 10s
- timeout: 5s
- retries: 10
- depends_on:
- mysql:
- condition: service_healthy
-
- apollo-adminservice:
- image: apolloconfig/apollo-adminservice:2.1.0
- restart: always
- ports:
- - "8090:8090"
- depends_on:
- apollo-configservice:
- condition: service_healthy
- environment:
- - TZ='Asia/Shanghai'
- - SERVER_PORT=8090
- -
SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/ApolloConfigDB?characterEncoding=utf8&serverTimezone=Asia/Shanghai
- - SPRING_DATASOURCE_USERNAME=shenyue2e
- - SPRING_DATASOURCE_PASSWORD=123456
- healthcheck:
- test: [ "CMD", "curl", "-f", "http://localhost:8090/health"; ]
- interval: 10s
- timeout: 5s
- retries: 10
-
- apollo-portal:
- image: apolloconfig/apollo-portal:2.1.0
- restart: always
- ports:
- - "8070:8070"
- depends_on:
- apollo-adminservice:
- condition: service_healthy
- environment:
- - TZ='Asia/Shanghai'
- - SERVER_PORT=8070
- - EUREKA_INSTANCE_IP_ADDRESS=apollo-configservice
- - APOLLO_PORTAL_ENVS=dev
- - DEV_META=http://apollo-configservice:8080
- -
SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/ApolloPortalDB?characterEncoding=utf8&serverTimezone=Asia/Shanghai
- - SPRING_DATASOURCE_USERNAME=shenyue2e
- - SPRING_DATASOURCE_PASSWORD=123456
- healthcheck:
- test: [ "CMD", "curl", "-f", "http://localhost:8070/health"; ]
- interval: 10s
- timeout: 5s
- retries: 10
- start_period: 90s
+ - /tmp/shenyu-e2e/mysql/schema.sql:/docker-entrypoint-initdb.d/schema.sql
\ No newline at end of file
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 acbff7a5d..d3ffc4fc4 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
@@ -458,13 +458,14 @@ public class AdminClient {
return rst;
}
-
+
/**
- * start plugin.
+ * change plugin status.
+ *
* @param id id
* @param formData formData
*/
- public void startPlugin(final String id, final MultiValueMap<String,
String> formData) {
+ public void changePluginStatus(final String id, final
MultiValueMap<String, String> formData) {
putResource("/plugin", id, SelectorDTO.class, formData);
}
diff --git
a/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/model/data/RuleCacheData.java
b/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/model/data/RuleCacheData.java
index 370ae399e..970420fbf 100644
---
a/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/model/data/RuleCacheData.java
+++
b/shenyu-e2e/shenyu-e2e-common/src/main/java/org/apache/shenyu/e2e/model/data/RuleCacheData.java
@@ -65,7 +65,7 @@ public class RuleCacheData {
/**
* logged.
*/
- private Boolean logged;
+ private Boolean loged;
/**
* handle message（different plugin have different handle to mark ,json
style）.
@@ -106,7 +106,7 @@ public class RuleCacheData {
this.matchMode = builder.matchMode;
this.sort = builder.sort;
this.enabled = builder.enabled;
- this.logged = builder.loged;
+ this.loged = builder.loged;
this.handle = builder.handle;
this.conditionDataList = builder.conditionDataList;
this.beforeConditionDataList = builder.beforeConditionDataList;
@@ -267,18 +267,18 @@ public class RuleCacheData {
*
* @return loged
*/
- public Boolean getLogged() {
- return logged;
+ public Boolean getLoged() {
+ return loged;
}
/**
* set loged.
*
- * @param logged loged
+ * @param loged loged
* @return this
*/
- public RuleCacheData setLogged(final Boolean logged) {
- this.logged = logged;
+ public RuleCacheData setLogged(final Boolean loged) {
+ this.loged = loged;
return this;
}
@@ -374,7 +374,7 @@ public class RuleCacheData {
&& Objects.equals(matchMode, ruleCacheData.matchMode)
&& Objects.equals(sort, ruleCacheData.sort)
&& Objects.equals(enabled, ruleCacheData.enabled)
- && Objects.equals(logged, ruleCacheData.logged)
+ && Objects.equals(loged, ruleCacheData.loged)
&& Objects.equals(handle, ruleCacheData.handle)
&& Objects.equals(conditionDataList,
ruleCacheData.conditionDataList)
&& Objects.equals(beforeConditionDataList,
ruleCacheData.beforeConditionDataList)
@@ -383,7 +383,7 @@ public class RuleCacheData {
@Override
public int hashCode() {
- return Objects.hash(id, name, pluginName, selectorId, matchMode, sort,
enabled, logged, handle, conditionDataList,
+ return Objects.hash(id, name, pluginName, selectorId, matchMode, sort,
enabled, loged, handle, conditionDataList,
beforeConditionDataList, matchRestful);
}
@@ -409,7 +409,7 @@ public class RuleCacheData {
+ ", enabled="
+ enabled
+ ", loged="
- + logged
+ + loged
+ ", handle='"
+ handle
+ '\''
diff --git
a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/DockerServiceCompose.java
b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/DockerServiceCompose.java
index ec84827ac..a838a24b8 100644
---
a/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/DockerServiceCompose.java
+++
b/shenyu-e2e/shenyu-e2e-engine/src/main/java/org/apache/shenyu/e2e/engine/service/DockerServiceCompose.java
@@ -29,19 +29,21 @@ import
org.apache.shenyu.e2e.engine.config.ShenYuEngineConfigure.DockerConfigure
import org.apache.shenyu.e2e.engine.handler.DataSyncHandler;
import org.apache.shenyu.e2e.engine.service.docker.DockerComposeFile;
import org.apache.shenyu.e2e.engine.service.docker.ShenYuLogConsumer;
+import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.util.ResourceUtils;
import org.testcontainers.containers.ContainerState;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.shaded.org.yaml.snakeyaml.DumperOptions;
import org.testcontainers.shaded.org.yaml.snakeyaml.Yaml;
-import java.io.IOException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -55,9 +57,9 @@ public class DockerServiceCompose implements ServiceCompose {
private static final Logger log =
LoggerFactory.getLogger(DockerServiceCompose.class);
- private static final String GATEWAY_YML_LOCATION =
"../../../shenyu-bootstrap/target/classes/application.yml";
+ private static final String GATEWAY_YML_LOCATION =
"classpath:./bootstrap-application.yml";
- private static final String ADMIN_YML_LOCATION =
"../../../shenyu-admin/target/classes/application.yml";
+ private static final String ADMIN_YML_LOCATION =
"classpath:./admin-application.yml";
private final DockerComposeContainer<?> container;
@@ -206,7 +208,13 @@ public class DockerServiceCompose implements
ServiceCompose {
if (Objects.isNull(value)) {
return;
}
- try (InputStream inputStream =
Files.newInputStream(Paths.get(GATEWAY_YML_LOCATION))) {
+ try {
+ final File file = Assertions.assertDoesNotThrow(
+ () -> ResourceUtils.getFile(GATEWAY_YML_LOCATION)
+ );
+ final InputStream inputStream = Assertions.assertDoesNotThrow(
+ () -> new FileInputStream(file)
+ );
Yaml yaml = new Yaml();
Map<String, Object> yamlData = yaml.load(inputStream);
String[] sonValues = value.split(",");
@@ -223,10 +231,11 @@ public class DockerServiceCompose implements
ServiceCompose {
options.setExplicitStart(true);
options.setDefaultScalarStyle(DumperOptions.ScalarStyle.PLAIN);
yaml = new Yaml(options);
- try (OutputStream outputStream =
Files.newOutputStream(Paths.get(GATEWAY_YML_LOCATION))) {
- yaml.dump(yamlData, new OutputStreamWriter(outputStream));
- }
- } catch (IOException e) {
+ final OutputStream outputStream = Assertions.assertDoesNotThrow(
+ () -> new FileOutputStream(file)
+ );
+ yaml.dump(yamlData, new OutputStreamWriter(outputStream));
+ } catch (Exception e) {
log.error(e.getMessage(), e);
}
}
@@ -256,7 +265,17 @@ public class DockerServiceCompose implements
ServiceCompose {
*/
@SuppressWarnings("unchecked")
private void chooseDataSyn(final String path, final DockerServiceConfigure
dockerServiceConfigure) {
- try (InputStream inputStream = Files.newInputStream(Paths.get(path))) {
+ String value =
dockerServiceConfigure.getProperties().getProperty("dataSyn");
+ if (Objects.isNull(value)) {
+ return;
+ }
+ try {
+ final File file = Assertions.assertDoesNotThrow(
+ () -> ResourceUtils.getFile(path)
+ );
+ final InputStream inputStream = Assertions.assertDoesNotThrow(
+ () -> new FileInputStream(file)
+ );
Yaml yaml = new Yaml();
Map<String, Object> yamlData = yaml.load(inputStream);
Map<String, Object> shenyuParameter = (Map<String, Object>)
yamlData.get("shenyu");
@@ -276,11 +295,11 @@ public class DockerServiceCompose implements
ServiceCompose {
options.setExplicitStart(true);
options.setDefaultScalarStyle(DumperOptions.ScalarStyle.PLAIN);
yaml = new Yaml(options);
- try (OutputStream outputStream =
Files.newOutputStream(Paths.get(path))) {
- yaml.dump(yamlData, new OutputStreamWriter(outputStream));
- log.info("YAML file modified successfully.");
- }
- } catch (IOException e) {
+ final OutputStream outputStream = Assertions.assertDoesNotThrow(
+ () -> new FileOutputStream(file)
+ );
+ yaml.dump(yamlData, new OutputStreamWriter(outputStream));
+ } catch (Exception e) {
log.error(e.getMessage(), e);
}
}
