Skip to content

Commit 8046ec3

Browse files
committed
revert(sql): rollback manual 2.5.0 sql sync
1 parent f40d143 commit 8046ec3

File tree

2 files changed

+16
-51
lines changed

2 files changed

+16
-51
lines changed

sql/apolloconfigdb.sql

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--
2-
-- Copyright 2024 Apollo Authors
2+
-- Copyright 2023 Apollo Authors
33
--
44
-- Licensed under the Apache License, Version 2.0 (the "License");
55
-- you may not use this file except in compliance with the License.
@@ -21,18 +21,8 @@
2121
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
2222
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
2323

24-
--
25-
-- ===============================================================================
26-
-- == ==
27-
-- == Generated from 'scripts/sql/src/' ==
28-
-- == by running 'mvn compile -pl apollo-build-sql-converter -Psql-converter'. ==
29-
-- == DO NOT EDIT !!! ==
30-
-- == ==
31-
-- ===============================================================================
32-
--
33-
--
34-
-- Create Database
35-
-- ------------------------------------------------------------
24+
# Create Database
25+
# ------------------------------------------------------------
3626
CREATE DATABASE IF NOT EXISTS ApolloConfigDB DEFAULT CHARACTER SET = utf8mb4;
3727

3828
Use ApolloConfigDB;
@@ -494,24 +484,16 @@ CREATE TABLE `AuditLogDataInfluence` (
494484
KEY `IX_EntityId` (`InfluenceEntityId`)
495485
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
496486

497-
-- Config
498-
-- ------------------------------------------------------------
487+
488+
# Config
489+
# ------------------------------------------------------------
499490
INSERT INTO `ServerConfig` (`Key`, `Cluster`, `Value`, `Comment`)
500491
VALUES
501492
('eureka.service.url', 'default', 'http://localhost:8080/eureka/', 'Eureka服务Url,多个service以英文逗号分隔'),
502493
('namespace.lock.switch', 'default', 'false', '一次发布只能有一个人修改开关'),
503494
('item.key.length.limit', 'default', '128', 'item key 最大长度限制'),
504495
('item.value.length.limit', 'default', '20000', 'item value最大长度限制'),
505-
('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存,开启后能提高性能,但是会增大内存消耗!'),
506-
('config-service.incremental.change.enabled', 'default', 'false', 'ConfigService是否开启增量配置同步客户端,开启后能提高性能,但是会增大内存消耗!');
507-
--
508-
-- ===============================================================================
509-
-- == ==
510-
-- == Generated from 'scripts/sql/src/' ==
511-
-- == by running 'mvn compile -pl apollo-build-sql-converter -Psql-converter'. ==
512-
-- == DO NOT EDIT !!! ==
513-
-- == ==
514-
-- ===============================================================================
496+
('config-service.cache.enabled', 'default', 'false', 'ConfigService是否开启缓存,开启后能提高性能,但是会增大内存消耗!');
515497

516498
# Sample Data
517499
# ------------------------------------------------------------
@@ -531,6 +513,7 @@ INSERT INTO `Namespace` (`Id`, `AppId`, `ClusterName`, `NamespaceName`)
531513
VALUES
532514
(1, 'SampleApp', 'default', 'application');
533515

516+
534517
INSERT INTO `Item` (`NamespaceId`, `Key`, `Value`, `Comment`, `LineNum`)
535518
VALUES
536519
(1, 'timeout', '100', 'sample timeout配置', 1);

sql/apolloportaldb.sql

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--
2-
-- Copyright 2024 Apollo Authors
2+
-- Copyright 2023 Apollo Authors
33
--
44
-- Licensed under the Apache License, Version 2.0 (the "License");
55
-- you may not use this file except in compliance with the License.
@@ -21,18 +21,8 @@
2121
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
2222
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
2323

24-
--
25-
-- ===============================================================================
26-
-- == ==
27-
-- == Generated from 'scripts/sql/src/' ==
28-
-- == by running 'mvn compile -pl apollo-build-sql-converter -Psql-converter'. ==
29-
-- == DO NOT EDIT !!! ==
30-
-- == ==
31-
-- ===============================================================================
32-
--
33-
--
34-
-- Create Database
35-
-- ------------------------------------------------------------
24+
# Create Database
25+
# ------------------------------------------------------------
3626
CREATE DATABASE IF NOT EXISTS ApolloPortalDB DEFAULT CHARACTER SET = utf8mb4;
3727

3828
Use ApolloPortalDB;
@@ -427,12 +417,13 @@ CREATE TABLE `AuditLogDataInfluence` (
427417
KEY `IX_EntityId` (`InfluenceEntityId`)
428418
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='审计日志数据变动表';
429419

430-
-- Config
431-
-- ------------------------------------------------------------
420+
421+
# Config
422+
# ------------------------------------------------------------
432423
INSERT INTO `ServerConfig` (`Key`, `Value`, `Comment`)
433424
VALUES
434425
('apollo.portal.envs', 'dev', '可支持的环境列表'),
435-
('organizations', '[{"orgId":"TEST1","orgName":"样例部门1"},{"orgId":"TEST2","orgName":"样例部门2"}]', '部门列表'),
426+
('organizations', '[{\"orgId\":\"TEST1\",\"orgName\":\"样例部门1\"},{\"orgId\":\"TEST2\",\"orgName\":\"样例部门2\"}]', '部门列表'),
436427
('superAdmin', 'apollo', 'Portal超级管理员'),
437428
('api.readTimeout', '10000', 'http接口read timeout'),
438429
('consumer.token.salt', 'someSalt', 'consumer token salt'),
@@ -443,19 +434,10 @@ VALUES
443434

444435
INSERT INTO `Users` (`Username`, `Password`, `UserDisplayName`, `Email`, `Enabled`)
445436
VALUES
446-
('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
437+
('apollo', '$2a$10$7r20uS.BQ9uBpf3Baj3uQOZvMVvB1RN3PYoKE94gtz2.WAOuiiwXS', 'apollo', 'apollo@acme.com', 1);
447438

448439
INSERT INTO `Authorities` (`Username`, `Authority`) VALUES ('apollo', 'ROLE_user');
449440

450-
--
451-
-- ===============================================================================
452-
-- == ==
453-
-- == Generated from 'scripts/sql/src/' ==
454-
-- == by running 'mvn compile -pl apollo-build-sql-converter -Psql-converter'. ==
455-
-- == DO NOT EDIT !!! ==
456-
-- == ==
457-
-- ===============================================================================
458-
459441
# Sample Data
460442
# ------------------------------------------------------------
461443
INSERT INTO `App` (`AppId`, `Name`, `OrgId`, `OrgName`, `OwnerName`, `OwnerEmail`)

0 commit comments

Comments
 (0)