-
Notifications
You must be signed in to change notification settings - Fork 179
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request !251 from 码匠君/develop
- Loading branch information
Showing
138 changed files
with
2,448 additions
and
2,318 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-12.3 KB
configurations/backup/alibaba/3.3.5.0/nacos_config_export_20240531173140.zip
Binary file not shown.
File renamed without changes.
Binary file removed
BIN
-13 KB
configurations/backup/tencent/3.3.5.0/polaris_config_202405311904.zip
Binary file not shown.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| VERSION=3.3.5.1 | ||
| VERSION=3.3.6.0 | ||
| SPRING_PROFILES_ACTIVE=alibaba | ||
| PROFILE=development | ||
| DATABASE=postgresql | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/linux/herodotus/env.oss.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| VERSION=3.3.5.1 | ||
| VERSION=3.3.6.0 | ||
| SPRING_PROFILES_ACTIVE=alibaba | ||
| PROFILE=development | ||
| DATABASE=postgresql | ||
|
|
||
2 changes: 1 addition & 1 deletion
2
configurations/docker/docker-compose/windows/herodotus/env.oss.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,27 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
| ~ Copyright 2020-2030 码匠君<[email protected]> | ||
| ~ | ||
| ~ Copyright (c) 2020-2030 郑庚伟 ZHENGGENGWEI (码匠君), <[email protected]> Licensed under the AGPL License | ||
| ~ Dante Cloud licensed 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 | ||
| ~ | ||
| ~ This file is part of Dante Cloud. | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Dante Cloud is free software: you can redistribute it and/or modify | ||
| ~ it under the terms of the GNU Affero General Public License as published | ||
| ~ by the Free Software Foundation, either version 3 of the License, or | ||
| ~ (at your option) any later version. | ||
| ~ 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. | ||
| ~ | ||
| ~ Dante Cloud is distributed in the hope that it will be useful, | ||
| ~ but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| ~ GNU Affero General Public License for more details. | ||
| ~ Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： | ||
| ~ | ||
| ~ You should have received a copy of the GNU Affero General Public License | ||
| ~ along with this program. If not, see <https://www.herodotus.cn>. | ||
| ~ 1. 请不要删除和修改根目录下的LICENSE文件。 | ||
| ~ 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 | ||
| ~ 3. 请保留源码和相关描述文件的项目出处，作者声明等。 | ||
| ~ 4. 分发源码时候，请注明软件出处 <https://gitee.com/dromara/dante-cloud> | ||
| ~ 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 <https://gitee.com/dromara/dante-cloud> | ||
| ~ 6. 若您的项目无法满足以上几点，可申请商业授权 | ||
| --> | ||
|
|
||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
|
|
@@ -28,7 +32,7 @@ | |
| <parent> | ||
| <artifactId>modules</artifactId> | ||
| <groupId>org.dromara.dante</groupId> | ||
| <version>3.3.5.1</version> | ||
| <version>3.3.6.0</version> | ||
| </parent> | ||
|
|
||
| <artifactId>dante-module-common</artifactId> | ||
|
|
||
30 changes: 17 additions & 13 deletions
30
...nte-module-common/src/main/java/org/dromara/dante/module/common/ServiceNameConstants.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,26 @@ | ||
| /* | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | ||
| * Copyright 2020-2030 码匠君<[email protected]> | ||
| * | ||
| * Copyright (c) 2020-2030 郑庚伟 ZHENGGENGWEI (码匠君), <[email protected]> Licensed under the AGPL License | ||
| * Dante Cloud licensed 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 | ||
| * | ||
| * This file is part of Dante Cloud. | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Dante Cloud is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published | ||
| * by the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * 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. | ||
| * | ||
| * Dante Cloud is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * Dante Cloud 采用 APACHE LICENSE 2.0 开源协议，您在使用过程中，需要注意以下几点： | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <https://www.herodotus.cn>. | ||
| * 1. 请不要删除和修改根目录下的LICENSE文件。 | ||
| * 2. 请不要删除和修改 Dante Cloud 源码头部的版权声明。 | ||
| * 3. 请保留源码和相关描述文件的项目出处，作者声明等。 | ||
| * 4. 分发源码时候，请注明软件出处 <https://gitee.com/dromara/dante-cloud> | ||
| * 5. 在修改包名，模块名称，项目代码等时，请注明软件出处 <https://gitee.com/dromara/dante-cloud> | ||
| * 6. 若您的项目无法满足以上几点，可申请商业授权 | ||
| */ | ||
|
|
||
| package org.dromara.dante.module.common; | ||
|
|
||
Oops, something went wrong.