From 18bbd42b0df2493df0b4af4bf6101a1224527d89 Mon Sep 17 00:00:00 2001 From: xiongchun <18616786188@qq.com> Date: Thu, 28 Apr 2022 10:55:16 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E7=A7=BB=E9=99=A4Apache=20ShenYu=20?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=B0=86=E7=BC=BA=E7=9C=81=E7=BD=91?= =?UTF-8?q?=E5=85=B3=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=BApangu-webapi=E6=A8=A1=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 16 +- .../webapi/local/service/DemoService.java | 2 - pangu-gateway-spring-boot-starter/LICENSE | 201 ------------------ pangu-gateway-spring-boot-starter/README.md | 9 - pangu-gateway-spring-boot-starter/pom.xml | 165 -------------- .../GatewayAutoConfiguration.java | 38 ---- .../autoconfigure/GatewayProperties.java | 32 --- .../main/resources/META-INF/spring.factories | 19 -- pom.xml | 1 - 9 files changed, 14 insertions(+), 469 deletions(-) delete mode 100644 pangu-gateway-spring-boot-starter/LICENSE delete mode 100644 pangu-gateway-spring-boot-starter/README.md delete mode 100644 pangu-gateway-spring-boot-starter/pom.xml delete mode 100644 pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayAutoConfiguration.java delete mode 100644 pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayProperties.java delete mode 100644 pangu-gateway-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/pangu-examples/pangu-examples-webapi-gateway-based/pom.xml b/pangu-examples/pangu-examples-webapi-gateway-based/pom.xml index 4d94a219a..0ed988a92 100644 --- a/pangu-examples/pangu-examples-webapi-gateway-based/pom.xml +++ b/pangu-examples/pangu-examples-webapi-gateway-based/pom.xml @@ -22,8 +22,20 @@ pangu-spring-boot-starter - com.gitee.pulanos.pangu - pangu-gateway-spring-boot-starter + org.springframework.boot + spring-boot-starter-webflux + + + org.apache.shenyu + shenyu-spring-boot-starter-gateway + + + org.apache.shenyu + shenyu-spring-boot-starter-sync-data-websocket + + + org.apache.shenyu + shenyu-spring-boot-starter-plugin-apache-dubbo com.gitee.pulanos.pangu diff --git a/pangu-examples/pangu-examples-webapi-local-service-based/src/main/java/com/gitee/pulanos/pangu/showcases/webapi/local/service/DemoService.java b/pangu-examples/pangu-examples-webapi-local-service-based/src/main/java/com/gitee/pulanos/pangu/showcases/webapi/local/service/DemoService.java index bdb3c0b5b..5120ab830 100644 --- a/pangu-examples/pangu-examples-webapi-local-service-based/src/main/java/com/gitee/pulanos/pangu/showcases/webapi/local/service/DemoService.java +++ b/pangu-examples/pangu-examples-webapi-local-service-based/src/main/java/com/gitee/pulanos/pangu/showcases/webapi/local/service/DemoService.java @@ -17,12 +17,10 @@ package com.gitee.pulanos.pangu.showcases.webapi.local.service; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.gitee.pulanos.pangu.showcases.webapi.local.dao.entity.UserEntity; import com.gitee.pulanos.pangu.showcases.webapi.local.dao.mapper.UserMapper; -import com.gitee.pulanos.pangu.showcases.webapi.local.param.CaseIn; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/pangu-gateway-spring-boot-starter/LICENSE b/pangu-gateway-spring-boot-starter/LICENSE deleted file mode 100644 index 261eeb9e9..000000000 --- a/pangu-gateway-spring-boot-starter/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - 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. diff --git a/pangu-gateway-spring-boot-starter/README.md b/pangu-gateway-spring-boot-starter/README.md deleted file mode 100644 index e7fdc45e7..000000000 --- a/pangu-gateway-spring-boot-starter/README.md +++ /dev/null @@ -1,9 +0,0 @@ -### 介绍 - -[盘古开发框架](https://pulanos.gitee.io/pangu-framework/) 是完全独立于 Spring Cloud 生态的一套轻量灵活、成熟可靠的工业级分布式微服务开发和治理框架（兼容垂直单体分层架构)。它基于 Apache-2.0 协议**开源**发布，且是**免费**的。我们希望不仅是开源的受益者，也能成为开源的贡献者，与开源社区一起「共建共享开源生态」。 - -### 更多资源 - -:maple_leaf: [项目主页&开发指南（主）](https://pulanos.gitee.io/pangu-framework/) -:leaves: [项目主页&开发指南（备）](https://xiongchun.github.io/pangu-framework/) -:sunflower: [开发范例集合](https://pulanos.gitee.io/pangu-framework/docs/examples-list) \ No newline at end of file diff --git a/pangu-gateway-spring-boot-starter/pom.xml b/pangu-gateway-spring-boot-starter/pom.xml deleted file mode 100644 index 34a6c9f50..000000000 --- a/pangu-gateway-spring-boot-starter/pom.xml +++ /dev/null @@ -1,165 +0,0 @@ - - - 4.0.0 - - - com.gitee.pulanos.pangu - pangu-parent - 5.1.0 - - - - com.gitee.pulanos.pangu - pangu-gateway-spring-boot-starter - 5.1.0 - jar - pangu-gateway-spring-boot-starter - pangu-gateway-spring-boot-starter - https://gitee.com/pulanos/pangu-framework - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://gitee.com/pulanos/pangu-framework.git - scm:https://gitee.com/pulanos/pangu-framework.git - scm:https://gitee.com/pulanos/pangu-framework.git - - - - - xiongchun - 307916217@qq.com - - - - - - - - - org.springframework.boot - spring-boot-starter-webflux - - - org.apache.shenyu - shenyu-spring-boot-starter-gateway - - - org.apache.shenyu - shenyu-spring-boot-starter-sync-data-websocket - - - org.apache.shenyu - shenyu-spring-boot-starter-plugin-apache-dubbo - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - true - - - - compile - - jar - - - - - - - - - - default - - - aliyun - https://maven.aliyun.com/repository/public - - - - true - - - - release - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - -Xdoclint:none - - - - - package - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - verify - - sign - - - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - \ No newline at end of file diff --git a/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayAutoConfiguration.java b/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayAutoConfiguration.java deleted file mode 100644 index 51182057c..000000000 --- a/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayAutoConfiguration.java +++ /dev/null @@ -1,38 +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 com.gitee.pulanos.pangu.framework.starter.gateway.autoconfigure; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -/** - * GatewayAutoConfiguration - * - * @author xiongchun - */ -@Slf4j -@Configuration -@EnableConfigurationProperties(GatewayProperties.class) -public class GatewayAutoConfiguration { - - @Autowired - private GatewayProperties gatewayProperties; - -} diff --git a/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayProperties.java b/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayProperties.java deleted file mode 100644 index 98aff2e00..000000000 --- a/pangu-gateway-spring-boot-starter/src/main/java/com/gitee/pulanos/pangu/framework/starter/gateway/autoconfigure/GatewayProperties.java +++ /dev/null @@ -1,32 +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 com.gitee.pulanos.pangu.framework.starter.gateway.autoconfigure; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * JdbcProperties - * - * @author xiongchun - */ -@Data -@ConfigurationProperties(prefix = "pangu.gateway") -public class GatewayProperties { - -} diff --git a/pangu-gateway-spring-boot-starter/src/main/resources/META-INF/spring.factories b/pangu-gateway-spring-boot-starter/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 6781feb87..000000000 --- a/pangu-gateway-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,19 +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. -# - -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.gitee.pulanos.pangu.framework.starter.gateway.autoconfigure.GatewayAutoConfiguration \ No newline at end of file diff --git a/pom.xml b/pom.xml index a85f54497..e32eb995a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,6 @@ pangu-jdbc-spring-boot-starter pangu-cache-spring-boot-starter pangu-dubbo-spring-boot-starter - pangu-gateway-spring-boot-starter pangu-web-spring-boot-starter pangu-rabbitmq-spring-boot-starter pangu-seata-spring-boot-starter -- GitLab