diff --git a/.editorconfig b/.editorconfig index 42dd07a2..48a40c43 100755 --- a/.editorconfig +++ b/.editorconfig @@ -1,24 +1,6 @@ -root = true +root=true -# 对所有文件生效 -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -# 对java, xml文件生效 -[*.{java, xml}] +[*.{groovy,java,kt,xml}] indent_style = tab indent_size = 4 - -# 对yml, json文件生效 -[*.{yml, json}] -indent_style = space -indent_size = 2 - -# 对后缀名为 .md 的文件生效 -[*.md] -trim_trailing_whitespace = false +continuation_indent_size = 8 diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 7e8bc1d3..2db9a4aa 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -6,4 +6,6 @@ - 是否修改包名: +### 回显步骤 + ### 报错信息 diff --git a/.gitignore b/.gitignore index 7b5bd307..6dcb5e26 100755 --- a/.gitignore +++ b/.gitignore @@ -35,7 +35,10 @@ target/ *.tar *.tar.gz -### logs #### +### vscode ### +.vscode + +### logs ### /logs/ *.log diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 index f2f81d6d..ceee3cb6 --- a/LICENSE +++ b/LICENSE @@ -1,56 +1,202 @@ -GNU LESSER GENERAL PUBLIC LICENSE -Version 3, 29 June 2007 -Copyright © 2007 Free Software Foundation, Inc. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. + 1. Definitions. -0. Additional Definitions. -As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library. + "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. -A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work. + "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. -1. Exception to Section 3 of the GNU GPL. -You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL. + "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). -2. Conveying Modified Versions. -If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version: + "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. -a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or -b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy. -3. Object Code Incorporating Material from Library Header Files. -The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following: + "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." -a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License. -b) Accompany the object code with a copy of the GNU GPL and this license document. -4. Combined Works. -You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following: + "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. -a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License. -b) Accompany the Combined Work with a copy of the GNU GPL and this license document. -c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document. -d) Do one of the following: -0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source. -1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version. -e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.) -5. Combined Libraries. -You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following: + 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. -a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License. -b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. -6. Revised Versions of the GNU Lesser General Public License. -The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + 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. -Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation. + 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: -If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. + (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 (c) 2020 pig4cloud Authors. All Rights Reserved. + + 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/README.md b/README.md index e91c1baf..98c50bec 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

- Build Status + Build Status Build Status Coverage Status Downloads @@ -15,7 +15,7 @@ - provide lambda 、stream api 、webflux production practice -Documentation | PigX Online | PigX Paper | pig4cloud initializr +Documentation | PigX Online | PigX Paper | pig4cloud initializr #### Quickly structure microservice applications @@ -38,10 +38,10 @@ dependencies | version ---|--- Spring Boot | 2.3.3.RELEASE Spring Cloud | Hoxton.SR8 -Spring Cloud Alibaba | 2.2.1.RELEASE +Spring Cloud Alibaba | 2.2.2.RELEASE Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.4.0 -hutool | 5.4.0 +hutool | 5.4.2 Avue | 2.6.15 @@ -79,6 +79,10 @@ pig 3. mail: pig4cloud@qq.com +#### License + +pig is Open Source software released under the [Apache 2.0 license](https://www.apache.org/licenses/LICENSE-2.0.html). + #### Free Class @@ -87,7 +91,7 @@ pig - +
diff --git a/README.zh.md b/README.zh.md index 7de33da4..1f9df5fb 100644 --- a/README.zh.md +++ b/README.zh.md @@ -2,7 +2,7 @@ **中文** | [English](https://github.com/pigxcloud/pig/blob/master/README.md)

- Build Status + Build Status Build Status Coverage Status Downloads @@ -14,7 +14,7 @@ - 提供 lambda 、stream api 、webflux 的生产实践 -部署文档 | 前端解决方案 | PigX在线体验 | PigX白皮书 | pig4cloud initializr +部署文档 | 前端解决方案 | PigX在线体验 | PigX白皮书 | pig4cloud initializr #### 快速构架微服务应用 @@ -37,10 +37,10 @@ ---|--- Spring Boot | 2.3.3.RELEASE Spring Cloud | Hoxton.SR8 -Spring Cloud Alibaba | 2.2.1.RELEASE +Spring Cloud Alibaba | 2.2.2.RELEASE Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.4.0 -hutool | 5.4.0 +hutool | 5.4.2 Avue | 2.6.15 @@ -69,8 +69,10 @@ pig ├── pig-codegen -- 图形化代码生成 [5002] └── pig-sentinel-dashboard -- 流量高可用 [5003] ``` + #### 开源共建 + 1. 欢迎提交 [pull request](https://dwz.cn/2KURd5Vf),注意对应提交对应 `dev` 分支 2. 欢迎提交 [issue](https://gitee.com/log4j/pig/issues),请写清楚遇到问题的原因、开发环境、复显步骤。 @@ -79,6 +81,11 @@ pig 4. mail: pig4cloud@qq.com +#### 使用协议 + +pig 开源软件遵循 [Apache 2.0协议](https://www.apache.org/licenses/LICENSE-2.0.html)。 +允许商业使用,但务必保留类作者、Copyright 信息。 + #### 免费公开课 @@ -87,7 +94,7 @@ pig - +
diff --git a/db/pig.sql b/db/pig.sql index 9ccce891..1eb142b4 100644 --- a/db/pig.sql +++ b/db/pig.sql @@ -358,6 +358,22 @@ BEGIN; INSERT INTO `sys_user` VALUES (1, 'admin', '$2a$10$RpFJjxYiXdEsAGnWp/8fsOetMuOON96Ntk/Ym2M/RKRyU0GZseaDC', NULL, '17034642999', '', 1, '2018-04-20 07:15:18', '2019-01-31 14:29:07', '0', '0'); COMMIT; +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + -- ---------------------------- -- Table structure for sys_user_role -- ---------------------------- diff --git a/db/pig_codegen.sql b/db/pig_codegen.sql index e88e63d3..c7467f73 100644 --- a/db/pig_codegen.sql +++ b/db/pig_codegen.sql @@ -7,6 +7,22 @@ SET FOREIGN_KEY_CHECKS = 0; USE `pig_codegen`; +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + -- ---------------------------- -- Table structure for gen_datasource_conf -- ---------------------------- diff --git a/db/pig_config.sql b/db/pig_config.sql index a333afc9..0c2d8f9e 100644 --- a/db/pig_config.sql +++ b/db/pig_config.sql @@ -239,6 +239,22 @@ CREATE TABLE `users` ( PRIMARY KEY (`username`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + -- ---------------------------- -- Records of users -- ---------------------------- diff --git a/docker-compose.yml b/docker-compose.yml index 428486ea..6aa4f1a5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,15 +65,6 @@ services: hostname: pig-monitor image: pig-monitor - pig-sentinel: - build: - context: ./pig-visual/pig-sentinel-dashboard - restart: always - image: pig-sentinel - container_name: pig-sentinel - ports: - - 5003:5003 - pig-codegen: build: context: ./pig-visual/pig-codegen @@ -81,3 +72,12 @@ services: container_name: pig-codegen hostname: pig-codegen image: pig-codegen + + pig-sentinel: + build: + context: ./pig-visual/pig-sentinel-dashboard + restart: always + image: pig-sentinel + container_name: pig-sentinel + ports: + - 5003:5003 \ No newline at end of file diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index 43d869e2..8afde268 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig - 2.8.1 + 2.9.0 pig-auth @@ -46,19 +44,19 @@ com.pig4cloud pig-common-sentinel - 2.8.1 + 2.9.0 com.pig4cloud pig-upms-api - 2.8.1 + 2.9.0 com.pig4cloud pig-common-security - 2.8.1 + 2.9.0 diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/PigAuthApplication.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/PigAuthApplication.java index 234ba340..fbdb8350 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/PigAuthApplication.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/PigAuthApplication.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java index c5f3855c..6a4fd2a5 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth.config; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/WebSecurityConfigurer.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/WebSecurityConfigurer.java index 90c6a900..533d0a34 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/WebSecurityConfigurer.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/WebSecurityConfigurer.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth.config; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java index 40fb0c78..9fa61243 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth.endpoint; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java index e15dba72..cba6f628 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationFailureEvenHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth.handler; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java index a1d11ee6..dd70f8b0 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/handler/PigAuthenticationSuccessEventHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.auth.handler; diff --git a/pig-auth/src/main/resources/logback-spring.xml b/pig-auth/src/main/resources/logback-spring.xml index ab81e126..fa238198 100755 --- a/pig-auth/src/main/resources/logback-spring.xml +++ b/pig-auth/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-auth/src/main/resources/static/css/signin.css b/pig-auth/src/main/resources/static/css/signin.css index c2585221..19c9530f 100755 --- a/pig-auth/src/main/resources/static/css/signin.css +++ b/pig-auth/src/main/resources/static/css/signin.css @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ .sign_body { diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index 40a26993..7e27b827 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-common - 2.8.1 + 2.9.0 pig-common-core diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java index fdaae860..1925ec75 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/JacksonConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.config; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java index f80cab1e..4e4ba2b0 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.config; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java index 217c2d82..3ea7dd14 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RestTemplateConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.config; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java index 3e0998fd..73b0db59 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/WebMvcConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.config; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java index 0e6fcb9d..c841b82d 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CacheConstants.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java index be0707f9..d184d04e 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/CommonConstants.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java index d0571531..c51aab5b 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java index 2cfe4b24..b1b5ac71 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/ServiceNameConstants.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java index 8f844fb1..58966277 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant.enums; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java index dd403b9b..85bd2ecf 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant.enums; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java index a91bfd1d..44b2802a 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.constant.enums; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java index 4bb1cef1..28888737 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/CheckedException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.exception; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java index 03591297..b5112302 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/PigDeniedException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.exception; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java index 2c50983d..a89bcd06 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/exception/ValidateCodeException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.exception; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java index a56c6e80..699dfc57 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/jackson/PigJavaTimeModule.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.jackson; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java index 48e439f3..08913937 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/mybatis/SqlFilterArgumentResolver.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.mybatis; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java index d5f795af..6668c673 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/ClassUtils.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.util; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java index a3ec12d6..9e6425bd 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/R.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.util; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java index b5d5cc74..7c85c2d9 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/SpringContextHolder.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.util; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java index f1e0c978..94e46f28 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/util/WebUtils.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.core.util; diff --git a/pig-common/pig-common-core/src/main/resources/logback-spring.xml b/pig-common/pig-common-core/src/main/resources/logback-spring.xml index 1e7bf391..652f6d76 100755 --- a/pig-common/pig-common-core/src/main/resources/logback-spring.xml +++ b/pig-common/pig-common-core/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index 1bbd7f7b..12a337a8 100644 --- a/pig-common/pig-common-datasource/pom.xml +++ b/pig-common/pig-common-datasource/pom.xml @@ -1,20 +1,18 @@ pig-common com.pig4cloud - 2.8.1 + 2.9.0 4.0.0 diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java index 7a3f712d..d2a398f5 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java index 442ef8c3..6e18b85d 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/annotation/EnableDynamicDataSource.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource.annotation; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java index 1cbf7fe7..9dbc1494 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/DataSourceProperties.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource.config; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java index 9b40e0c5..fc253f07 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/JdbcDynamicDataSourceProvider.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource.config; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java index 4bf00d5f..e7ea493e 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/config/LastParamDsProcessor.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource.config; diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java index 2ad3dd65..625fc85f 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/support/DataSourceConstants.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.datasource.support; diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 3e197622..cb8637d7 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-common - 2.8.1 + 2.9.0 pig-common-log @@ -37,13 +35,13 @@ com.pig4cloud pig-common-core - 2.8.1 + 2.9.0 com.pig4cloud pig-upms-api - 2.8.1 + 2.9.0 diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java index 91dd8c70..071c623c 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java index 44114525..9248d236 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/annotation/SysLog.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.annotation; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java index 78f7017c..3270e4e1 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/aspect/SysLogAspect.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.aspect; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java index 4c9418b9..4e125820 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogEvent.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.event; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java index c0005609..cd217423 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.event; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java index 523ed8c1..4ccd7ab9 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/init/ApplicationLoggerInitializer.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.init; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java index 925f2546..d3754fcc 100644 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/LogTypeEnum.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + package com.pig4cloud.pig.common.log.util; import lombok.Getter; diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java index 3438285f..9d9aa5b6 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/util/SysLogUtils.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.log.util; diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index 1b971203..1e5ed29a 100755 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/pig-common/pig-common-mybatis/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-common - 2.8.1 + 2.9.0 pig-common-mybatis diff --git a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java index eb8ec006..3c33d65d 100755 --- a/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java +++ b/pig-common/pig-common-mybatis/src/main/java/com/pig4cloud/pig/common/mybatis/MybatisAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.mybatis; diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index 7ea53537..09d12883 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-common - 2.8.1 + 2.9.0 pig-common-security @@ -37,7 +35,7 @@ com.pig4cloud pig-common-core - 2.8.1 + 2.9.0 @@ -52,7 +50,7 @@ com.pig4cloud pig-upms-api - 2.8.1 + 2.9.0 diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigFeignClients.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigFeignClients.java index 58a1629d..998a4eae 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigFeignClients.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigFeignClients.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.annotation; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java index 3de01b44..8aab2058 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/EnablePigResourceServer.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.annotation; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java index f4284047..7cacd660 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/annotation/Inner.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.annotation; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java index 60013151..32d0c1a0 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermissionService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java index fc468dbc..7b2ff7d1 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PermitAllUrlProperties.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java index 156d9ffc..1454fde0 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java index b77bfcc7..469f7193 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAuth2ExceptionSerializer.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java index b23ecd38..ecfc26e5 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java index e21f8c8e..83f430cc 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigRedisTokenStore.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + package com.pig4cloud.pig.common.security.component; import cn.hutool.core.util.StrUtil; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java index 54a323a0..1cb228d0 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfigurerAdapter.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfigurerAdapter.java index 465313f9..f6e4041c 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfigurerAdapter.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerConfigurerAdapter.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerTokenRelayAutoConfiguration.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerTokenRelayAutoConfiguration.java index 3e7cf338..15ded704 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerTokenRelayAutoConfiguration.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigResourceServerTokenRelayAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityBeanDefinitionRegistrar.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityBeanDefinitionRegistrar.java index 8e39496a..0c47497d 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityBeanDefinitionRegistrar.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityBeanDefinitionRegistrar.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java index 01966835..04e236a9 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java index 5d967c92..725c25f1 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigUserAuthenticationConverter.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigWebResponseExceptionTranslator.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigWebResponseExceptionTranslator.java index b803c4e6..0f9f6273 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigWebResponseExceptionTranslator.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigWebResponseExceptionTranslator.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java index 447d2a7d..04808d8a 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.component; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ForbiddenException.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ForbiddenException.java index eb1ae385..2c3c9cbc 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ForbiddenException.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ForbiddenException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/InvalidException.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/InvalidException.java index 399f6f02..a0710257 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/InvalidException.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/InvalidException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/MethodNotAllowed.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/MethodNotAllowed.java index 3a43a39e..9c133988 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/MethodNotAllowed.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/MethodNotAllowed.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/PigAuth2Exception.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/PigAuth2Exception.java index aee1a1f6..1e6a5fe4 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/PigAuth2Exception.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/PigAuth2Exception.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ServerErrorException.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ServerErrorException.java index 7713dc28..74763120 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ServerErrorException.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/ServerErrorException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/UnauthorizedException.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/UnauthorizedException.java index bdb82c60..58ed360b 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/UnauthorizedException.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/exception/UnauthorizedException.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.exception; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java index 087baa0d..2916a2f3 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.feign; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientInterceptor.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientInterceptor.java index 8cfa931f..eea948eb 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientInterceptor.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientInterceptor.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.feign; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationFailureEvenHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationFailureEvenHandler.java index ac6e1707..7a7604cf 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationFailureEvenHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationFailureEvenHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.handler; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationSuccessEventHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationSuccessEventHandler.java index e67b95aa..75431289 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationSuccessEventHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/AbstractAuthenticationSuccessEventHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.handler; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java index 76fc02ea..6ef65654 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.handler; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigClientDetailsService.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigClientDetailsService.java index 7f1a2fcb..76894b40 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigClientDetailsService.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigClientDetailsService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.service; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java index 210c5e25..ea635bfd 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUser.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.service; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java index bbcc7c9e..890324e3 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.service; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java index 87b34222..32c6c40b 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/AuthUtils.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.util; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java index 35e9362b..d10f2c80 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/util/SecurityUtils.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.security.util; diff --git a/pig-common/pig-common-security/src/main/resources/org/springframework/security/messages_zh_CN.properties b/pig-common/pig-common-security/src/main/resources/org/springframework/security/messages_zh_CN.properties index bd370989..c2333d8e 100755 --- a/pig-common/pig-common-security/src/main/resources/org/springframework/security/messages_zh_CN.properties +++ b/pig-common/pig-common-security/src/main/resources/org/springframework/security/messages_zh_CN.properties @@ -1,19 +1,17 @@ # -# /* -# * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). -# *

-# * Licensed under the GNU Lesser General Public License 3.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# *

-# * https://www.gnu.org/licenses/lgpl.html -# *

-# * 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. -# */ +# Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. +# +# 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. # AbstractAccessDecisionManager.accessDenied=\u4E0D\u5141\u8BB8\u8BBF\u95EE AbstractLdapAuthenticationProvider.emptyPassword=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A diff --git a/pig-common/pig-common-sentinel/pom.xml b/pig-common/pig-common-sentinel/pom.xml index d929dc81..38dd98cd 100755 --- a/pig-common/pig-common-sentinel/pom.xml +++ b/pig-common/pig-common-sentinel/pom.xml @@ -1,11 +1,27 @@ + + com.pig4cloud pig-common - 2.8.1 + 2.9.0 4.0.0 @@ -16,7 +32,7 @@ com.pig4cloud pig-common-core - 2.8.1 + 2.9.0 com.alibaba.cloud diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/SentinelAutoConfiguration.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/SentinelAutoConfiguration.java index 854cccd6..6673d161 100755 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/SentinelAutoConfiguration.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/SentinelAutoConfiguration.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.common.sentinel; diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelFeign.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelFeign.java index 9f9b0107..8de4bd6e 100644 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelFeign.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelFeign.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + package com.pig4cloud.pig.common.sentinel.feign; import com.alibaba.cloud.sentinel.feign.SentinelContractHolder; diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelInvocationHandler.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelInvocationHandler.java index c930b2e3..72a8023d 100644 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelInvocationHandler.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/feign/PigSentinelInvocationHandler.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + package com.pig4cloud.pig.common.sentinel.feign; import com.alibaba.cloud.sentinel.feign.SentinelContractHolder; diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/GlobalBizExceptionHandler.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/GlobalBizExceptionHandler.java index 768d3454..baf011c0 100644 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/GlobalBizExceptionHandler.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/GlobalBizExceptionHandler.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.common.sentinel.handle; diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/PigUrlBlockHandler.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/PigUrlBlockHandler.java index 55278a7e..a5d556c9 100644 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/PigUrlBlockHandler.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/handle/PigUrlBlockHandler.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.common.sentinel.handle; diff --git a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/parser/PigHeaderRequestOriginParser.java b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/parser/PigHeaderRequestOriginParser.java index aa31303e..3a04d846 100644 --- a/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/parser/PigHeaderRequestOriginParser.java +++ b/pig-common/pig-common-sentinel/src/main/java/com/pig4cloud/pig/common/sentinel/parser/PigHeaderRequestOriginParser.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.common.sentinel.parser; diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index 16580761..df5407da 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-common - 2.8.1 + 2.9.0 pig-common-swagger diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/SwaggerAutoConfiguration.java b/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/SwaggerAutoConfiguration.java index 310bc086..583a58de 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/SwaggerAutoConfiguration.java +++ b/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/SwaggerAutoConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.swagger; diff --git a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/SwaggerProperties.java b/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/SwaggerProperties.java index cbdc1fae..b0aedda7 100644 --- a/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/SwaggerProperties.java +++ b/pig-common/pig-common-swagger/src/main/java/com/pig4cloud/pig/common/swagger/config/SwaggerProperties.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.common.swagger.config; diff --git a/pig-common/pom.xml b/pig-common/pom.xml index a67134b3..f1e472bb 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig - 2.8.1 + 2.9.0 pig-common diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index b66a805c..f3aae003 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig - 2.8.1 + 2.9.0 pig-gateway @@ -59,7 +57,7 @@ com.pig4cloud pig-common-sentinel - 2.8.1 + 2.9.0 diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/PigGatewayApplication.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/PigGatewayApplication.java index 6992d511..2e20d01e 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/PigGatewayApplication.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/PigGatewayApplication.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/IgnoreClientConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/IgnoreClientConfiguration.java index c220674e..8cef9912 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/IgnoreClientConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/IgnoreClientConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.config; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RateLimiterConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RateLimiterConfiguration.java index 6659e9d3..bbac3405 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RateLimiterConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RateLimiterConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.config; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java index 80faeba6..fb92f227 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.config; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java index 73a94863..2bb62881 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.config; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PasswordDecoderFilter.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PasswordDecoderFilter.java index 71e40f01..9d87ff7c 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PasswordDecoderFilter.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PasswordDecoderFilter.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.filter; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PigRequestGlobalFilter.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PigRequestGlobalFilter.java index a1e6c441..25a3af30 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PigRequestGlobalFilter.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/PigRequestGlobalFilter.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.filter; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java index 7d36cf18..d90bc7fe 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.filter; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/GlobalExceptionHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/GlobalExceptionHandler.java index 0f476e9d..106d76b7 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/GlobalExceptionHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/GlobalExceptionHandler.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + package com.pig4cloud.pig.gateway.handler; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java index c2ec070e..7a469faf 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.gateway.handler; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java index 47259016..84afae76 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.handler; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerSecurityHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerSecurityHandler.java index 3b5f8342..d41b348e 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerSecurityHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerSecurityHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.handler; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerUiHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerUiHandler.java index 597d6a89..ad61e149 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerUiHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerUiHandler.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.gateway.handler; diff --git a/pig-gateway/src/main/resources/logback-spring.xml b/pig-gateway/src/main/resources/logback-spring.xml index ab81e126..fa238198 100755 --- a/pig-gateway/src/main/resources/logback-spring.xml +++ b/pig-gateway/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-register/Dockerfile b/pig-register/Dockerfile index 443508a2..fb5ad03f 100644 --- a/pig-register/Dockerfile +++ b/pig-register/Dockerfile @@ -1,8 +1,9 @@ -FROM anapsix/alpine-java:8_server-jre_unlimited +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com ENV TZ=Asia/Shanghai +ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone @@ -14,6 +15,7 @@ EXPOSE 8848 ADD ./target/pig-register.jar ./ -CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pig-register.jar + +CMD sleep 60;java $JAVA_OPTS -jar pig-register.jar diff --git a/pig-register/pom.xml b/pig-register/pom.xml index ed44ee44..b32a8e55 100755 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 2.8.1 + 2.9.0 pig-register @@ -27,29 +27,27 @@ nacos 注册配置中心 - com.pig4cloud.nacos nacos-config - 1.3.1 + 1.3.2 - - com.pig4cloud.nacos - nacos-naming - 1.3.1 - - - com.pig4cloud.nacos - nacos-istio - 1.3.1 - - org.apache.tomcat.embed tomcat-embed-jasper 7.0.59 + + com.pig4cloud.nacos + nacos-naming + 1.3.2 + + + com.pig4cloud.nacos + nacos-istio + 1.3.2 + org.springframework.boot spring-boot-starter-security diff --git a/pig-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java b/pig-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java index 448644e8..755523d5 100755 --- a/pig-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java +++ b/pig-register/src/main/java/com/alibaba/nacos/config/ConsoleConfig.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.alibaba.nacos.config; import com.alibaba.nacos.core.code.ControllerMethodsCache; @@ -29,8 +28,6 @@ import org.springframework.web.filter.CorsFilter; import javax.annotation.PostConstruct; /** - * Console config. - * * @author yshen * @author nkorange * @since 1.2.0 @@ -43,25 +40,22 @@ public class ConsoleConfig { @Autowired private ControllerMethodsCache methodsCache; - /** - * Init. - */ @PostConstruct public void init() { methodsCache.initClassMethod("com.alibaba.nacos.naming.controllers"); - methodsCache.initClassMethod("com.alibaba.nacos.console.controller"); + methodsCache.initClassMethod("com.alibaba.nacos.controller"); methodsCache.initClassMethod("com.alibaba.nacos.config.server.controller"); } @Bean public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); config.addAllowedOrigin("*"); config.addAllowedHeader("*"); config.setMaxAge(18000L); config.addAllowedMethod("*"); - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", config); return new CorsFilter(source); } diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/HealthController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/HealthController.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java old mode 100755 new mode 100644 index e98a3ff3..9109cd78 --- a/pig-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java +++ b/pig-register/src/main/java/com/alibaba/nacos/controller/NamespaceController.java @@ -21,7 +21,7 @@ import com.alibaba.nacos.config.server.model.TenantInfo; import com.alibaba.nacos.config.server.service.repository.PersistService; import com.alibaba.nacos.model.Namespace; import com.alibaba.nacos.model.NamespaceAllInfo; -import com.alibaba.nacos.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java old mode 100755 new mode 100644 index cd916654..8be04956 --- a/pig-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java +++ b/pig-register/src/main/java/com/alibaba/nacos/controller/PermissionController.java @@ -17,8 +17,8 @@ package com.alibaba.nacos.controller; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/RoleController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/RoleController.java old mode 100755 new mode 100644 index c42e961c..a3a7c33d --- a/pig-register/src/main/java/com/alibaba/nacos/controller/RoleController.java +++ b/pig-register/src/main/java/com/alibaba/nacos/controller/RoleController.java @@ -17,8 +17,8 @@ package com.alibaba.nacos.controller; import com.alibaba.nacos.common.model.RestResult; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; import com.alibaba.nacos.core.auth.ActionTypes; import com.alibaba.nacos.core.auth.Secured; import org.apache.commons.lang3.StringUtils; diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/ServerStateController.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/controller/UserController.java b/pig-register/src/main/java/com/alibaba/nacos/controller/UserController.java old mode 100755 new mode 100644 index db194d86..5e50bc31 --- a/pig-register/src/main/java/com/alibaba/nacos/controller/UserController.java +++ b/pig-register/src/main/java/com/alibaba/nacos/controller/UserController.java @@ -21,11 +21,11 @@ import com.alibaba.nacos.common.model.RestResult; import com.alibaba.nacos.common.utils.JacksonUtils; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.model.User; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.NacosAuthManager; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.nacos.users.NacosUser; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.NacosAuthManager; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.utils.JwtTokenUtils; import com.alibaba.nacos.utils.PasswordEncoderUtil; import com.alibaba.nacos.core.auth.AccessException; diff --git a/pig-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java b/pig-register/src/main/java/com/alibaba/nacos/exception/ConsoleExceptionHandler.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java b/pig-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java old mode 100755 new mode 100644 index ae09263e..b3e8b74d --- a/pig-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java +++ b/pig-register/src/main/java/com/alibaba/nacos/filter/JwtAuthenticationTokenFilter.java @@ -17,8 +17,8 @@ package com.alibaba.nacos.filter; import com.alibaba.nacos.api.common.Constants; -import com.alibaba.nacos.nacos.JwtTokenManager; -import com.alibaba.nacos.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.JwtTokenManager; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; import org.apache.commons.lang3.StringUtils; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/pig-register/src/main/java/com/alibaba/nacos/model/Namespace.java b/pig-register/src/main/java/com/alibaba/nacos/model/Namespace.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java b/pig-register/src/main/java/com/alibaba/nacos/model/NamespaceAllInfo.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java old mode 100755 new mode 100644 similarity index 94% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java index 4db1428e..e607921e --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/CustomAuthenticationProvider.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/CustomAuthenticationProvider.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos; +package com.alibaba.nacos.security.nacos; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java old mode 100755 new mode 100644 similarity index 97% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java index 34292b73..f340adf7 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/JwtAuthenticationEntryPoint.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtAuthenticationEntryPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos; +package com.alibaba.nacos.security.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java old mode 100755 new mode 100644 similarity index 98% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java index 26776639..d77408f8 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/JwtTokenManager.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/JwtTokenManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.core.auth.AuthConfigs; import io.jsonwebtoken.Claims; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java old mode 100755 new mode 100644 similarity index 97% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java index d64b49bb..c10d0bd8 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthConfig.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.filter.JwtAuthenticationTokenFilter; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.core.auth.AuthConfigs; import com.alibaba.nacos.core.auth.AuthSystemTypes; import org.apache.commons.lang3.StringUtils; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java old mode 100755 new mode 100644 similarity index 96% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java index a9e7f16e..140af015 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/NacosAuthManager.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/NacosAuthManager.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos; +package com.alibaba.nacos.security.nacos; import com.alibaba.nacos.api.common.Constants; import com.alibaba.nacos.config.server.auth.RoleInfo; -import com.alibaba.nacos.nacos.roles.NacosRoleServiceImpl; -import com.alibaba.nacos.nacos.users.NacosUser; +import com.alibaba.nacos.security.nacos.roles.NacosRoleServiceImpl; +import com.alibaba.nacos.security.nacos.users.NacosUser; import com.alibaba.nacos.core.auth.AccessException; import com.alibaba.nacos.core.auth.AuthManager; import com.alibaba.nacos.core.auth.Permission; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java old mode 100755 new mode 100644 similarity index 93% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java index f39b7a6d..582f08bf --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/roles/NacosRoleServiceImpl.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/roles/NacosRoleServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos.roles; +package com.alibaba.nacos.security.nacos.roles; import com.alibaba.nacos.config.server.auth.PermissionInfo; import com.alibaba.nacos.config.server.auth.PermissionPersistService; import com.alibaba.nacos.config.server.auth.RoleInfo; import com.alibaba.nacos.config.server.auth.RolePersistService; import com.alibaba.nacos.config.server.model.Page; -import com.alibaba.nacos.nacos.NacosAuthConfig; -import com.alibaba.nacos.nacos.users.NacosUserDetailsServiceImpl; +import com.alibaba.nacos.security.nacos.NacosAuthConfig; +import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl; import com.alibaba.nacos.core.auth.AuthConfigs; import com.alibaba.nacos.core.auth.Permission; import com.alibaba.nacos.core.utils.Loggers; @@ -64,11 +64,11 @@ public class NacosRoleServiceImpl { @Autowired private PermissionPersistService permissionPersistService; - private final Set roleSet = new ConcurrentHashSet<>(); + private volatile Set roleSet = new ConcurrentHashSet<>(); - private final Map> roleInfoMap = new ConcurrentHashMap<>(); + private volatile Map> roleInfoMap = new ConcurrentHashMap<>(); - private final Map> permissionInfoMap = new ConcurrentHashMap<>(); + private volatile Map> permissionInfoMap = new ConcurrentHashMap<>(); @Scheduled(initialDelay = 5000, fixedDelay = 15000) private void reload() { @@ -95,9 +95,9 @@ public class NacosRoleServiceImpl { tmpPermissionInfoMap.put(role, permissionInfoPage.getPageItems()); } - roleSet.addAll(tmpRoleSet); - roleInfoMap.putAll(tmpRoleInfoMap); - permissionInfoMap.putAll(tmpPermissionInfoMap); + roleSet = tmpRoleSet; + roleInfoMap = tmpRoleInfoMap; + permissionInfoMap = tmpPermissionInfoMap; } catch (Exception e) { Loggers.AUTH.warn("[LOAD-ROLES] load failed", e); diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java old mode 100755 new mode 100644 similarity index 96% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java index 7005cd1c..ae906ec4 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUser.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.core.auth.User; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java old mode 100755 new mode 100644 similarity index 97% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java index 10d197a6..cc75e038 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetails.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.config.server.model.User; import org.springframework.security.core.GrantedAuthority; diff --git a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java old mode 100755 new mode 100644 similarity index 98% rename from pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java rename to pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java index 755e6358..d8bf5251 --- a/pig-register/src/main/java/com/alibaba/nacos/nacos/users/NacosUserDetailsServiceImpl.java +++ b/pig-register/src/main/java/com/alibaba/nacos/security/nacos/users/NacosUserDetailsServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.alibaba.nacos.nacos.users; +package com.alibaba.nacos.security.nacos.users; import com.alibaba.nacos.config.server.auth.UserPersistService; import com.alibaba.nacos.config.server.model.Page; diff --git a/pig-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java b/pig-register/src/main/java/com/alibaba/nacos/utils/JwtTokenUtils.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java b/pig-register/src/main/java/com/alibaba/nacos/utils/PasswordEncoderUtil.java old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/application.yml b/pig-register/src/main/resources/application.yml index c1ee4c1d..62fa263c 100755 --- a/pig-register/src/main/resources/application.yml +++ b/pig-register/src/main/resources/application.yml @@ -1,12 +1,15 @@ server: port: 8848 + tomcat: + basedir: logs db: num: 1 user: ${MYSQL-USER:root} password: ${MYSQL-PWD:root} url: - 0: jdbc:mysql://${MYSQL-HOST:pig-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:pig_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + 0: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + nacos: core: diff --git a/pig-register/src/main/resources/static/console-fe/.babelrc b/pig-register/src/main/resources/static/console-fe/.babelrc old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.editorconfig b/pig-register/src/main/resources/static/console-fe/.editorconfig old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.eslintignore b/pig-register/src/main/resources/static/console-fe/.eslintignore old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.eslintrc b/pig-register/src/main/resources/static/console-fe/.eslintrc old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.gitignore b/pig-register/src/main/resources/static/console-fe/.gitignore old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.prettierignore b/pig-register/src/main/resources/static/console-fe/.prettierignore old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/.prettierrc b/pig-register/src/main/resources/static/console-fe/.prettierrc old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/README.md b/pig-register/src/main/resources/static/console-fe/README.md old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/package.json b/pig-register/src/main/resources/static/console-fe/package.json old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/bootstrap.css b/pig-register/src/main/resources/static/console-fe/public/css/bootstrap.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/codemirror.css b/pig-register/src/main/resources/static/console-fe/public/css/codemirror.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/console1412.css b/pig-register/src/main/resources/static/console-fe/public/css/console1412.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/font-awesome.css b/pig-register/src/main/resources/static/console-fe/public/css/font-awesome.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.eot b/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.ttf b/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.woff b/pig-register/src/main/resources/static/console-fe/public/css/fonts/aliyun-console-font.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.ttf b/pig-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.woff b/pig-register/src/main/resources/static/console-fe/public/css/fonts/font_515771_emcns5054x3whfr.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.ttf b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff2 b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-bold.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.ttf b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff2 b/pig-register/src/main/resources/static/console-fe/public/css/fonts/roboto-regular.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/icon.css b/pig-register/src/main/resources/static/console-fe/public/css/icon.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/css/merge.css b/pig-register/src/main/resources/static/console-fe/public/css/merge.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-bold.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.eot b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-light.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-medium.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-regular.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 b/pig-register/src/main/resources/static/console-fe/public/fonts/roboto-thin.woff2 old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.eot b/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.eot old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.svg b/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.ttf b/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.ttf old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.woff b/pig-register/src/main/resources/static/console-fe/public/icons/icon-font.woff old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/img/black_dot.png b/pig-register/src/main/resources/static/console-fe/public/img/black_dot.png old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/img/favicon.ico b/pig-register/src/main/resources/static/console-fe/public/img/favicon.ico old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/img/logo-2000-390.svg b/pig-register/src/main/resources/static/console-fe/public/img/logo-2000-390.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/img/nacos.png b/pig-register/src/main/resources/static/console-fe/public/img/nacos.png old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/index.html b/pig-register/src/main/resources/static/console-fe/public/index.html old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.fullscreen.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.json-lint.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.addone.lint.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.lib.clike-lint.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js b/pig-register/src/main/resources/static/console-fe/public/js/codemirror.lib.json-lint.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/diff_match_patch.js b/pig-register/src/main/resources/static/console-fe/public/js/diff_match_patch.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/javascript.js b/pig-register/src/main/resources/static/console-fe/public/js/javascript.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/jquery.js b/pig-register/src/main/resources/static/console-fe/public/js/jquery.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/loader.js b/pig-register/src/main/resources/static/console-fe/public/js/loader.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/merge.js b/pig-register/src/main/resources/static/console-fe/public/js/merge.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/base/worker/workerMain.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/base/worker/workerMain.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/bat.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/bat.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/coffee.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/coffee.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/cpp.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/cpp.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/csharp.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/csharp.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/css.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/css.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/dockerfile.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/dockerfile.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/fsharp.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/fsharp.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/go.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/go.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/handlebars.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/handlebars.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/html.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/html.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ini.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ini.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/java.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/java.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/less.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/less.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/lua.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/lua.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/markdown.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/markdown.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/msdax.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/msdax.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/objective-c.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/objective-c.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/php.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/php.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/postiats.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/postiats.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/powershell.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/powershell.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/pug.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/pug.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/python.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/python.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/r.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/r.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/razor.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/razor.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ruby.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/ruby.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sb.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sb.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/scss.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/scss.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/solidity.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/solidity.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sql.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/sql.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/swift.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/swift.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/vb.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/vb.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/xml.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/xml.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/yaml.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/basic-languages/src/yaml.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.css b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.de.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.de.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.es.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.es.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.fr.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.fr.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.hu.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.hu.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.it.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.it.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ja.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ja.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ko.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ko.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.pt-br.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.pt-br.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ru.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.ru.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.tr.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.tr.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-cn.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-cn.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-tw.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/editor.main.nls.zh-tw.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg b/pig-register/src/main/resources/static/console-fe/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssMode.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssMode.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssWorker.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/css/cssWorker.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlMode.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlMode.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlWorker.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/html/htmlWorker.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonMode.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonMode.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonWorker.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/json/jsonWorker.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/lib/typescriptServices.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/lib/typescriptServices.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/mode.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/mode.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/worker.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/language/typescript/src/worker.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/vs/loader.js b/pig-register/src/main/resources/static/console-fe/public/js/vs/loader.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/public/js/xml.js b/pig-register/src/main/resources/static/console-fe/public/js/xml.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/BatchHandle.js b/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/BatchHandle.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.js b/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/BatchHandle/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/CloneDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/CloneDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/CloneDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/DeleteDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/DeleteDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/DeleteDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/DiffEditorDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/DiffEditorDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/DiffEditorDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js b/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/EditorNameSpace.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.js b/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/EditorNameSpace/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/ExportDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/ExportDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/ExportDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/ImportDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/ImportDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/ImportDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/MonacoEditor.tsx b/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/MonacoEditor.tsx old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/constant.ts b/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/constant.ts old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.tsx b/pig-register/src/main/resources/static/console-fe/src/components/MonacoEditor/index.tsx old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js b/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/NameSpaceList.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.js b/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/NameSpaceList/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js b/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/NewNameSpace.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.js b/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/NewNameSpace/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/RegionGroup.js b/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/RegionGroup.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.js b/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/RegionGroup/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowCodeing.js b/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowCodeing.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowServiceCodeing.js b/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/ShowServiceCodeing.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.js b/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/ShowCodeing/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/SuccessDialog.js b/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/SuccessDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.js b/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.scss b/pig-register/src/main/resources/static/console-fe/src/components/SuccessDialog/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/config.js b/pig-register/src/main/resources/static/console-fe/src/config.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/constants.js b/pig-register/src/main/resources/static/console-fe/src/constants.js old mode 100755 new mode 100644 index a6d11220..2dd94bd0 --- a/pig-register/src/main/resources/static/console-fe/src/constants.js +++ b/pig-register/src/main/resources/static/console-fe/src/constants.js @@ -38,3 +38,5 @@ export const PERMISSIONS_LIST = 'PERMISSIONS_LIST'; export const GET_NAMESPACES = 'GET_NAMESPACES'; export const GET_CONFIGURATION = 'GET_CONFIGURATION'; + +export const GLOBAL_PAGE_SIZE_LIST = [10, 20, 30, 50, 100]; diff --git a/pig-register/src/main/resources/static/console-fe/src/globalLib.js b/pig-register/src/main/resources/static/console-fe/src/globalLib.js old mode 100755 new mode 100644 index 6aefbff0..902d1c18 --- a/pig-register/src/main/resources/static/console-fe/src/globalLib.js +++ b/pig-register/src/main/resources/static/console-fe/src/globalLib.js @@ -528,7 +528,7 @@ const request = (function(_global) { } if ( [401, 403].includes(status) && - ['unknown user!', 'token invalid', 'token expired!'].includes(responseJSON.message) + ['unknown user!', 'token invalid!', 'token expired!'].includes(responseJSON.message) ) { goLogin(); } diff --git a/pig-register/src/main/resources/static/console-fe/src/index.js b/pig-register/src/main/resources/static/console-fe/src/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/index.scss b/pig-register/src/main/resources/static/console-fe/src/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/layouts/Header.js b/pig-register/src/main/resources/static/console-fe/src/layouts/Header.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/layouts/MainLayout.js b/pig-register/src/main/resources/static/console-fe/src/layouts/MainLayout.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/layouts/index.scss b/pig-register/src/main/resources/static/console-fe/src/layouts/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/layouts/menu.js b/pig-register/src/main/resources/static/console-fe/src/layouts/menu.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/lib.js b/pig-register/src/main/resources/static/console-fe/src/lib.js old mode 100755 new mode 100644 index 5a4a886d..a50cb9c5 --- a/pig-register/src/main/resources/static/console-fe/src/lib.js +++ b/pig-register/src/main/resources/static/console-fe/src/lib.js @@ -58,7 +58,6 @@ request.middleWare((_config = {}) => { if (res.code === 403 && !hasAlert) { hasAlert = true; window.Dialog.alert({ - language: aliwareIntl.currentLanguageCode || 'zh-cn', style: { width: 400 }, content: res.message, onOk: () => { @@ -81,7 +80,6 @@ request.middleWare((_config = {}) => { hasAlert = true; window.Dialog.alert({ - language: aliwareIntl.currentLanguageCode || 'zh-cn', style: { width: 400 }, content: aliwareIntl.get('com.alibaba.nacos.pubshow'), // '子账号没有权限,请联系主账号负责人RAM上授权', onOk: () => { diff --git a/pig-register/src/main/resources/static/console-fe/src/locales/en-US.js b/pig-register/src/main/resources/static/console-fe/src/locales/en-US.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/locales/index.js b/pig-register/src/main/resources/static/console-fe/src/locales/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/locales/zh-CN.js b/pig-register/src/main/resources/static/console-fe/src/locales/zh-CN.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/NewPermissions.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/NewPermissions.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/PermissionsManagement.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/PermissionsManagement/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/README.md old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/NewRole.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/RolesManagement.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/RolesManagement/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/NewUser.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/PasswordReset.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/UserManagement.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/UserManagement/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss b/pig-register/src/main/resources/static/console-fe/src/pages/AuthorityControl/authority.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.js b/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/ClusterNodeList.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ClusterManagement/ClusterNodeList/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/ConfigDetail.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigDetail/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/ConfigEditor.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/NewConfigEditor.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/NewConfigEditor.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigEditor/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/ConfigRollback.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigRollback/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/ConfigSync.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/ConfigSync.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigSync/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js old mode 100755 new mode 100644 index 79695ffa..4780fa99 --- a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js +++ b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js @@ -46,7 +46,7 @@ import { connect } from 'react-redux'; import { getConfigs } from '../../../reducers/configuration'; import './index.scss'; -import { LANGUAGE_KEY } from '../../../constants'; +import { LANGUAGE_KEY, GLOBAL_PAGE_SIZE_LIST } from '../../../constants'; const { Panel } = Collapse; const configsTableSelected = new Map(); @@ -1384,7 +1384,7 @@ class ConfigurationManagement extends React.Component { { this.publicConfigBeforeCheck(content); }, @@ -352,7 +351,6 @@ class NewConfig extends React.Component { error: res => { this.closeLoading(); Dialog.alert({ - language: aliwareIntl.currentLanguageCode || 'zh-cn', content: locale.publishFailed, }); }, diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ConfigurationManagement/NewConfig/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/Login/Login.jsx b/pig-register/src/main/resources/static/console-fe/src/pages/Login/Login.jsx old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/Login/index.jsx b/pig-register/src/main/resources/static/console-fe/src/pages/Login/index.jsx old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/Login/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/Login/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js b/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/NameSpace.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.scss b/pig-register/src/main/resources/static/console-fe/src/pages/NameSpace/index.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditInstanceDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/EditServiceDialog.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/InstanceTable.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.scss b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/ServiceDetail.scss old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/constant.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/constant.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/index.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceDetail/index.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js old mode 100755 new mode 100644 index 4bc74cb6..36361566 --- a/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js +++ b/pig-register/src/main/resources/static/console-fe/src/pages/ServiceManagement/ServiceList/ServiceList.js @@ -37,6 +37,7 @@ import EditServiceDialog from '../ServiceDetail/EditServiceDialog'; import ShowServiceCodeing from 'components/ShowCodeing/ShowServiceCodeing'; import './ServiceList.scss'; +import { GLOBAL_PAGE_SIZE_LIST } from '../../../constants'; const FormItem = Form.Item; const { Row, Col } = Grid; @@ -94,12 +95,14 @@ class ServiceList extends React.Component { `serviceNameParam=${search.serviceName}`, `groupNameParam=${search.groupName}`, ]; + this.openLoading(); request({ url: `v1/ns/catalog/services?${parameter.join('&')}`, success: ({ count = 0, serviceList = [] } = {}) => { this.setState({ dataSource: serviceList, total: count, + loading: false, }); }, error: () => @@ -107,6 +110,7 @@ class ServiceList extends React.Component { dataSource: [], total: 0, currentPage: 0, + loading: false, }), }); } @@ -129,6 +133,10 @@ class ServiceList extends React.Component { this.showcode.current.getInstance().openDialog(record); } + handlePageSizeChange(pageSize) { + this.setState({ pageSize }, () => this.queryServiceList()); + } + deleteService(service) { const { locale = {} } = this.props; const { prompt, promptDelete } = locale; @@ -187,156 +195,143 @@ class ServiceList extends React.Component { return (

- + +
+

+ {serviceList} + | + {nowNamespaceName} + {nowNamespaceId} +

+ -
- -
-

- {serviceList} - | - {nowNamespaceName} - {nowNamespaceId} -

- - -
- - this.setState({ search: { ...search, serviceName } })} - onPressEnter={() => - this.setState({ currentPage: 1 }, () => this.queryServiceList()) - } - /> - - - this.setState({ search: { ...search, groupName } })} - onPressEnter={() => - this.setState({ currentPage: 1 }, () => this.queryServiceList()) - } - /> - - - - this.setState({ hasIpCount, currentPage: 1 }, () => { - localStorage.setItem('hasIpCount', hasIpCount); - this.queryServiceList(); - }) - } - /> - - - - - - - -
- -
- - - this.rowColor(row)} - > - - - - - +
+ + this.setState({ search: { ...search, serviceName } })} + onPressEnter={() => + this.setState({ currentPage: 1 }, () => this.queryServiceList()) + } /> - - ( - // @author yongchao9 #2019年05月18日 下午5:46:28 - /* Add a link to view "sample code" + + + this.setState({ search: { ...search, groupName } })} + onPressEnter={() => + this.setState({ currentPage: 1 }, () => this.queryServiceList()) + } + /> + + + + this.setState({ hasIpCount, currentPage: 1 }, () => { + localStorage.setItem('hasIpCount', hasIpCount); + this.queryServiceList(); + }) + } + /> + + + + + + + + + + + +
+
this.rowColor(row)} + loading={this.state.loading} + > + + + + + + + ( + // @author yongchao9 #2019年05月18日 下午5:46:28 + /* Add a link to view "sample code" replace the original button with a label, which is consistent with the operation style in configuration management. */ - - )} - /> -
- -
- {this.state.total > this.state.pageSize && ( -
- - this.setState({ currentPage }, () => this.queryServiceList()) - } +
+ { + const { name, groupName } = record; + this.props.history.push(generateUrl('/serviceDetail', { name, groupName })); + }} + style={{ marginRight: 5 }} + > + {detail} + + | + this.showSampleCode(record)}> + {sampleCode} + + | + this.deleteService(record)} style={{ marginRight: 5 }}> + {deleteAction} + +
+ )} /> -
- )} - + + +
+
+ this.handlePageSizeChange(pageSize)} + onChange={currentPage => this.setState({ currentPage }, () => this.queryServiceList())} + /> +
+ { if ( [401, 403].includes(status) && - ['unknown user!', 'token invalid', 'token expired!'].includes(message) + ['unknown user!', 'token invalid!', 'token expired!'].includes(message) ) { goLogin(); } diff --git a/pig-register/src/main/resources/static/console-fe/src/utils/validateContent.js b/pig-register/src/main/resources/static/console-fe/src/utils/validateContent.js old mode 100755 new mode 100644 index 07015097..ac551dd9 --- a/pig-register/src/main/resources/static/console-fe/src/utils/validateContent.js +++ b/pig-register/src/main/resources/static/console-fe/src/utils/validateContent.js @@ -16,6 +16,92 @@ import * as yamljs from 'yamljs'; +/** + * 校验一个配置项 + */ +function validateProperty(property) { + let { length } = property; + let keyLen = 0; + let valueStart = length; + let hasSep = false; + let precedingBackslash = false; + let c; + // 解析 key + while (keyLen < length) { + c = property[keyLen]; + if ((c === '=' || c === ':') && !precedingBackslash) { + valueStart = keyLen + 1; + hasSep = true; + break; + } + + if ((c === ' ' || c === '\t' || c === '\f') && !precedingBackslash) { + valueStart = keyLen + 1; + break; + } + + if (c === '\\') { + precedingBackslash = !precedingBackslash; + } else { + precedingBackslash = false; + } + keyLen++; + } + // 解析 value + while (valueStart < length) { + c = property[valueStart]; + if (c !== ' ' && c !== '\t' && c !== '\f') { + if (!hasSep && (c === '=' || c === ':')) { + hasSep = true; + } else { + break; + } + } + valueStart++; + } + + return ( + validateKeyOrValueForProperty(property, 0, keyLen) && + validateKeyOrValueForProperty(property, valueStart, length) + ); +} + +function validateKeyOrValueForProperty(property, start, end) { + // check null + if (start >= end) { + return false; + } + let index = 0; + let c; + while (index < property.length) { + c = property[index++]; + if (c !== '\\') { + continue; + } + + c = property[index++]; + // check backslash + if (!isPropertyEscape(c)) { + return false; + } + + // check Unicode + if (c === 'u') { + let unicode = property.slice(index, index + 4).join(''); + if (unicode.match(/^[a-f0-9]{4}$/i) === null) { + return false; + } + index += 4; + } + } + + return true; +} + +function isPropertyEscape(c = '') { + return 'abfnrt\\"\'0! #:=u'.includes(c); +} + export default { /** * 检测json是否合法 @@ -65,12 +151,91 @@ export default { * 检测属性是否正确 */ validateProperties(str = '') { - const reg = /^[^=]+=.+$/; - return str - .replace('\n\r', '\n') - .split('\n') - .filter(_str => _str) - .every(_str => reg.test(_str.trim())); + let isNewLine = true; + let isCommentLine = false; + let isSkipWhiteSpace = true; + let precedingBackslash = false; + let appendedLineBegin = false; + let skipLF = false; + let hasProperty = false; + let property = []; + for (let i = 0; i < str.length; i++) { + let c = str[i]; + + if (skipLF) { + skipLF = false; + if (c === '\n') { + continue; + } + } + // 跳过行首空白字符 + if (isSkipWhiteSpace) { + if (c === ' ' || c === '\t' || c === '\f') { + continue; + } + if (!appendedLineBegin && (c === '\r' || c === '\n')) { + continue; + } + appendedLineBegin = false; + isSkipWhiteSpace = false; + } + + // 判断注释行 + if (isNewLine) { + isNewLine = false; + if (c === '#' || c === '!') { + isCommentLine = true; + continue; + } + } + + if (c !== '\n' && c !== '\r') { + property.push(c); + if (c === '\\') { + precedingBackslash = !precedingBackslash; + } else { + precedingBackslash = false; + } + continue; + } + + // 跳过注释行 + if (isCommentLine || property.length === 0) { + isNewLine = true; + isCommentLine = false; + isSkipWhiteSpace = true; + property = []; + continue; + } + + // 处理转移字符 + if (precedingBackslash) { + property.pop(); + precedingBackslash = false; + isSkipWhiteSpace = true; + appendedLineBegin = true; + if (c === '\r') { + skipLF = true; + } + continue; + } + // 解析出配置项 + // 进行校验 + if (!validateProperty(property)) { + return false; + } + hasProperty = true; + property = []; + isNewLine = true; + isSkipWhiteSpace = true; + } + + // 校验最后一行 + if (property.length > 0 && !isCommentLine) { + return validateProperty(property); + } + + return hasProperty; }, /** diff --git a/pig-register/src/main/resources/static/console-fe/test/.editorconfig b/pig-register/src/main/resources/static/console-fe/test/.editorconfig old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/.gitignore b/pig-register/src/main/resources/static/console-fe/test/.gitignore old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/README.md b/pig-register/src/main/resources/static/console-fe/test/README.md old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/commons/commons.md b/pig-register/src/main/resources/static/console-fe/test/commons/commons.md old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/config.json b/pig-register/src/main/resources/static/console-fe/test/config.json old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/hosts b/pig-register/src/main/resources/static/console-fe/test/hosts old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/package.json b/pig-register/src/main/resources/static/console-fe/test/package.json old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/run.bat b/pig-register/src/main/resources/static/console-fe/test/run.bat old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/run.sh b/pig-register/src/main/resources/static/console-fe/test/run.sh old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/sample/configurationManagement.spec.js b/pig-register/src/main/resources/static/console-fe/test/sample/configurationManagement.spec.js old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/test/uploadfiles/uploadfiles.md b/pig-register/src/main/resources/static/console-fe/test/uploadfiles/uploadfiles.md old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/console-fe/tsconfig.json b/pig-register/src/main/resources/static/console-fe/tsconfig.json old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/css/main.css b/pig-register/src/main/resources/static/css/main.css old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/img/black_dot.png b/pig-register/src/main/resources/static/img/black_dot.png old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/img/logo-2000-390.svg b/pig-register/src/main/resources/static/img/logo-2000-390.svg old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/img/nacos.png b/pig-register/src/main/resources/static/img/nacos.png old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/index.html b/pig-register/src/main/resources/static/index.html old mode 100755 new mode 100644 diff --git a/pig-register/src/main/resources/static/js/main.js b/pig-register/src/main/resources/static/js/main.js old mode 100755 new mode 100644 index d6b5fbb4..e357e900 --- a/pig-register/src/main/resources/static/js/main.js +++ b/pig-register/src/main/resources/static/js/main.js @@ -11,7 +11,7 @@ d.version="2.27.0",function(e){t=e}(Gn),d.fn=io,d.min=function(){return $n("isBe Licensed under the MIT License (MIT), see http://jedwatson.github.io/classnames */ -!function(){"use strict";var i={}.hasOwnProperty;function s(){for(var e=[],t=0;t 16.8.0")},h.prototype.validate=function(e,t){this.validateCallback(e,t)},h.prototype.reset=function(e,t){var n=1","Select");var n=u(e,t);return e.onInputUpdate&&(n.onSearch=e.onInputUpdate,n.showSearch=!0),n}}),t.default=a.default.config(r.default,{transform:u,exportNames:["focusInput","handleSearchClear"]}),e.exports=t.default},function(e,t,n){"use strict";function a(){return(a=Object.assign||function(e){for(var t=1;tt?n.splice(t,n.length-t,a):n.push(a),u({action:"PUSH",location:a,index:t,entries:n}))})},replace:function(e,t){var n=P(e,t,d(),h.location);l.confirmTransitionTo(n,"REPLACE",r,function(e){e&&u({action:"REPLACE",location:h.entries[h.index]=n})})},go:p,goBack:function(){p(-1)},goForward:function(){p(1)},canGo:function(e){var t=h.index+e;return 0<=t&&tx',"Tag"),"readonly"!==n&&"interactive"!==n||r.log.warning("Warning: [ shape="+n+" ] is deprecated at [ Tag ]"),"secondary"===a&&r.log.warning("Warning: [ type=secondary ] is deprecated at [ Tag ]"),["count","marked","value","onChange"].forEach(function(e){e in t&&r.log.warning("Warning: [ "+e+" ] is deprecated at [ Tag ]")}),("selected"in t||"defaultSelected"in t)&&r.log.warning("Warning: [ selected|defaultSelected ] is deprecated at [ Tag ], use [ checked|defaultChecked ] at [ Tag.Selectable ] instead of it"),"closed"in t&&r.log.warning("Warning: [ closed ] is deprecated at [ Tag ], use [ onClose ] at [ Tag.Closeable ] instead of it"),"onSelect"in t&&e("onSelect","","Tag"),"afterClose"in t&&r.log.warning("Warning: [ afterClose ] is deprecated at [ Tag ], use [ afterClose ] at [ Tag.Closeable ] instead of it"),t}});d.Group=a.default.config(i.default),d.Selectable=a.default.config(s.default),d.Closable=a.default.config(l.default),d.Closeable=d.Closable,t.default=d,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a=o(n(685)),r=o(n(388));function o(e){return e&&e.__esModule?e:{default:e}}a.default.Panel=r.default,t.default=a.default,e.exports=t.default},function(e,t,n){var a=n(85);e.exports=function(e){if(!a(e))throw TypeError(e+" is not an object!");return e}},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t,n){"use strict";n(40),n(65),n(503)},function(e,t,n){var i=n(334);function s(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return s=function(){return e},e}e.exports=function(e){if(e&&e.__esModule)return e;if(null===e||"object"!==i(e)&&"function"!=typeof e)return{default:e};var t=s();if(t&&t.has(e))return t.get(e);var n,a={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var o in e){Object.prototype.hasOwnProperty.call(e,o)&&((n=r?Object.getOwnPropertyDescriptor(e,o):null)&&(n.get||n.set)?Object.defineProperty(a,o,n):a[o]=e[o])}return a.default=e,t&&t.set(e,a),a}},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,L=f(n(4)),o=f(n(3)),i=f(n(5)),s=f(n(6)),l=n(0),x=f(l),u=n(24),d=f(n(2)),T=f(n(12)),c=n(11);function f(e){return e&&e.__esModule?e:{default:e}}var p,h=c.func.bindCtx,C=c.obj.pickOthers,m=(p=l.Component,(0,s.default)(D,p),D.prototype.componentDidMount=function(){this.itemNode=(0,u.findDOMNode)(this);var e,t,n,a,r=this.props,o=r.parentMode,i=r.root,s=r.menu;s?this.menuNode=(0,u.findDOMNode)(s):"popup"===o?this.menuNode=this.itemNode.parentNode:(this.menuNode=(0,u.findDOMNode)(i),t=(e=i.props).prefix,n=e.header,a=e.footer,(n||a)&&(this.menuNode=this.menuNode.querySelector("."+t+"menu-content"))),this.setFocus()},D.prototype.componentDidUpdate=function(){this.setFocus()},D.prototype.focusable=function(){var e=this.props,t=e.root,n=e.type,a=e.disabled,r=t.props.focusable;return r&&("submenu"===n||!a)},D.prototype.getFocused=function(){var e=this.props,t=e._key;return e.root.state.focusedKey===t},D.prototype.setFocus=function(){var e;this.getFocused()&&(this.focusable()&&this.itemNode.focus({preventScroll:!0}),this.menuNode&&this.menuNode.scrollHeight>this.menuNode.clientHeight&&(this.menuNode.clientHeight+this.menuNode.scrollTop<(e=this.itemNode.offsetTop+this.itemNode.offsetHeight)?this.menuNode.scrollTop=e-this.menuNode.clientHeight:this.itemNode.offsetTop"===(d=e.charAt(o+1))){r+="(",o++,0[0-9][0-9][0-9][0-9])-(?[0-9][0-9]?)-(?[0-9][0-9]?)(?:(?:[Tt]|[ \t]+)(?[0-9][0-9]?):(?[0-9][0-9]):(?[0-9][0-9])(?:.(?[0-9]*))?(?:[ \t]*(?Z|(?[-+])(?[0-9][0-9]?)(?::(?[0-9][0-9]))?))?)?$","i"),r.LOCAL_TIMEZONE_OFFSET=60*(new Date).getTimezoneOffset()*1e3,r.trim=function(e,t){var n,a;return null==t&&(t="\\s"),null==(n=this.REGEX_LEFT_TRIM_BY_CHAR[t])&&(this.REGEX_LEFT_TRIM_BY_CHAR[t]=n=new RegExp("^"+t+t+"*")),n.lastIndex=0,null==(a=this.REGEX_RIGHT_TRIM_BY_CHAR[t])&&(this.REGEX_RIGHT_TRIM_BY_CHAR[t]=a=new RegExp(t+""+t+"*$")),a.lastIndex=0,e.replace(n,"").replace(a,"")},r.ltrim=function(e,t){var n;return null==t&&(t="\\s"),null==(n=this.REGEX_LEFT_TRIM_BY_CHAR[t])&&(this.REGEX_LEFT_TRIM_BY_CHAR[t]=n=new RegExp("^"+t+t+"*")),n.lastIndex=0,e.replace(n,"")},r.rtrim=function(e,t){var n;return null==t&&(t="\\s"),null==(n=this.REGEX_RIGHT_TRIM_BY_CHAR[t])&&(this.REGEX_RIGHT_TRIM_BY_CHAR[t]=n=new RegExp(t+""+t+"*$")),n.lastIndex=0,e.replace(n,"")},r.isEmpty=function(e){return!e||""===e||"0"===e||e instanceof Array&&0===e.length||this.isEmptyObject(e)},r.isEmptyObject=function(t){var n;return t instanceof Object&&0===function(){var e=[];for(n in t)a.call(t,n)&&e.push(n);return e}().length},r.subStrCount=function(e,t,n,a){var r,o,i,s,l,u=0;for(e=""+e,t=""+t,null!=n&&(e=e.slice(n)),null!=a&&(e=e.slice(0,a)),i=e.length,l=t.length,r=o=0,s=i;0<=s?o>6)+t(128|63&e):e<65536?t(224|e>>12)+t(128|e>>6&63)+t(128|63&e):t(240|e>>18)+t(128|e>>12&63)+t(128|e>>6&63)+t(128|63&e)},r.parseBoolean=function(e,t){var n;return null==t&&(t=!0),"string"==typeof e?(n=e.toLowerCase(),!(!t&&"no"===n)&&"0"!==n&&"false"!==n&&""!==n):!!e},r.isNumeric=function(e){return this.REGEX_SPACES.lastIndex=0,"number"==typeof e||"string"==typeof e&&!isNaN(e)&&""!==e.replace(this.REGEX_SPACES,"")},r.stringToDate=function(e){var t,n,a,r,o,i,s,l,u,d;if(null==e||!e.length)return null;if(!(o=this.PATTERN_DATE.exec(e)))return null;if(d=parseInt(o.year,10),s=parseInt(o.month,10)-1,n=parseInt(o.day,10),null==o.hour)return t=new Date(Date.UTC(d,s,n));if(r=parseInt(o.hour,10),i=parseInt(o.minute,10),l=parseInt(o.second,10),null!=o.fraction){for(a=o.fraction.slice(0,3);a.length<3;)a+="0";a=parseInt(a,10)}else a=0;return null!=o.tz&&(u=6e4*(60*parseInt(o.tz_hour,10)+(null!=o.tz_minute?parseInt(o.tz_minute,10):0)),"-"===o.tz_sign&&(u*=-1)),t=new Date(Date.UTC(d,s,n,r,i,l,a)),u&&t.setTime(t.getTime()-u),t},r.strRepeat=function(e,t){for(var n="",a=0;ae.length)&&(t=e.length);for(var n=0,a=new Array(t);ndocument.F=Object<\/script>"),e.close(),d=e.F;n--;)delete d[u][s[n]];return d()};e.exports=Object.create||function(e,t){var n;return null!==e?(r[u]=o(e),n=new r,r[u]=null,n[l]=e):n=d(),void 0===t?n:i(n,t)}},function(e,t,n){var a=n(76).f,r=n(77),o=n(87)("toStringTag");e.exports=function(e,t,n){e&&!r(e=n?e:e.prototype,o)&&a(e,o,{configurable:!0,value:t})}},function(e,t,n){t.f=n(87)},function(e,t,n){var a=n(71),r=n(72),o=n(113),i=n(146),s=n(76).f;e.exports=function(e){var t=r.Symbol||(r.Symbol=!o&&a.Symbol||{});"_"==e.charAt(0)||e in t||s(t,e,{value:i.f(e)})}},function(e,t,n){"use strict";n(75),n(505)},function(e,t,n){},function(e,t,n){e.exports=n(516)},function(e,t){function l(e,t,n,a,r,o,i){try{var s=e[o](i),l=s.value}catch(e){return void n(e)}s.done?t(l):Promise.resolve(l).then(a,r)}e.exports=function(s){return function(){var e=this,i=arguments;return new Promise(function(t,n){var a=s.apply(e,i);function r(e){l(a,t,n,r,o,"next",e)}function o(e){l(a,t,n,r,o,"throw",e)}r(void 0)})}}},function(e,t){e.exports=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(s,e,l){"use strict";(function(e){var n=l(56),a=l(551),t={"Content-Type":"application/x-www-form-urlencoded"};function r(e,t){!n.isUndefined(e)&&n.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}var o,i={adapter:("undefined"==typeof XMLHttpRequest&&void 0===e||(o=l(347)),o),transformRequest:[function(e,t){return a(t,"Content-Type"),n.isFormData(e)||n.isArrayBuffer(e)||n.isBuffer(e)||n.isStream(e)||n.isFile(e)||n.isBlob(e)?e:n.isArrayBufferView(e)?e.buffer:n.isURLSearchParams(e)?(r(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):n.isObject(e)?(r(t,"application/json;charset=utf-8"),JSON.stringify(e)):e}],transformResponse:[function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(e){}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(e){return 200<=e&&e<300},headers:{common:{Accept:"application/json, text/plain, */*"}}};n.forEach(["delete","get","head"],function(e){i.headers[e]={}}),n.forEach(["post","put","patch"],function(e){i.headers[e]=n.merge(t)}),s.exports=i}).call(this,l(338))},function(e,t,n){"use strict";function s(e,t){for(var n=t&&t.plainObjects?Object.create(null):{},a=0;a>6]+u[128|63&i]:i<55296||57344<=i?r+=u[224|i>>12]+u[128|i>>6&63]+u[128|63&i]:(o+=1,i=65536+((1023&i)<<10|1023&a.charCodeAt(o)),r+=u[240|i>>18]+u[128|i>>12&63]+u[128|i>>6&63]+u[128|63&i])}return r},isBuffer:function(e){return!(!e||"object"!=typeof e)&&!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))},isRegExp:function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},maybeMap:function(e,t){if(d(e)){for(var n=[],a=0;aa.length&&a.every(function(e,t){return e===n[t]})},t.isAvailablePos=function(e,t,n){var a=n[t],r=a.type,o=a.disabled;return i(e,t)&&("item"===r&&!o||"submenu"===r)});t.getFirstAvaliablelChildKey=function(t,n){var e=Object.keys(n).find(function(e){return a(t+"-0",e,n)});return e?n[e].key:null},t.getChildSelected=function(e){var t=e.selectMode,n=e.selectedKeys,a=e._k2n,r=e._key;if(!a)return!1;var o=a[r].pos+"-";return!!t&&n.some(function(e){return a[e]&&0===a[e].pos.indexOf(o)})}},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,o=d(n(3)),i=d(n(5)),s=d(n(6)),l=d(n(0)),u=d(n(2));function d(e){return e&&e.__esModule?e:{default:e}}var c,f=(c=l.default.Component,(0,s.default)(p,c),p.prototype.render=function(){return null},r=a=p,a.propTypes={dataIndex:u.default.string,cell:u.default.oneOfType([u.default.element,u.default.node,u.default.func]),title:u.default.oneOfType([u.default.element,u.default.node,u.default.func]),htmlTitle:u.default.string,sortable:u.default.bool,width:u.default.oneOfType([u.default.number,u.default.string]),align:u.default.oneOf(["left","center","right"]),alignHeader:u.default.oneOf(["left","center","right"]),filters:u.default.arrayOf(u.default.shape({label:u.default.string,value:u.default.oneOfType([u.default.node,u.default.string])})),filterMode:u.default.oneOf(["single","multiple"]),filterMenuProps:u.default.object,filterProps:u.default.object,lock:u.default.oneOfType([u.default.bool,u.default.string]),resizable:u.default.bool,colSpan:u.default.number},a.contextTypes={parent:u.default.any},a.defaultProps={cell:function(e){return e},filterMode:"multiple",filterMenuProps:{subMenuSelectable:!1},filterProps:{},resizable:!1},a._typeMark="column",r);function p(){return(0,o.default)(this,p),(0,i.default)(this,c.apply(this,arguments))}f.displayName="Column",t.default=f,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a=l(n(3)),r=l(n(5)),o=l(n(6)),i=l(n(0)),s=l(n(2));function l(e){return e&&e.__esModule?e:{default:e}}var u,d=(u=i.default.Component,(0,o.default)(c,u),c.prototype.render=function(){var e=this.props,t=e.children,n=e.wrapperContent,a=e.prefix;return i.default.createElement("div",{className:a+"table-inner"},t,n)},c.propTypes={children:s.default.any,prefix:s.default.string,colGroup:s.default.any,wrapperContent:s.default.any},c);function c(){return(0,a.default)(this,c),(0,r.default)(this,u.apply(this,arguments))}d.displayName="FixedWrapper",t.default=d,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a,r,k=h(n(18)),S=h(n(4)),o=h(n(3)),s=h(n(5)),i=h(n(6)),l=n(0),E=h(l),u=h(n(2)),L=h(n(12)),d=h(n(116)),c=h(n(23)),x=n(11),f=h(n(42)),p=h(n(8));function h(e){return e&&e.__esModule?e:{default:e}}var m,g=x.func.noop,y=x.func.bindCtx,v=/blue|green|orange|red|turquoise|yellow/,_=(m=l.Component,(0,i.default)(T,m),T.prototype.componentWillUnmount=function(){this.__destroyed=!0},T.prototype.handleClose=function(e){var t=this,n=this.props,a=n.animation,r=n.onClose,o=x.support.animation&&a;!1===r(e,this.tagNode)||this.__destroyed||this.setState({visible:!1},function(){o||t.props.afterClose(t.tagNode)})},T.prototype.handleBodyClick=function(e){var t=this.props,n=t.closable,a=t.closeArea,r=t.onClick;if(n&&"tag"===a&&this.handleClose("tag"),"function"==typeof r)return r(e)},T.prototype.handleTailClick=function(e){e&&e.preventDefault(),e&&e.stopPropagation(),this.handleClose("tail")},T.prototype.handleAnimationInit=function(e){this.props.afterAppear(e)},T.prototype.handleAnimationEnd=function(e){this.props.afterClose(e)},T.prototype.renderAnimatedTag=function(e,t){return E.default.createElement(d.default,{animation:t,afterAppear:this.handleAnimationInit,afterLeave:this.handleAnimationEnd},e)},T.prototype.renderTailNode=function(){var e=this.props,t=e.prefix,n=e.closable,a=e.locale;return n?E.default.createElement("span",{className:t+"tag-close-btn",onClick:this.handleTailClick,role:"button","aria-label":a.delete},E.default.createElement(c.default,{type:"close"})):null},T.prototype.isPresetColor=function(){var e=this.props.color;return!!e&&v.test(e)},T.prototype.getTagStyle=function(){var e=this.props,t=e.color,n=void 0===t?"":t,a=e.style,r=this.isPresetColor(),o={backgroundColor:n,borderColor:n,color:"#fff"};return(0,S.default)({},n&&!r?o:null,a)},T.prototype.render=function(){var e,t=this,n=this.props,a=n.prefix,r=n.type,o=n.size,i=n.color,s=n._shape,l=n.closable,u=n.closeArea,d=n.className,c=n.children,f=n.animation,p=n.disabled,h=n.rtl,m=this.state.visible,g=this.isPresetColor(),y=x.obj.pickOthers(T.propTypes,this.props),v=(y.style,(0,k.default)(y,["style"])),_=l?"closable":s,b=(0,L.default)([a+"tag",a+"tag-"+_,a+"tag-"+o],((e={})[a+"tag-level-"+r]=!i,e[a+"tag-closable"]=l,e[a+"tag-body-pointer"]=l&&"tag"===u,e[a+"tag-"+i]=i&&g&&"primary"===r,e[a+"tag-"+i+"-inverse"]=i&&g&&"normal"===r,e),d),w=this.renderTailNode(),M=m?E.default.createElement("div",(0,S.default)({className:b,onClick:this.handleBodyClick,onKeyDown:this.onKeyDown,tabIndex:p?"":"0",role:"button","aria-disabled":p,disabled:p,dir:h?"rtl":void 0,ref:function(e){return t.tagNode=e},style:this.getTagStyle()},v),E.default.createElement("span",{className:a+"tag-body"},c),w):null;return f&&x.support.animation?this.renderAnimatedTag(M,a+"tag-zoom"):M},r=a=T,a.propTypes={prefix:u.default.string,type:u.default.oneOf(["normal","primary"]),size:u.default.oneOf(["small","medium","large"]),color:u.default.string,animation:u.default.bool,closeArea:u.default.oneOf(["tag","tail"]),closable:u.default.bool,onClose:u.default.func,afterClose:u.default.func,afterAppear:u.default.func,className:u.default.any,children:u.default.node,onClick:u.default.func,_shape:u.default.oneOf(["default","closable","checkable"]),disabled:u.default.bool,rtl:u.default.bool,locale:u.default.object},a.defaultProps={prefix:"next-",type:"normal",size:"medium",closeArea:"tail",animation:!1,onClose:g,afterClose:g,afterAppear:g,onClick:g,_shape:"default",disabled:!1,rtl:!1,locale:f.default.Tag},r);function T(e){(0,o.default)(this,T);var i=(0,s.default)(this,m.call(this,e));return i.onKeyDown=function(e){var t=i.props,n=t.closable,a=t.closeArea,r=t.onClick,o=t.disabled;e.keyCode!==x.KEYCODE.SPACE||o||(e.preventDefault(),e.stopPropagation(),n?i.handleClose(a):"function"==typeof r&&r(e))},i.state={visible:!0},y(i,["handleBodyClick","handleTailClick","handleAnimationInit","handleAnimationEnd","renderTailNode"]),i}_.displayName="Tag",t.default=p.default.config(_),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var p=r(n(18)),h=r(n(49)),m=r(n(4));t.isSingle=function(e){return!e||"single"===e},t.isNull=g,t.escapeForReg=o,t.filter=function(e,t){var n=o(""+e),a=new RegExp("("+n+")","ig");return a.test(""+t.value)||a.test(""+t.label)},t.loopMap=i,t.parseDataSourceFromChildren=function l(e){var u=1=p,C=(0,A.default)(((t={})[i+"upload-inner"]=!0,t[i+"hidden"]=T,t)),D=this.props.children;if("card"===l&&(a=(0,A.default)(((n={})[i+"upload-card"]=!0,n[i+"disabled"]=f,n)),D=R.default.createElement("div",{className:a},R.default.createElement(F.default,{size:"large",type:"add",className:i+"upload-add-icon"}),R.default.createElement("div",{tabIndex:"0",role:"button",className:i+"upload-text"},D))),S){if("function"!=typeof E)return o?R.default.createElement(W.default,{isPreview:!0,listType:o,style:d,className:u,value:this.state.value}):null;var O,N=(0,A.default)(((O={})[i+"form-preview"]=!0,O[u]=!!u,O));return R.default.createElement("div",{style:d,className:N},E(this.state.value,this.props))}var Y=f?H.func.prevent:y,P=H.obj.pickAttrsWith(this.props,"data-");return R.default.createElement("div",(0,j.default)({className:x,style:d},P),R.default.createElement(z.default,(0,j.default)({},L,{beforeUpload:m,dragable:s,disabled:f||T,className:C,onSelect:this.onSelect,onDrop:this.onDrop,onProgress:this.onProgress,onSuccess:this.onSuccess,onError:this.onError,ref:this.saveUploaderRef}),D),o||b?R.default.createElement(W.default,{useDataURL:c,uploader:this,listType:o,value:this.state.value,closable:h,onRemove:Y,progressProps:M,onCancel:v,onPreview:_,extraRender:w,rtl:k}):null)},r=a=v,a.displayName="Upload",a.propTypes=(0,j.default)({},f.default.propTypes,W.default.propTypes,{prefix:u.default.string.isRequired,action:u.default.string,value:u.default.array,defaultValue:u.default.array,shape:u.default.oneOf(["card"]),listType:u.default.oneOf(["text","image","card"]),list:u.default.any,name:u.default.string,data:u.default.oneOfType([u.default.object,u.default.func]),formatter:u.default.func,limit:u.default.number,timeout:u.default.number,dragable:u.default.bool,closable:u.default.bool,useDataURL:u.default.bool,disabled:u.default.bool,onSelect:u.default.func,onProgress:u.default.func,onChange:u.default.func,onSuccess:u.default.func,afterSelect:u.default.func,onRemove:u.default.func,onError:u.default.func,beforeUpload:u.default.func,onDrop:u.default.func,className:u.default.string,style:u.default.object,children:u.default.node,autoUpload:u.default.bool,request:u.default.func,progressProps:u.default.object,rtl:u.default.bool,isPreview:u.default.bool,renderPreview:u.default.func}),a.defaultProps=(0,j.default)({},f.default.defaultProps,{prefix:"next-",limit:1/0,autoUpload:!0,closable:!0,onSelect:g,onProgress:g,onChange:g,onSuccess:g,onRemove:g,onError:g,onDrop:g,beforeUpload:g,afterSelect:g}),o=function(){var f=this;this.onSelect=function(e){var t,n,a,r,o=f.props,i=o.autoUpload,s=o.afterSelect,l=o.onSelect,u=o.limit,d=f.state.value.length+e.length,c=u-f.state.value.length;c<=0||(n=t=e.map(function(e){var t=(0,p.fileToObject)(e);return t.state="selected",t}),a=[],u 16.8.0")},h.prototype.validate=function(e,t){this.validateCallback(e,t)},h.prototype.reset=function(e,t){var n=1","Select");var n=u(e,t);return e.onInputUpdate&&(n.onSearch=e.onInputUpdate,n.showSearch=!0),n}}),t.default=a.default.config(r.default,{transform:u,exportNames:["focusInput","handleSearchClear"]}),e.exports=t.default},function(e,t,n){"use strict";function a(){return(a=Object.assign||function(e){for(var t=1;tt?n.splice(t,n.length-t,a):n.push(a),u({action:"PUSH",location:a,index:t,entries:n}))})},replace:function(e,t){var n=P(e,t,d(),h.location);l.confirmTransitionTo(n,"REPLACE",r,function(e){e&&u({action:"REPLACE",location:h.entries[h.index]=n})})},go:p,goBack:function(){p(-1)},goForward:function(){p(1)},canGo:function(e){var t=h.index+e;return 0<=t&&tx',"Tag"),"readonly"!==n&&"interactive"!==n||r.log.warning("Warning: [ shape="+n+" ] is deprecated at [ Tag ]"),"secondary"===a&&r.log.warning("Warning: [ type=secondary ] is deprecated at [ Tag ]"),["count","marked","value","onChange"].forEach(function(e){e in t&&r.log.warning("Warning: [ "+e+" ] is deprecated at [ Tag ]")}),("selected"in t||"defaultSelected"in t)&&r.log.warning("Warning: [ selected|defaultSelected ] is deprecated at [ Tag ], use [ checked|defaultChecked ] at [ Tag.Selectable ] instead of it"),"closed"in t&&r.log.warning("Warning: [ closed ] is deprecated at [ Tag ], use [ onClose ] at [ Tag.Closeable ] instead of it"),"onSelect"in t&&e("onSelect","","Tag"),"afterClose"in t&&r.log.warning("Warning: [ afterClose ] is deprecated at [ Tag ], use [ afterClose ] at [ Tag.Closeable ] instead of it"),t}});d.Group=a.default.config(i.default),d.Selectable=a.default.config(s.default),d.Closable=a.default.config(l.default),d.Closeable=d.Closable,t.default=d,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a=o(n(685)),r=o(n(388));function o(e){return e&&e.__esModule?e:{default:e}}a.default.Panel=r.default,t.default=a.default,e.exports=t.default},function(e,t,n){var a=n(85);e.exports=function(e){if(!a(e))throw TypeError(e+" is not an object!");return e}},function(e,t){e.exports=function(e){try{return!!e()}catch(e){return!0}}},function(e,t,n){"use strict";n(40),n(65),n(503)},function(e,t,n){var i=n(334);function s(){if("function"!=typeof WeakMap)return null;var e=new WeakMap;return s=function(){return e},e}e.exports=function(e){if(e&&e.__esModule)return e;if(null===e||"object"!==i(e)&&"function"!=typeof e)return{default:e};var t=s();if(t&&t.has(e))return t.get(e);var n,a={},r=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var o in e){Object.prototype.hasOwnProperty.call(e,o)&&((n=r?Object.getOwnPropertyDescriptor(e,o):null)&&(n.get||n.set)?Object.defineProperty(a,o,n):a[o]=e[o])}return a.default=e,t&&t.set(e,a),a}},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,L=f(n(4)),o=f(n(3)),i=f(n(5)),s=f(n(6)),l=n(0),x=f(l),u=n(24),d=f(n(2)),T=f(n(12)),c=n(11);function f(e){return e&&e.__esModule?e:{default:e}}var p,h=c.func.bindCtx,C=c.obj.pickOthers,m=(p=l.Component,(0,s.default)(D,p),D.prototype.componentDidMount=function(){this.itemNode=(0,u.findDOMNode)(this);var e,t,n,a,r=this.props,o=r.parentMode,i=r.root,s=r.menu;s?this.menuNode=(0,u.findDOMNode)(s):"popup"===o?this.menuNode=this.itemNode.parentNode:(this.menuNode=(0,u.findDOMNode)(i),t=(e=i.props).prefix,n=e.header,a=e.footer,(n||a)&&(this.menuNode=this.menuNode.querySelector("."+t+"menu-content"))),this.setFocus()},D.prototype.componentDidUpdate=function(){this.setFocus()},D.prototype.focusable=function(){var e=this.props,t=e.root,n=e.type,a=e.disabled,r=t.props.focusable;return r&&("submenu"===n||!a)},D.prototype.getFocused=function(){var e=this.props,t=e._key;return e.root.state.focusedKey===t},D.prototype.setFocus=function(){var e;this.getFocused()&&(this.focusable()&&this.itemNode.focus({preventScroll:!0}),this.menuNode&&this.menuNode.scrollHeight>this.menuNode.clientHeight&&(this.menuNode.clientHeight+this.menuNode.scrollTop<(e=this.itemNode.offsetTop+this.itemNode.offsetHeight)?this.menuNode.scrollTop=e-this.menuNode.clientHeight:this.itemNode.offsetTop"===(d=e.charAt(o+1))){r+="(",o++,0[0-9][0-9][0-9][0-9])-(?[0-9][0-9]?)-(?[0-9][0-9]?)(?:(?:[Tt]|[ \t]+)(?[0-9][0-9]?):(?[0-9][0-9]):(?[0-9][0-9])(?:.(?[0-9]*))?(?:[ \t]*(?Z|(?[-+])(?[0-9][0-9]?)(?::(?[0-9][0-9]))?))?)?$","i"),r.LOCAL_TIMEZONE_OFFSET=60*(new Date).getTimezoneOffset()*1e3,r.trim=function(e,t){var n,a;return null==t&&(t="\\s"),null==(n=this.REGEX_LEFT_TRIM_BY_CHAR[t])&&(this.REGEX_LEFT_TRIM_BY_CHAR[t]=n=new RegExp("^"+t+t+"*")),n.lastIndex=0,null==(a=this.REGEX_RIGHT_TRIM_BY_CHAR[t])&&(this.REGEX_RIGHT_TRIM_BY_CHAR[t]=a=new RegExp(t+""+t+"*$")),a.lastIndex=0,e.replace(n,"").replace(a,"")},r.ltrim=function(e,t){var n;return null==t&&(t="\\s"),null==(n=this.REGEX_LEFT_TRIM_BY_CHAR[t])&&(this.REGEX_LEFT_TRIM_BY_CHAR[t]=n=new RegExp("^"+t+t+"*")),n.lastIndex=0,e.replace(n,"")},r.rtrim=function(e,t){var n;return null==t&&(t="\\s"),null==(n=this.REGEX_RIGHT_TRIM_BY_CHAR[t])&&(this.REGEX_RIGHT_TRIM_BY_CHAR[t]=n=new RegExp(t+""+t+"*$")),n.lastIndex=0,e.replace(n,"")},r.isEmpty=function(e){return!e||""===e||"0"===e||e instanceof Array&&0===e.length||this.isEmptyObject(e)},r.isEmptyObject=function(t){var n;return t instanceof Object&&0===function(){var e=[];for(n in t)a.call(t,n)&&e.push(n);return e}().length},r.subStrCount=function(e,t,n,a){var r,o,i,s,l,u=0;for(e=""+e,t=""+t,null!=n&&(e=e.slice(n)),null!=a&&(e=e.slice(0,a)),i=e.length,l=t.length,r=o=0,s=i;0<=s?o>6)+t(128|63&e):e<65536?t(224|e>>12)+t(128|e>>6&63)+t(128|63&e):t(240|e>>18)+t(128|e>>12&63)+t(128|e>>6&63)+t(128|63&e)},r.parseBoolean=function(e,t){var n;return null==t&&(t=!0),"string"==typeof e?(n=e.toLowerCase(),!(!t&&"no"===n)&&"0"!==n&&"false"!==n&&""!==n):!!e},r.isNumeric=function(e){return this.REGEX_SPACES.lastIndex=0,"number"==typeof e||"string"==typeof e&&!isNaN(e)&&""!==e.replace(this.REGEX_SPACES,"")},r.stringToDate=function(e){var t,n,a,r,o,i,s,l,u,d;if(null==e||!e.length)return null;if(!(o=this.PATTERN_DATE.exec(e)))return null;if(d=parseInt(o.year,10),s=parseInt(o.month,10)-1,n=parseInt(o.day,10),null==o.hour)return t=new Date(Date.UTC(d,s,n));if(r=parseInt(o.hour,10),i=parseInt(o.minute,10),l=parseInt(o.second,10),null!=o.fraction){for(a=o.fraction.slice(0,3);a.length<3;)a+="0";a=parseInt(a,10)}else a=0;return null!=o.tz&&(u=6e4*(60*parseInt(o.tz_hour,10)+(null!=o.tz_minute?parseInt(o.tz_minute,10):0)),"-"===o.tz_sign&&(u*=-1)),t=new Date(Date.UTC(d,s,n,r,i,l,a)),u&&t.setTime(t.getTime()-u),t},r.strRepeat=function(e,t){for(var n="",a=0;ae.length)&&(t=e.length);for(var n=0,a=new Array(t);ndocument.F=Object<\/script>"),e.close(),d=e.F;n--;)delete d[u][s[n]];return d()};e.exports=Object.create||function(e,t){var n;return null!==e?(r[u]=o(e),n=new r,r[u]=null,n[l]=e):n=d(),void 0===t?n:i(n,t)}},function(e,t,n){var a=n(76).f,r=n(77),o=n(87)("toStringTag");e.exports=function(e,t,n){e&&!r(e=n?e:e.prototype,o)&&a(e,o,{configurable:!0,value:t})}},function(e,t,n){t.f=n(87)},function(e,t,n){var a=n(71),r=n(72),o=n(113),i=n(146),s=n(76).f;e.exports=function(e){var t=r.Symbol||(r.Symbol=!o&&a.Symbol||{});"_"==e.charAt(0)||e in t||s(t,e,{value:i.f(e)})}},function(e,t,n){"use strict";n(75),n(505)},function(e,t,n){},function(e,t,n){e.exports=n(516)},function(e,t){function l(e,t,n,a,r,o,i){try{var s=e[o](i),l=s.value}catch(e){return void n(e)}s.done?t(l):Promise.resolve(l).then(a,r)}e.exports=function(s){return function(){var e=this,i=arguments;return new Promise(function(t,n){var a=s.apply(e,i);function r(e){l(a,t,n,r,o,"next",e)}function o(e){l(a,t,n,r,o,"throw",e)}r(void 0)})}}},function(e,t){e.exports=function(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}},function(s,e,l){"use strict";(function(e){var n=l(56),a=l(551),t={"Content-Type":"application/x-www-form-urlencoded"};function r(e,t){!n.isUndefined(e)&&n.isUndefined(e["Content-Type"])&&(e["Content-Type"]=t)}var o,i={adapter:("undefined"==typeof XMLHttpRequest&&void 0===e||(o=l(347)),o),transformRequest:[function(e,t){return a(t,"Content-Type"),n.isFormData(e)||n.isArrayBuffer(e)||n.isBuffer(e)||n.isStream(e)||n.isFile(e)||n.isBlob(e)?e:n.isArrayBufferView(e)?e.buffer:n.isURLSearchParams(e)?(r(t,"application/x-www-form-urlencoded;charset=utf-8"),e.toString()):n.isObject(e)?(r(t,"application/json;charset=utf-8"),JSON.stringify(e)):e}],transformResponse:[function(e){if("string"==typeof e)try{e=JSON.parse(e)}catch(e){}return e}],timeout:0,xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",maxContentLength:-1,validateStatus:function(e){return 200<=e&&e<300},headers:{common:{Accept:"application/json, text/plain, */*"}}};n.forEach(["delete","get","head"],function(e){i.headers[e]={}}),n.forEach(["post","put","patch"],function(e){i.headers[e]=n.merge(t)}),s.exports=i}).call(this,l(338))},function(e,t,n){"use strict";function s(e,t){for(var n=t&&t.plainObjects?Object.create(null):{},a=0;a>6]+u[128|63&i]:i<55296||57344<=i?r+=u[224|i>>12]+u[128|i>>6&63]+u[128|63&i]:(o+=1,i=65536+((1023&i)<<10|1023&a.charCodeAt(o)),r+=u[240|i>>18]+u[128|i>>12&63]+u[128|i>>6&63]+u[128|63&i])}return r},isBuffer:function(e){return!(!e||"object"!=typeof e)&&!!(e.constructor&&e.constructor.isBuffer&&e.constructor.isBuffer(e))},isRegExp:function(e){return"[object RegExp]"===Object.prototype.toString.call(e)},maybeMap:function(e,t){if(d(e)){for(var n=[],a=0;aa.length&&a.every(function(e,t){return e===n[t]})},t.isAvailablePos=function(e,t,n){var a=n[t],r=a.type,o=a.disabled;return i(e,t)&&("item"===r&&!o||"submenu"===r)});t.getFirstAvaliablelChildKey=function(t,n){var e=Object.keys(n).find(function(e){return a(t+"-0",e,n)});return e?n[e].key:null},t.getChildSelected=function(e){var t=e.selectMode,n=e.selectedKeys,a=e._k2n,r=e._key;if(!a)return!1;var o=a[r].pos+"-";return!!t&&n.some(function(e){return a[e]&&0===a[e].pos.indexOf(o)})}},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,o=d(n(3)),i=d(n(5)),s=d(n(6)),l=d(n(0)),u=d(n(2));function d(e){return e&&e.__esModule?e:{default:e}}var c,f=(c=l.default.Component,(0,s.default)(p,c),p.prototype.render=function(){return null},r=a=p,a.propTypes={dataIndex:u.default.string,cell:u.default.oneOfType([u.default.element,u.default.node,u.default.func]),title:u.default.oneOfType([u.default.element,u.default.node,u.default.func]),htmlTitle:u.default.string,sortable:u.default.bool,width:u.default.oneOfType([u.default.number,u.default.string]),align:u.default.oneOf(["left","center","right"]),alignHeader:u.default.oneOf(["left","center","right"]),filters:u.default.arrayOf(u.default.shape({label:u.default.string,value:u.default.oneOfType([u.default.node,u.default.string])})),filterMode:u.default.oneOf(["single","multiple"]),filterMenuProps:u.default.object,filterProps:u.default.object,lock:u.default.oneOfType([u.default.bool,u.default.string]),resizable:u.default.bool,colSpan:u.default.number},a.contextTypes={parent:u.default.any},a.defaultProps={cell:function(e){return e},filterMode:"multiple",filterMenuProps:{subMenuSelectable:!1},filterProps:{},resizable:!1},a._typeMark="column",r);function p(){return(0,o.default)(this,p),(0,i.default)(this,c.apply(this,arguments))}f.displayName="Column",t.default=f,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a=l(n(3)),r=l(n(5)),o=l(n(6)),i=l(n(0)),s=l(n(2));function l(e){return e&&e.__esModule?e:{default:e}}var u,d=(u=i.default.Component,(0,o.default)(c,u),c.prototype.render=function(){var e=this.props,t=e.children,n=e.wrapperContent,a=e.prefix;return i.default.createElement("div",{className:a+"table-inner"},t,n)},c.propTypes={children:s.default.any,prefix:s.default.string,colGroup:s.default.any,wrapperContent:s.default.any},c);function c(){return(0,a.default)(this,c),(0,r.default)(this,u.apply(this,arguments))}d.displayName="FixedWrapper",t.default=d,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a,r,k=h(n(18)),S=h(n(4)),o=h(n(3)),s=h(n(5)),i=h(n(6)),l=n(0),E=h(l),u=h(n(2)),L=h(n(12)),d=h(n(116)),c=h(n(23)),x=n(11),f=h(n(42)),p=h(n(8));function h(e){return e&&e.__esModule?e:{default:e}}var m,g=x.func.noop,y=x.func.bindCtx,v=/blue|green|orange|red|turquoise|yellow/,_=(m=l.Component,(0,i.default)(T,m),T.prototype.componentWillUnmount=function(){this.__destroyed=!0},T.prototype.handleClose=function(e){var t=this,n=this.props,a=n.animation,r=n.onClose,o=x.support.animation&&a;!1===r(e,this.tagNode)||this.__destroyed||this.setState({visible:!1},function(){o||t.props.afterClose(t.tagNode)})},T.prototype.handleBodyClick=function(e){var t=this.props,n=t.closable,a=t.closeArea,r=t.onClick;if(n&&"tag"===a&&this.handleClose("tag"),"function"==typeof r)return r(e)},T.prototype.handleTailClick=function(e){e&&e.preventDefault(),e&&e.stopPropagation(),this.handleClose("tail")},T.prototype.handleAnimationInit=function(e){this.props.afterAppear(e)},T.prototype.handleAnimationEnd=function(e){this.props.afterClose(e)},T.prototype.renderAnimatedTag=function(e,t){return E.default.createElement(d.default,{animation:t,afterAppear:this.handleAnimationInit,afterLeave:this.handleAnimationEnd},e)},T.prototype.renderTailNode=function(){var e=this.props,t=e.prefix,n=e.closable,a=e.locale;return n?E.default.createElement("span",{className:t+"tag-close-btn",onClick:this.handleTailClick,role:"button","aria-label":a.delete},E.default.createElement(c.default,{type:"close"})):null},T.prototype.isPresetColor=function(){var e=this.props.color;return!!e&&v.test(e)},T.prototype.getTagStyle=function(){var e=this.props,t=e.color,n=void 0===t?"":t,a=e.style,r=this.isPresetColor(),o={backgroundColor:n,borderColor:n,color:"#fff"};return(0,S.default)({},n&&!r?o:null,a)},T.prototype.render=function(){var e,t=this,n=this.props,a=n.prefix,r=n.type,o=n.size,i=n.color,s=n._shape,l=n.closable,u=n.closeArea,d=n.className,c=n.children,f=n.animation,p=n.disabled,h=n.rtl,m=this.state.visible,g=this.isPresetColor(),y=x.obj.pickOthers(T.propTypes,this.props),v=(y.style,(0,k.default)(y,["style"])),_=l?"closable":s,b=(0,L.default)([a+"tag",a+"tag-"+_,a+"tag-"+o],((e={})[a+"tag-level-"+r]=!i,e[a+"tag-closable"]=l,e[a+"tag-body-pointer"]=l&&"tag"===u,e[a+"tag-"+i]=i&&g&&"primary"===r,e[a+"tag-"+i+"-inverse"]=i&&g&&"normal"===r,e),d),w=this.renderTailNode(),M=m?E.default.createElement("div",(0,S.default)({className:b,onClick:this.handleBodyClick,onKeyDown:this.onKeyDown,tabIndex:p?"":"0",role:"button","aria-disabled":p,disabled:p,dir:h?"rtl":void 0,ref:function(e){return t.tagNode=e},style:this.getTagStyle()},v),E.default.createElement("span",{className:a+"tag-body"},c),w):null;return f&&x.support.animation?this.renderAnimatedTag(M,a+"tag-zoom"):M},r=a=T,a.propTypes={prefix:u.default.string,type:u.default.oneOf(["normal","primary"]),size:u.default.oneOf(["small","medium","large"]),color:u.default.string,animation:u.default.bool,closeArea:u.default.oneOf(["tag","tail"]),closable:u.default.bool,onClose:u.default.func,afterClose:u.default.func,afterAppear:u.default.func,className:u.default.any,children:u.default.node,onClick:u.default.func,_shape:u.default.oneOf(["default","closable","checkable"]),disabled:u.default.bool,rtl:u.default.bool,locale:u.default.object},a.defaultProps={prefix:"next-",type:"normal",size:"medium",closeArea:"tail",animation:!1,onClose:g,afterClose:g,afterAppear:g,onClick:g,_shape:"default",disabled:!1,rtl:!1,locale:f.default.Tag},r);function T(e){(0,o.default)(this,T);var i=(0,s.default)(this,m.call(this,e));return i.onKeyDown=function(e){var t=i.props,n=t.closable,a=t.closeArea,r=t.onClick,o=t.disabled;e.keyCode!==x.KEYCODE.SPACE||o||(e.preventDefault(),e.stopPropagation(),n?i.handleClose(a):"function"==typeof r&&r(e))},i.state={visible:!0},y(i,["handleBodyClick","handleTailClick","handleAnimationInit","handleAnimationEnd","renderTailNode"]),i}_.displayName="Tag",t.default=p.default.config(_),e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var p=r(n(18)),h=r(n(49)),m=r(n(4));t.isSingle=function(e){return!e||"single"===e},t.isNull=g,t.escapeForReg=o,t.filter=function(e,t){var n=o(""+e),a=new RegExp("("+n+")","ig");return a.test(""+t.value)||a.test(""+t.label)},t.loopMap=i,t.parseDataSourceFromChildren=function l(e){var u=1=p,C=(0,A.default)(((t={})[i+"upload-inner"]=!0,t[i+"hidden"]=T,t)),D=this.props.children;if("card"===l&&(a=(0,A.default)(((n={})[i+"upload-card"]=!0,n[i+"disabled"]=f,n)),D=R.default.createElement("div",{className:a},R.default.createElement(F.default,{size:"large",type:"add",className:i+"upload-add-icon"}),R.default.createElement("div",{tabIndex:"0",role:"button",className:i+"upload-text"},D))),S){if("function"!=typeof E)return o?R.default.createElement(W.default,{isPreview:!0,listType:o,style:d,className:u,value:this.state.value}):null;var O,N=(0,A.default)(((O={})[i+"form-preview"]=!0,O[u]=!!u,O));return R.default.createElement("div",{style:d,className:N},E(this.state.value,this.props))}var Y=f?H.func.prevent:y,P=H.obj.pickAttrsWith(this.props,"data-");return R.default.createElement("div",(0,j.default)({className:x,style:d},P),R.default.createElement(z.default,(0,j.default)({},L,{beforeUpload:m,dragable:s,disabled:f||T,className:C,onSelect:this.onSelect,onDrop:this.onDrop,onProgress:this.onProgress,onSuccess:this.onSuccess,onError:this.onError,ref:this.saveUploaderRef}),D),o||b?R.default.createElement(W.default,{useDataURL:c,uploader:this,listType:o,value:this.state.value,closable:h,onRemove:Y,progressProps:M,onCancel:v,onPreview:_,extraRender:w,rtl:k}):null)},r=a=v,a.displayName="Upload",a.propTypes=(0,j.default)({},f.default.propTypes,W.default.propTypes,{prefix:u.default.string.isRequired,action:u.default.string,value:u.default.array,defaultValue:u.default.array,shape:u.default.oneOf(["card"]),listType:u.default.oneOf(["text","image","card"]),list:u.default.any,name:u.default.string,data:u.default.oneOfType([u.default.object,u.default.func]),formatter:u.default.func,limit:u.default.number,timeout:u.default.number,dragable:u.default.bool,closable:u.default.bool,useDataURL:u.default.bool,disabled:u.default.bool,onSelect:u.default.func,onProgress:u.default.func,onChange:u.default.func,onSuccess:u.default.func,afterSelect:u.default.func,onRemove:u.default.func,onError:u.default.func,beforeUpload:u.default.func,onDrop:u.default.func,className:u.default.string,style:u.default.object,children:u.default.node,autoUpload:u.default.bool,request:u.default.func,progressProps:u.default.object,rtl:u.default.bool,isPreview:u.default.bool,renderPreview:u.default.func}),a.defaultProps=(0,j.default)({},f.default.defaultProps,{prefix:"next-",limit:1/0,autoUpload:!0,closable:!0,onSelect:g,onProgress:g,onChange:g,onSuccess:g,onRemove:g,onError:g,onDrop:g,beforeUpload:g,afterSelect:g}),o=function(){var f=this;this.onSelect=function(e){var t,n,a,r,o=f.props,i=o.autoUpload,s=o.afterSelect,l=o.onSelect,u=o.limit,d=f.state.value.length+e.length,c=u-f.state.value.length;c<=0||(n=t=e.map(function(e){var t=(0,p.fileToObject)(e);return t.state="selected",t}),a=[],u=11?e:e+12}else if(t==="下午"||t==="晚上"){return e+12}},meridiem:function(e,t,n){var a=e*100+t;if(a<600){return"凌晨"}else if(a<900){return"早上"}else if(a<1130){return"上午"}else if(a<1230){return"中午"}else if(a<1800){return"下午"}else{return"晚上"}},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(e,t){switch(t){case"d":case"D":case"DDD":return e+"日";case"M":return e+"月";case"w":case"W":return e+"週";default:return e}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}})}(n(7))},function(e,t,n){!function(e){"use strict"; //! moment.js locale configuration -var t;e.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(e,t){if(e===12){e=0}if(t==="凌晨"||t==="早上"||t==="上午"){return e}else if(t==="中午"){return e>=11?e:e+12}else if(t==="下午"||t==="晚上"){return e+12}},meridiem:function(e,t,n){var a=e*100+t;if(a<600){return"凌晨"}else if(a<900){return"早上"}else if(a<1130){return"上午"}else if(a<1230){return"中午"}else if(a<1800){return"下午"}else{return"晚上"}},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(e,t){switch(t){case"d":case"D":case"DDD":return e+"日";case"M":return e+"月";case"w":case"W":return e+"週";default:return e}},relativeTime:{future:"%s後",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}})}(n(7))},function(e,t,n){"use strict";t.__esModule=!0;var a,r,w=p(n(4)),o=p(n(3)),i=p(n(5)),s=p(n(6)),l=n(0),M=p(l),u=p(n(2)),d=n(28),k=p(n(12)),c=p(n(42)),S=p(n(23)),E=p(n(116)),f=p(n(8)),L=n(11);function p(e){return e&&e.__esModule?e:{default:e}}function h(){}var m,g=(m=l.Component,(0,s.default)(x,m),x.getDerivedStateFromProps=function(e){return"visible"in e?{visible:e.visible}:{}},x.prototype.render=function(){var e,t=this.props,n=t.prefix,a=(t.pure,t.className),r=t.style,o=t.type,i=t.shape,s=t.size,l=t.title,u=t.children,d=(t.defaultVisible,t.visible,t.iconType),c=t.closeable,f=(t.onClose,t.afterClose),p=t.animation,h=t.rtl,m=t.locale,g=(0,w.default)({},L.obj.pickOthers(Object.keys(x.propTypes),this.props)),y=this.state.visible,v=n+"message",_=(0,k.default)(((e={})[v]=!0,e[n+"message-"+o]=o,e[""+n+i]=i,e[""+n+s]=s,e[n+"title-content"]=!!l,e[n+"only-content"]=!l&&!!u,e[a]=a,e)),b=y?M.default.createElement("div",(0,w.default)({role:"alert",style:r},g,{className:_,dir:h?"rtl":void 0}),c?M.default.createElement("a",{role:"button","aria-label":m.closeAriaLabel,className:v+"-close",onClick:this.onClose},M.default.createElement(S.default,{type:"close"})):null,M.default.createElement(S.default,{className:v+"-symbol "+(!d&&v+"-symbol-icon"),type:d}),l?M.default.createElement("div",{className:v+"-title"},l):null,u?M.default.createElement("div",{className:v+"-content"},u):null):null;return p?M.default.createElement(E.default.Expand,{animationAppear:!1,afterLeave:f},b):b},r=a=x,a.propTypes={prefix:u.default.string,pure:u.default.bool,className:u.default.string,style:u.default.object,type:u.default.oneOf(["success","warning","error","notice","help","loading"]),shape:u.default.oneOf(["inline","addon","toast"]),size:u.default.oneOf(["medium","large"]),title:u.default.node,children:u.default.node,defaultVisible:u.default.bool,visible:u.default.bool,iconType:u.default.string,closeable:u.default.bool,onClose:u.default.func,afterClose:u.default.func,animation:u.default.bool,locale:u.default.object,rtl:u.default.bool},a.defaultProps={prefix:"next-",pure:!1,type:"success",shape:"inline",size:"medium",defaultVisible:!0,closeable:!1,onClose:h,afterClose:h,animation:!0,locale:c.default.Message},r);function x(){var e,t;(0,o.default)(this,x);for(var n=arguments.length,a=Array(n),r=0;re.clientHeight&&0this.popupNode.offsetWidth&&m(this.popupNode,"width",e.offsetWidth+"px"),"outside"!==d||"hoz"===u&&1===a||(m(this.popupNode,"height",p.offsetHeight+"px"),m(this.popupNode,"overflow-y","scroll"));var h=this.popupProps;h.onOpen&&h.onOpen()},j.prototype.handlePopupClose=function(){var e=this.props.root.popupNodes,t=e.indexOf(this.popupNode);-1 "+this.message+" (line "+this.parsedLine+": '"+this.snippet+"')":" "+this.message},e.exports=n},function(e,t){var r={}.hasOwnProperty;function n(e,t,n){this.message=e,this.parsedLine=t,this.snippet=n}(function(e,t){for(var n in t)r.call(t,n)&&(e[n]=t[n]);function a(){this.constructor=e}a.prototype=t.prototype,e.prototype=new a,e.__super__=t.prototype})(n,Error),n.prototype.toString=function(){return null!=this.parsedLine&&null!=this.snippet?" "+this.message+" (line "+this.parsedLine+": '"+this.snippet+"')":" "+this.message},e.exports=n},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,S=m(n(4)),o=m(n(3)),i=m(n(5)),s=m(n(6)),l=n(0),E=m(l),u=n(24),d=m(n(2)),L=m(n(12)),c=n(11),v=m(n(50)),f=m(n(63)),x=m(n(10)),p=m(n(42)),h=m(n(631)),_=m(n(382)),b=n(160);function m(e){return e&&e.__esModule?e:{default:e}}var T=f.default.Popup,g=v.default.Item,y=v.default.Group,w=c.func.noop,M=c.func.bindCtx,C=c.func.makeChain;function k(e){e.preventDefault()}var D,O=(D=E.default.Component,(0,s.default)(N,D),N.prototype.componentDidMount=function(){var e=this;setTimeout(function(){return e.syncWidth()},0),c.events.on(window,"resize",this.handleResize)},N.prototype.componentDidUpdate=function(e,t){e.label===this.props.label&&t.value===this.state.value||this.syncWidth()},N.prototype.componentWillUnmount=function(){c.events.off(window,"resize",this.handleResize),clearTimeout(this.resizeTimeout)},N.prototype.syncWidth=function(){var e,t=this,n=this.props,a=n.popupStyle,r=n.popupProps;a&&"width"in a||r&&r.style&&"width"in r.style||(e=c.dom.getStyle(this.selectDOM,"width"))&&this.width!==e&&(this.width=e,this.popupRef&&this.shouldAutoWidth()&&setTimeout(function(){t.popupRef&&t.popupRef.getInstance().overlay&&c.dom.setStyle(t.popupRef.getInstance().overlay.getInstance().getContentNode(),"width",t.width)},0))},N.prototype.handleResize=function(){var e=this;clearTimeout(this.resizeTimeout),this.state.visible&&(this.resizeTimeout=setTimeout(function(){e.syncWidth()},200))},N.prototype.setDataSource=function(e){var t=e.dataSource,n=e.children;return l.Children.count(n)?this.dataStore.updateByDS(n,!0):Array.isArray(t)?this.dataStore.updateByDS(t,!1):[]},N.prototype.setVisible=function(e,t){this.props.disabled||this.state.visible===e||("visible"in this.props||this.setState({visible:e}),this.props.onVisibleChange(e,t))},N.prototype.setFirstHightLightKeyForMenu=function(){var e;this.props.autoHighlightFirstItem&&this.dataStore.getMenuDS().length&&this.dataStore.getEnableDS().length&&(e=""+this.dataStore.getEnableDS()[0].value,this.setState({highlightKey:e}),this.props.onToggleHighlightItem(e,"autoFirstItem"))},N.prototype.handleChange=function(e){var t;"value"in this.props||this.setState({value:e});for(var n=arguments.length,a=Array(1e.slidesToShow&&(a=e.slideWidth*e.slidesToShow*-1,i=e.slideHeight*e.slidesToShow*-1),e.slideCount%e.slidesToScroll!=0&&(t=e.slideIndex+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow,e.rtl&&(t=(e.slideIndex>=e.slideCount?e.slideCount-e.slideIndex:e.slideIndex)+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow),t&&(i=e.slideIndex>e.slideCount?(a=(e.slidesToShow-(e.slideIndex-e.slideCount))*e.slideWidth*-1,(e.slidesToShow-(e.slideIndex-e.slideCount))*e.slideHeight*-1):(a=e.slideCount%e.slidesToScroll*e.slideWidth*-1,e.slideCount%e.slidesToScroll*e.slideHeight*-1)))):e.slideCount%e.slidesToScroll!=0&&e.slideIndex+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow&&(a=(e.slidesToShow-e.slideCount%e.slidesToScroll)*e.slideWidth),e.centerMode&&(e.infinite?a+=e.slideWidth*Math.floor(e.slidesToShow/2):a=e.slideWidth*Math.floor(e.slidesToShow/2)),r=e.vertical?e.slideIndex*e.slideHeight*-1+i:e.slideIndex*e.slideWidth*-1+a,!0===e.variableWidth&&(n=void 0,r=(o=e.slideCount<=e.slidesToShow||!1===e.infinite?s.default.findDOMNode(e.trackRef).childNodes[e.slideIndex]:(n=e.slideIndex+e.slidesToShow,s.default.findDOMNode(e.trackRef).childNodes[n]))?-1*o.offsetLeft:0,!0===e.centerMode&&(o=!1===e.infinite?s.default.findDOMNode(e.trackRef).children[e.slideIndex]:s.default.findDOMNode(e.trackRef).children[e.slideIndex+e.slidesToShow+1])&&(r=-1*o.offsetLeft+(e.listWidth-o.offsetWidth)/2)),r)}},function(e,t,n){"use strict";t.__esModule=!0;var a,r,y=c(n(4)),v=c(n(18)),o=c(n(3)),i=c(n(5)),s=c(n(6)),_=c(n(0)),l=c(n(2)),b=c(n(12)),u=c(n(8)),w=c(n(23)),d=n(11);function c(e){return e&&e.__esModule?e:{default:e}}var f,p=(f=_.default.Component,(0,s.default)(h,f),h.prototype.render=function(){var e,t,n=this.props,a=n.title,r=n.children,o=n.className,i=n.isExpanded,s=n.disabled,l=n.style,u=n.prefix,d=n.onClick,c=n.id,f=(0,v.default)(n,["title","children","className","isExpanded","disabled","style","prefix","onClick","id"]),p=(0,b.default)(((e={})[u+"collapse-panel"]=!0,e[u+"collapse-panel-hidden"]=!i,e[u+"collapse-panel-expanded"]=i,e[u+"collapse-panel-disabled"]=s,e[o]=o,e)),h=(0,b.default)(((t={})[u+"collapse-panel-icon"]=!0,t[u+"collapse-panel-icon-expanded"]=i,t)),m=c?c+"-heading":void 0,g=c?c+"-region":void 0;return _.default.createElement("div",(0,y.default)({className:p,style:l,id:c},f),_.default.createElement("div",{id:m,className:u+"collapse-panel-title",onClick:d,onKeyDown:this.onKeyDown,tabIndex:"0","aria-disabled":s,"aria-expanded":i,"aria-controls":g,role:"button"},_.default.createElement(w.default,{type:"arrow-right",className:h,"aria-hidden":"true"}),a),_.default.createElement("div",{className:u+"collapse-panel-content",role:"region",id:g},r))},r=a=h,a.propTypes={prefix:l.default.string,style:l.default.object,children:l.default.any,isExpanded:l.default.bool,disabled:l.default.bool,title:l.default.node,className:l.default.string,onClick:l.default.func,id:l.default.string},a.defaultProps={prefix:"next-",isExpanded:!1,onClick:d.func.noop},a.isNextPanel=!0,r);function h(){var e,n;(0,o.default)(this,h);for(var t=arguments.length,a=Array(t),r=0;r\n com.alibaba.nacos\n nacos-client\n ${version}\n \n*/\npackage com.alibaba.nacos.example;\n\nimport java.util.Properties;\nimport java.util.concurrent.Executor;\nimport com.alibaba.nacos.api.NacosFactory;\nimport com.alibaba.nacos.api.config.ConfigService;\nimport com.alibaba.nacos.api.config.listener.Listener;\nimport com.alibaba.nacos.api.exception.NacosException;\n\n/**\n * Config service example\n *\n * @author Nacos\n *\n */\npublic class ConfigExample {\n\n\tpublic static void main(String[] args) throws NacosException, InterruptedException {\n\t\tString serverAddr = "localhost";\n\t\tString dataId = "'.concat(e.dataId,'";\n\t\tString group = "').concat(e.group,'";\n\t\tProperties properties = new Properties();\n\t\tproperties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);\n\t\tConfigService configService = NacosFactory.createConfigService(properties);\n\t\tString content = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\t\tconfigService.addListener(dataId, group, new Listener() {\n\t\t\t@Override\n\t\t\tpublic void receiveConfigInfo(String configInfo) {\n\t\t\t\tSystem.out.println("recieve:" + configInfo);\n\t\t\t}\n\n\t\t\t@Override\n\t\t\tpublic Executor getExecutor() {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\n\t\tboolean isPublishOk = configService.publishConfig(dataId, group, "content");\n\t\tSystem.out.println(isPublishOk);\n\n\t\tThread.sleep(3000);\n\t\tcontent = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\n\t\tboolean isRemoveOk = configService.removeConfig(dataId, group);\n\t\tSystem.out.println(isRemoveOk);\n\t\tThread.sleep(3000);\n\n\t\tcontent = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\t\tThread.sleep(300000);\n\n\t}\n}\n')}},{key:"getNodejsCode",value:function(){return"TODO"}},{key:"getCppCode",value:function(){return"TODO"}},{key:"getShellCode",value:function(){return"TODO"}},{key:"getPythonCode",value:function(){return"TODO"}},{key:"openDialog",value:function(e){var t=this;this.setState({dialogvisible:!0}),this.record=e,setTimeout(function(){t.getData()})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createCodeMirror",value:function(e,t){var n=this.refs.codepreview;n&&(n.innerHTML="",this.cm=window.CodeMirror(n,{value:t,mode:e,height:400,width:500,lineNumbers:!0,theme:"xq-light",lint:!0,tabMode:"indent",autoMatchParens:!0,textWrapping:!0,gutters:["CodeMirror-lint-markers"],extraKeys:{F1:function(e){e.setOption("fullScreen",!e.getOption("fullScreen"))},Esc:function(e){e.getOption("fullScreen")&&e.setOption("fullScreen",!1)}}}))}},{key:"changeTab",value:function(e,t){var n=this;setTimeout(function(){n[e]=!0,n.createCodeMirror("text/javascript",t)})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=Z.a.createElement("div",null);return Z.a.createElement("div",null,Z.a.createElement(F.a,{title:t.sampleCode,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},Z.a.createElement("div",{style:{height:500}},Z.a.createElement(ie.a,{tip:t.loading,style:{width:"100%"},visible:this.state.loading},Z.a.createElement(le.a,{shape:"text",style:{height:40,paddingBottom:10}},Z.a.createElement(ue,{title:"Java",key:1,onClick:this.changeTab.bind(this,"commoneditor1",this.defaultCode)}),Z.a.createElement(ue,{title:"Spring Boot",key:2,onClick:this.changeTab.bind(this,"commoneditor2",this.sprigboot_code)}),Z.a.createElement(ue,{title:"Spring Cloud",key:21,onClick:this.changeTab.bind(this,"commoneditor21",this.sprigcloud_code)}),Z.a.createElement(ue,{title:"Node.js",key:3,onClick:this.changeTab.bind(this,"commoneditor3",this.nodejsCode)}),Z.a.createElement(ue,{title:"C++",key:4,onClick:this.changeTab.bind(this,"commoneditor4",this.cppCode)}),Z.a.createElement(ue,{title:"Shell",key:5,onClick:this.changeTab.bind(this,"commoneditor5",this.shellCode)}),Z.a.createElement(ue,{title:"Python",key:6,onClick:this.changeTab.bind(this,"commoneditor6",this.pythonCode)})),Z.a.createElement("div",{ref:"codepreview"})))))}}]),a}(Z.a.Component),r.displayName="ShowCodeing",a=o))||a,ce=(n(66),n(37)),fe=n.n(ce),pe=(n(674),fe.a.Row),he=fe.a.Col,me=(0,J.a.config)((l=s=function(e){Object(K.a)(a,e);var n=Object(G.a)(a);function a(e){var t;return Object(V.a)(this,a),(t=n.call(this,e)).state={visible:!1,title:"",content:"",isok:!0,dataId:"",group:""},t}return Object(B.a)(a,[{key:"componentDidMount",value:function(){this.initData()}},{key:"initData",value:function(){var e=this.props.locale,t=void 0===e?{}:e;this.setState({title:t.confManagement})}},{key:"openDialog",value:function(e){this.setState({visible:!0,title:e.title,content:e.content,isok:e.isok,dataId:e.dataId,group:e.group,message:e.message})}},{key:"closeDialog",value:function(){this.setState({visible:!1})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=Z.a.createElement("div",{style:{textAlign:"right"}},Z.a.createElement(M.a,{type:"primary",onClick:this.closeDialog.bind(this)},t.determine));return Z.a.createElement("div",null,Z.a.createElement(F.a,{visible:this.state.visible,footer:n,style:{width:555},onCancel:this.closeDialog.bind(this),onClose:this.closeDialog.bind(this),title:t.deletetitle},Z.a.createElement("div",null,Z.a.createElement(pe,null,Z.a.createElement(he,{span:"4",style:{paddingTop:16}},Z.a.createElement(I.a,{type:"".concat(this.state.isok?"success":"delete","-filling"),style:{color:this.state.isok?"green":"red"},size:"xl"})),Z.a.createElement(he,{span:"20"},Z.a.createElement("div",null,Z.a.createElement("h3",null,this.state.isok?t.deletedSuccessfully:t.deleteFailed),Z.a.createElement("p",null,Z.a.createElement("span",{style:{color:"#999",marginRight:5}},"Data ID:"),Z.a.createElement("span",{style:{color:"#c7254e"}},this.state.dataId)),Z.a.createElement("p",null,Z.a.createElement("span",{style:{color:"#999",marginRight:5}},"Group:"),Z.a.createElement("span",{style:{color:"#c7254e"}},this.state.group)),this.state.isok?"":Z.a.createElement("p",{style:{color:"red"}},this.state.message)))))))}}]),a}(Z.a.Component),s.displayName="DeleteDialog",i=l))||i,ge=(n(675),n(401)),ye=n.n(ge),ve=(0,J.a.config)((c=d=function(e){Object(K.a)(n,e);var t=Object(G.a)(n);function n(){return Object(V.a)(this,n),t.apply(this,arguments)}return Object(B.a)(n,[{key:"render",value:function(){var e=this.props,t=e.data,n=void 0===t?{}:t,a=e.height,r=e.locale,o=void 0===r?{}:r;return Z.a.createElement("div",null,"notice"===n.modeType?Z.a.createElement("div",{"data-spm-click":"gostr=/aliyun;locaid=notice"},Z.a.createElement(ye.a,{style:{marginBottom:1u?P.a.createElement(q.a,{className:"pagination",total:l.count,pageSize:u,onChange:function(e){return a.onChangePage(e)}}):null,P.a.createElement(Q,{ref:this.editInstanceDialog,serviceName:o,clusterName:n,groupName:i,openLoading:function(){return a.openLoading()},closeLoading:function(){return a.closeLoading()},getInstanceList:function(){return a.getInstanceList()}})):null}}]),a}(P.a.Component),d.displayName="InstanceTable",u=c))||u,Z=n(46),ee=(n(698),N.a.Item),te={labelCol:{fixedSpan:10},wrapperCol:{span:14}},ne=(0,D.a.config)((h=p=function(e){Object(x.a)(a,e);var n=Object(T.a)(a);function a(e){var t;return Object(E.a)(this,a),(t=n.call(this,e)).editServiceDialog=P.a.createRef(),t.editClusterDialog=P.a.createRef(),t.state={serviceName:Object(Z.b)(e.location.search,"name"),groupName:Object(Z.b)(e.location.search,"groupName"),loading:!1,currentPage:1,clusters:[],instances:{},service:{},pageSize:10,pageNum:{}},t}return Object(L.a)(a,[{key:"componentDidMount",value:function(){this.state.serviceName?this.getServiceDetail():this.props.history.goBack()}},{key:"getServiceDetail",value:function(){var o=this,e=this.state,t=e.serviceName,n=e.groupName;Object(j.c)({url:"v1/ns/catalog/service?serviceName=".concat(t,"&groupName=").concat(n),beforeSend:function(){return o.openLoading()},success:function(e){var t=e.clusters,n=void 0===t?[]:t,a=e.service,r=void 0===a?{}:a;return o.setState({service:r,clusters:n})},error:function(e){return k.a.error(e.responseText||"error")},complete:function(){return o.closeLoading()}})}},{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){this.editServiceDialog.current.getInstance().show(this.state.service)}},{key:"openClusterDialog",value:function(e){this.editClusterDialog.current.getInstance().show(e)}},{key:"render",value:function(){var t=this,e=this.props.locale,n=void 0===e?{}:e,a=this.state,r=a.serviceName,o=a.groupName,i=a.loading,s=a.service,l=void 0===s?{}:s,u=a.clusters,d=l.metadata,c=void 0===d?{}:d,f=l.selector,p=void 0===f?{}:f,h="";return Object.keys(c).length&&(h=JSON.stringify(c,null,"\t")),P.a.createElement("div",{className:"main-container service-detail"},P.a.createElement(g.a,{shape:"flower",tip:"Loading...",className:"loading",visible:i,color:"#333"},P.a.createElement("h1",{style:{position:"relative",width:"100%"}},n.serviceDetails,P.a.createElement(w.a,{type:"primary",className:"header-btn",onClick:function(){return t.props.history.goBack()}},n.back),P.a.createElement(w.a,{type:"normal",className:"header-btn",onClick:function(){return t.openEditServiceDialog()}},n.editService)),P.a.createElement(N.a,te,P.a.createElement(ee,{label:"".concat(n.serviceName,":")},P.a.createElement(S.a,{value:l.name,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.groupName,":")},P.a.createElement(S.a,{value:l.groupName,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.protectThreshold,":")},P.a.createElement(S.a,{value:l.protectThreshold,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.metadata,":")},P.a.createElement(U.a,{language:"json",width:"100%",height:200,value:h,options:B.c})),P.a.createElement(ee,{label:"".concat(n.type,":")},P.a.createElement(S.a,{value:p.type,readOnly:!0})),"label"===l.type&&P.a.createElement(ee,{label:"".concat(n.selector,":")},P.a.createElement(S.a,{value:p.selector,readOnly:!0}))),u.map(function(e){return P.a.createElement(v.a,{key:e.name,className:"cluster-card",title:"".concat(n.cluster,":"),subTitle:e.name,contentHeight:"auto",extra:P.a.createElement(w.a,{type:"normal",onClick:function(){return t.openClusterDialog(e)}},n.editCluster)},P.a.createElement(X,{clusterName:e.name,serviceName:r,groupName:o}))})),P.a.createElement(I.a,{ref:this.editServiceDialog,openLoading:function(){return t.openLoading()},closeLoading:function(){return t.closeLoading()},getServiceDetail:function(){return t.getServiceDetail()}}),P.a.createElement(K,{ref:this.editClusterDialog,openLoading:function(){return t.openLoading()},closeLoading:function(){return t.closeLoading()},getServiceDetail:function(){return t.getServiceDetail()}}))}}]),a}(P.a.Component),p.displayName="ServiceDetail",f=h))||f;t.a=ne},function(e,t,d){"use strict";d(48);var n,a,r,o,i,s,l=d(30),y=d.n(l),u=(d(31),d(20)),v=d.n(u),c=(d(376),d(130)),_=d.n(c),f=(d(40),d(23)),b=d.n(f),p=(d(118),d(80)),w=d.n(p),h=(d(102),d(69)),M=d.n(h),m=(d(68),d(33)),k=d.n(m),g=(d(41),d(9)),S=d.n(g),E=(d(36),d(10)),L=d.n(E),x=(d(123),d(57)),T=d.n(x),C=d(58),D=d(21),O=(d(35),d(19)),N=d.n(O),Y=(d(52),d(27)),P=d.n(Y),j=d(13),I=d(14),R=d(16),A=d(15),H=(d(25),d(8)),F=d.n(H),z=(d(66),d(37)),W=d.n(z),V=d(0),B=d.n(V),U=d(1),K=d(46),G=d(39),q=d(129),J=d(96),$=(d(645),W.a.Row),Q=W.a.Col,X=(0,F.a.config)((r=a=function(e){Object(R.a)(a,e);var n=Object(A.a)(a);function a(e){var t;return Object(j.a)(this,a),(t=n.call(this,e)).diffeditor=B.a.createRef(),t.state={dialogvisible:!1},t}return Object(I.a)(a,[{key:"openDialog",value:function(e,t){var n=this;this.setState({dialogvisible:!0}),setTimeout(function(){n.createDiffCodeMirror(e,t)})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createDiffCodeMirror",value:function(e,t){var n=this.diffeditor.current;n.innerHTML="",this.diffeditor=window.CodeMirror.MergeView(n,{value:e||"",readOnly:!0,origLeft:null,orig:t||"",lineNumbers:!0,mode:this.mode,theme:"xq-light",highlightDifferences:!0,connect:"align",collapseIdentical:!1})}},{key:"confirmPub",value:function(){this.closeDialog(),this.props.publishConfig()}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=B.a.createElement("div",null," ",B.a.createElement(v.a,{type:"primary",onClick:this.confirmPub.bind(this)},t.publish));return B.a.createElement("div",null,B.a.createElement(N.a,{title:t.contents,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},B.a.createElement("div",{style:{height:400}},B.a.createElement("div",null,B.a.createElement($,null,B.a.createElement(Q,{style:{textAlign:"center"}},t.currentArea),B.a.createElement(Q,{style:{textAlign:"center"}},t.originalValue))),B.a.createElement("div",{style:{clear:"both",height:480},ref:this.diffeditor}))))}}]),a}(B.a.Component),a.displayName="DiffEditorDialog",n=r))||n,Z=(d(646),d(647),d(166),W.a.Row),ee=W.a.Col,te=[{value:"text",label:"TEXT"},{value:"json",label:"JSON"},{value:"xml",label:"XML"},{value:"yaml",label:"YAML"},{value:"html",label:"HTML"},{value:"properties",label:"Properties"}],ne=["production","beta"],ae=(0,F.a.config)((s=i=function(e){Object(R.a)(a,e);var n=Object(A.a)(a);function a(e){var t;return Object(j.a)(this,a),(t=n.call(this,e)).state={loading:!1,isBeta:!1,isNewConfig:!0,betaPublishSuccess:!1,betaIps:"",tabActiveKey:"",form:{dataId:"",group:"",content:"",appName:"",desc:"",config_tags:[],type:"text"},tagDataSource:[],openAdvancedSettings:!1},t.successDialog=B.a.createRef(),t.diffEditorDialog=B.a.createRef(),t}return Object(I.a)(a,[{key:"componentDidMount",value:function(){var t=this,e=!Object(U.b)("dataId"),n=Object(U.b)("group").trim();this.setState({isNewConfig:e},function(){e?(n&&t.setState({group:n}),t.initMoacoEditor("text","")):t.changeForm({dataId:Object(U.b)("dataId").trim(),group:n},function(){t.getConfig(!0).then(function(e){e?t.setState({isBeta:!0,tabActiveKey:"beta",betaPublishSuccess:!0}):t.getConfig()})})})}},{key:"initMoacoEditor",value:function(e,t){var n=this,a=document.getElementById("container");a.innerHTML="";var r={value:t,language:e,codeLens:!(this.monacoEditor=null),selectOnLineNumbers:!0,roundedSelection:!1,readOnly:!1,lineNumbersMinChars:!0,theme:"vs-dark",wordWrapColumn:120,folding:!1,showFoldingControls:"always",wordWrap:"wordWrapColumn",cursorStyle:"line",automaticLayout:!0};window.monaco?this.monacoEditor=window.monaco.editor.create(a,r):window.importEditor(function(){n.monacoEditor=window.monaco.editor.create(a,r)})}},{key:"createDiffCodeMirror",value:function(e,t){var n=this.diffEditorDialog.current.getInstance();n.innerHTML="",this.diffeditor=window.CodeMirror.MergeView(n,{value:e||"",origLeft:null,orig:t||"",lineNumbers:!0,mode:this.mode,theme:"xq-light",highlightDifferences:!0,connect:"align",collapseIdentical:!1})}},{key:"openDiff",value:function(e){this.diffcb=e;var t=this.monacoEditor.getValue(),n=this.codeVal||"",t=t.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"),n=n.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n");this.diffEditorDialog.current.getInstance().openDialog(t,n)}},{key:"clickTab",value:function(e){var t=this;this.setState({tabActiveKey:e},function(){return t.getConfig("beta"===e)})}},{key:"getCodeVal",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=this.state.form,a=(n.type,n.content),r=this.monacoEditor?this.monacoEditor.getValue():a;return r||(P.a.error({content:t.submitFailed,align:"cc cc"}),!1)}},{key:"publish",value:function(){var n=this,e=this.props.locale,a=void 0===e?{}:e,t=this.state.form.type;this.state.isNewConfig&&this.validation();var r=this.getCodeVal();if(r)return q.a.validate({content:r,type:t})?this._publishConfig():new Promise(function(e,t){N.a.confirm({content:a.codeValErrorPrompt,onOk:function(){return e(n._publishConfig())},onCancel:function(){return e(!1)}})})}},{key:"_publishConfig",value:function(e){var t=this,n=0\n com.alibaba.nacos\n nacos-client\n ${latest.version}\n \n*/\npackage com.alibaba.nacos.example;\n\nimport java.util.Properties;\n\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingFactory;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.listener.Event;\nimport com.alibaba.nacos.api.naming.listener.EventListener;\nimport com.alibaba.nacos.api.naming.listener.NamingEvent;\n\n/**\n * @author nkorange\n */\npublic class NamingExample {\n\n public static void main(String[] args) throws NacosException {\n\n Properties properties = new Properties();\n properties.setProperty("serverAddr", System.getProperty("serverAddr"));\n properties.setProperty("namespace", System.getProperty("namespace"));\n\n NamingService naming = NamingFactory.createNamingService(properties);\n\n naming.registerInstance("'.concat(this.record.name,'", "11.11.11.11", 8888, "TEST1");\n\n naming.registerInstance("').concat(this.record.name,'", "2.2.2.2", 9999, "DEFAULT");\n\n System.out.println(naming.getAllInstances("').concat(this.record.name,'"));\n\n naming.deregisterInstance("').concat(this.record.name,'", "2.2.2.2", 9999, "DEFAULT");\n\n System.out.println(naming.getAllInstances("').concat(this.record.name,'"));\n\n naming.subscribe("').concat(this.record.name,'", new EventListener() {\n @Override\n public void onEvent(Event event) {\n System.out.println(((NamingEvent)event).getServiceName());\n System.out.println(((NamingEvent)event).getInstances());\n }\n });\n }\n}')}},{key:"getSpringCode",value:function(){return'/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-example/nacos-spring-discovery-example\n* pom.xml\n \n com.alibaba.nacos\n nacos-spring-context\n ${latest.version}\n \n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-example/nacos-spring-discovery-example/src/main/java/com/alibaba/nacos/example/spring\npackage com.alibaba.nacos.example.spring;\n\nimport com.alibaba.nacos.api.annotation.NacosProperties;\nimport com.alibaba.nacos.spring.context.annotation.discovery.EnableNacosDiscovery;\nimport org.springframework.context.annotation.Configuration;\n\n@Configuration\n@EnableNacosDiscovery(globalProperties = @NacosProperties(serverAddr = "127.0.0.1:8848"))\npublic class NacosConfiguration {\n\n}\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-example/nacos-spring-discovery-example/src/main/java/com/alibaba/nacos/example/spring/controller\npackage com.alibaba.nacos.example.spring.controller;\n\nimport com.alibaba.nacos.api.annotation.NacosInjected;\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.pojo.Instance;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.bind.annotation.ResponseBody;\n\nimport java.util.List;\n\nimport static org.springframework.web.bind.annotation.RequestMethod.GET;\n\n@Controller\n@RequestMapping("discovery")\npublic class DiscoveryController {\n\n @NacosInjected\n private NamingService namingService;\n\n @RequestMapping(value = "/get", method = GET)\n @ResponseBody\n public List get(@RequestParam String serviceName) throws NacosException {\n return namingService.getAllInstances(serviceName);\n }\n}'}},{key:"getSpringBootCode",value:function(){return'/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example\n* pom.xml\n \n com.alibaba.boot\n nacos-discovery-spring-boot-starter\n ${latest.version}\n \n*/\n/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example/src/main/resources\n* application.properties\n nacos.discovery.server-addr=127.0.0.1:8848\n*/\n// Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example/src/main/java/com/alibaba/nacos/example/spring/boot/controller\n\npackage com.alibaba.nacos.example.spring.boot.controller;\n\nimport com.alibaba.nacos.api.annotation.NacosInjected;\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.pojo.Instance;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.bind.annotation.ResponseBody;\n\nimport java.util.List;\n\nimport static org.springframework.web.bind.annotation.RequestMethod.GET;\n\n@Controller\n@RequestMapping("discovery")\npublic class DiscoveryController {\n\n @NacosInjected\n private NamingService namingService;\n\n @RequestMapping(value = "/get", method = GET)\n @ResponseBody\n public List get(@RequestParam String serviceName) throws NacosException {\n return namingService.getAllInstances(serviceName);\n }\n}'}},{key:"getSpringCloudCode",value:function(){return"/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/\n* pom.xml\n \n org.springframework.cloud\n spring-cloud-starter-alibaba-nacos-discovery\n ${latest.version}\n \n*/\n\n// nacos-spring-cloud-provider-example\n\n/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-provider-example/src/main/resources\n* application.properties\nserver.port=18080\nspring.application.name=".concat(this.record.name,'\nspring.cloud.nacos.discovery.server-addr=127.0.0.1:8848\n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-provider-example/src/main/java/com/alibaba/nacos/example/spring/cloud\npackage com.alibaba.nacos.example.spring.cloud;\n\nimport org.springframework.boot.SpringApplication;\nimport org.springframework.boot.autoconfigure.SpringBootApplication;\nimport org.springframework.cloud.client.discovery.EnableDiscoveryClient;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RestController;\n\n/**\n * @author xiaojing\n */\n@SpringBootApplication\n@EnableDiscoveryClient\npublic class NacosProviderApplication {\n\n public static void main(String[] args) {\n SpringApplication.run(NacosProviderApplication.class, args);\n}\n\n @RestController\n class EchoController {\n @RequestMapping(value = "/echo/{string}", method = RequestMethod.GET)\n public String echo(@PathVariable String string) {\n return "Hello Nacos Discovery " + string;\n }\n }\n}\n\n// nacos-spring-cloud-consumer-example\n\n/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-consumer-example/src/main/resources\n* application.properties\nspring.application.name=micro-service-oauth2\nspring.cloud.nacos.discovery.server-addr=127.0.0.1:8848\n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-consumer-example/src/main/java/com/alibaba/nacos/example/spring/cloud\npackage com.alibaba.nacos.example.spring.cloud;\n\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.boot.SpringApplication;\nimport org.springframework.boot.autoconfigure.SpringBootApplication;\nimport org.springframework.cloud.client.discovery.EnableDiscoveryClient;\nimport org.springframework.cloud.client.loadbalancer.LoadBalanced;\nimport org.springframework.context.annotation.Bean;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RestController;\nimport org.springframework.web.client.RestTemplate;\n\n/**\n * @author xiaojing\n */\n@SpringBootApplication\n@EnableDiscoveryClient\npublic class NacosConsumerApplication {\n\n @LoadBalanced\n @Bean\n public RestTemplate restTemplate() {\n return new RestTemplate();\n }\n\n public static void main(String[] args) {\n SpringApplication.run(NacosConsumerApplication.class, args);\n }\n\n @RestController\n public class TestController {\n\n private final RestTemplate restTemplate;\n\n @Autowired\n public TestController(RestTemplate restTemplate) {this.restTemplate = restTemplate;}\n\n @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET)\n public String echo(@PathVariable String str) {\n return restTemplate.getForObject("http://service-provider/echo/" + str, String.class);\n }\n }\n}')}},{key:"getNodejsCode",value:function(){return"TODO"}},{key:"getCppCode",value:function(){return"TODO"}},{key:"getShellCode",value:function(){return"TODO"}},{key:"getPythonCode",value:function(){return"TODO"}},{key:"openDialog",value:function(e){var t=this;this.setState({dialogvisible:!0}),this.record=e,setTimeout(function(){t.getData()})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createCodeMirror",value:function(e,t){var n=this.refs.codepreview;n&&(n.innerHTML="",this.cm=window.CodeMirror(n,{value:t,mode:e,height:400,width:500,lineNumbers:!0,theme:"xq-light",lint:!0,tabMode:"indent",autoMatchParens:!0,textWrapping:!0,gutters:["CodeMirror-lint-markers"],extraKeys:{F1:function(e){e.setOption("fullScreen",!e.getOption("fullScreen"))},Esc:function(e){e.getOption("fullScreen")&&e.setOption("fullScreen",!1)}}}),this.cm.setSize("auto","490px"))}},{key:"changeTab",value:function(e,t){var n=this;setTimeout(function(){n[e]=!0,n.createCodeMirror("text/javascript",t)})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=F.a.createElement("div",null);return F.a.createElement("div",null,F.a.createElement(y.a,{title:t.sampleCode,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},F.a.createElement("div",{style:{height:500}},F.a.createElement(S.a,{tip:t.loading,style:{width:"100%"},visible:this.state.loading},F.a.createElement(K.a,{shape:"text",style:{height:40,paddingBottom:10}},F.a.createElement(G,{title:"Java",key:0,onClick:this.changeTab.bind(this,"commoneditor1",this.defaultCode)}),F.a.createElement(G,{title:"Spring",key:1,onClick:this.changeTab.bind(this,"commoneditor1",this.springCode)}),F.a.createElement(G,{title:"Spring Boot",key:2,onClick:this.changeTab.bind(this,"commoneditor2",this.sprigbootCode)}),F.a.createElement(G,{title:"Spring Cloud",key:21,onClick:this.changeTab.bind(this,"commoneditor21",this.sprigcloudCode)}),F.a.createElement(G,{title:"Node.js",key:3,onClick:this.changeTab.bind(this,"commoneditor3",this.nodejsCode)}),F.a.createElement(G,{title:"C++",key:4,onClick:this.changeTab.bind(this,"commoneditor4",this.cppCode)}),F.a.createElement(G,{title:"Shell",key:5,onClick:this.changeTab.bind(this,"commoneditor5",this.shellCode)}),F.a.createElement(G,{title:"Python",key:6,onClick:this.changeTab.bind(this,"commoneditor6",this.pythonCode)})),F.a.createElement("div",{ref:"codepreview"})))))}}]),a}(F.a.Component),r.displayName="ShowServiceCodeing",a=o))||a,J=(n(697),A.a.Item),$=I.a.Row,Q=I.a.Col,X=P.a.Column,Z=(0,N.a.config)((l=s=function(e){Object(k.a)(a,e);var t=Object(D.a)(a);function a(e){var n;return Object(b.a)(this,a),(n=t.call(this,e)).getQueryLater=function(){setTimeout(function(){return n.queryServiceList()})},n.showcode=function(){setTimeout(function(){return n.queryServiceList()})},n.setNowNameSpace=function(e,t){return n.setState({nowNamespaceName:e,nowNamespaceId:t})},n.rowColor=function(e){return{className:e.healthyInstanceCount?"":"row-bg-red"}},n.editServiceDialog=F.a.createRef(),n.showcode=F.a.createRef(),n.state={loading:!1,total:0,pageSize:10,currentPage:1,dataSource:[],search:{serviceName:"",groupName:""},hasIpCount:!("false"===localStorage.getItem("hasIpCount"))},n.field=new _.a(Object(M.a)(n)),n}return Object(w.a)(a,[{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){try{this.editServiceDialog.current.getInstance().show(this.state.service)}catch(e){}}},{key:"queryServiceList",value:function(){var i=this,e=this.state,t=e.currentPage,n=e.pageSize,a=e.search,r=e.withInstances,o=void 0!==r&&r,s=e.hasIpCount,l=["hasIpCount=".concat(s),"withInstances=".concat(o),"pageNo=".concat(t),"pageSize=".concat(n),"serviceNameParam=".concat(a.serviceName),"groupNameParam=".concat(a.groupName)];Object(z.c)({url:"v1/ns/catalog/services?".concat(l.join("&")),success:function(e){var t=0this.state.pageSize&&F.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},F.a.createElement(E.a,{current:this.state.currentPage,total:this.state.total,pageSize:this.state.pageSize,onChange:function(e){return a.setState({currentPage:e},function(){return a.queryServiceList()})}}))),F.a.createElement(q,{ref:this.showcode}),F.a.createElement(B.a,{ref:this.editServiceDialog,openLoading:function(){return a.openLoading()},closeLoading:function(){return a.closeLoading()},queryServiceList:function(){return a.setState({currentPage:1},function(){return a.queryServiceList()})}}))}}]),a}(F.a.Component),s.displayName="ServiceList",i=l))||i;t.a=Z},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),d=n.n(u),c=(n(35),n(19)),f=n.n(c),p=(n(60),n(17)),h=n.n(p),m=(n(31),n(20)),g=n.n(m),y=n(13),v=n(14),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=n(0),S=n.n(k),E=n(44),L=n(51),x=n(45),T=(n(36),n(10)),C=n.n(T),D=n(38),O=(n(47),n(26)),N=n.n(O),Y=n(22),P=(n(41),n(9)),j=n.n(P),I=(n(149),j.a.Item),R={labelCol:{fixedSpan:4},wrapperCol:{span:19}},A=(0,M.a.config)((o=r=function(e){Object(_.a)(o,e);var r=Object(b.a)(o);function o(){var e;Object(y.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;ai&&S.a.createElement(d.a,{className:"users-pagination",current:s,total:n.totalCount,pageSize:i,onChange:function(e){return t.setState({pageNo:e},function(){return t.getUsers()})}}),S.a.createElement(A,{visible:l,onOk:function(e){return Object(L.c)(e).then(function(e){return t.setState({pageNo:1},function(){return t.getUsers()}),e})},onCancel:function(){return t.colseCreateUser()}}),S.a.createElement(H.a,{username:u,onOk:function(e){return Object(L.k)(e).then(function(e){return t.getUsers(),e})},onCancel:function(){return t.setState({passwordResetUser:void 0})}}))}}]),a}(S.a.Component),s.displayName="UserManagement",i=l))||i)||i;t.a=F},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),c=n.n(u),d=(n(35),n(19)),f=n.n(d),p=n(38),h=(n(60),n(17)),m=n.n(h),g=(n(31),n(20)),y=n.n(g),v=n(13),_=n(14),b=n(16),w=n(15),M=(n(25),n(8)),k=n.n(M),S=n(0),E=n.n(S),L=n(44),x=n(51),T=n(94),C=n(45),D=(n(36),n(10)),O=n.n(D),N=(n(47),n(26)),Y=n.n(N),P=n(22),j=(n(68),n(33)),I=n.n(j),R=(n(41),n(9)),A=n.n(R),H=A.a.Item,F=I.a.Option,z={labelCol:{fixedSpan:4},wrapperCol:{span:19}},W=Object(L.b)(function(e){return{namespaces:e.namespace.namespaces}},{getNamespaces:T.b})(a=(0,k.a.config)((o=r=function(e){Object(b.a)(o,e);var r=Object(w.a)(o);function o(){var e;Object(v.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;as&&E.a.createElement(c.a,{className:"users-pagination",current:u,total:t.totalCount,pageSize:s,onChange:function(e){return a.setState({pageNo:e},function(){return a.getPermissions()})}}),E.a.createElement(W,{visible:d,onOk:function(e){return Object(x.a)(e).then(function(e){return a.setState({pageNo:1},function(){return a.getPermissions()}),e})},onCancel:function(){return a.colseCreatePermission()}}))}}]),a}(E.a.Component),s.displayName="PermissionsManagement",i=l))||i)||i);t.a=V},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),d=n.n(u),c=(n(35),n(19)),f=n.n(c),p=(n(60),n(17)),h=n.n(p),m=(n(31),n(20)),g=n.n(m),y=n(13),v=n(14),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=n(0),S=n.n(k),E=n(44),L=n(51),x=n(45),T=(n(36),n(10)),C=n.n(T),D=(n(47),n(26)),O=n.n(D),N=n(22),Y=(n(41),n(9)),P=n.n(Y),j=P.a.Item,I={labelCol:{fixedSpan:4},wrapperCol:{span:19}},R=(0,M.a.config)((o=r=function(e){Object(_.a)(o,e);var r=Object(b.a)(o);function o(){var e;Object(y.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;ai&&S.a.createElement(d.a,{className:"users-pagination",current:s,total:t.totalCount,pageSize:i,onChange:function(e){return a.setState({pageNo:e},function(){return a.getRoles()})}}),S.a.createElement(R,{visible:l,onOk:function(e){return Object(L.b)(e).then(function(e){return a.getRoles(),e})},onCancel:function(){return a.colseCreateRole()}}))}}]),a}(S.a.Component),s.displayName="RolesManagement",i=l))||i)||i);t.a=A},function(e,t,n){"use strict";n(40);function s(e){var t=localStorage.token,n=void 0===t?"{}":t,a=Object(L.c)(n)&&JSON.parse(n)||{};return["naming"===e?void 0:x,{key:"serviceManagementVirtual",children:[{key:"serviceManagement",url:"/serviceManagement"},{key:"subscriberList",url:"/subscriberList"}]},a.globalAdmin?T:void 0,{key:"namespace",url:"/namespace"},{key:"clusterManagementVirtual",children:[{key:"clusterManagement",url:"/clusterManagement"}]}].filter(function(e){return e})}var a,r,o,i,l,u=n(23),d=n.n(u),c=n(13),f=n(14),p=n(16),h=n(15),m=(n(25),n(8)),g=n.n(m),y=n(21),v=(n(79),n(50)),_=n.n(v),b=n(0),w=n.n(b),M=n(32),k=n(44),S=n(126),E=n(92),L=n(46),x={key:"configurationManagementVirtual",children:[{key:"configurationManagement",url:"/configurationManagement"},{key:"historyRollback",url:"/historyRollback"},{key:"listeningToQuery",url:"/listeningToQuery"}]},T={key:"authorityControl",children:[{key:"userList",url:"/userManagement"},{key:"roleManagement",url:"/rolesManagement"},{key:"privilegeManagement",url:"/permissionsManagement"}]},C=_.a.SubMenu,D=_.a.Item,O=(a=Object(k.b)(function(e){return Object(y.a)(Object(y.a)({},e.locale),e.base)},{getState:E.b}),r=g.a.config,Object(M.g)(o=a(o=r((l=i=function(e){Object(p.a)(n,e);var t=Object(h.a)(n);function n(){return Object(c.a)(this,n),t.apply(this,arguments)}return Object(f.a)(n,[{key:"componentDidMount",value:function(){this.props.getState()}},{key:"goBack",value:function(){this.props.history.goBack()}},{key:"navTo",value:function(e){var t=this.props.location.search;this.props.history.push([e,t].join(""))}},{key:"isCurrentPath",value:function(e){return e===this.props.location.pathname?"current-path":void 0}},{key:"defaultOpenKeys",value:function(){for(var t=this,e=s(this.props.functionMode),n=0,a=e.length;nthis.state.pageSize&&Y.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},Y.a.createElement(E.a,{current:this.state.pageNo,total:s,pageSize:this.state.pageSize,onChange:function(e){return t.setState({pageNo:e},function(){return t.querySubscriberList()})}}))))}}]),a}(Y.a.Component),r.displayName="SubscriberList",a=o))||a)||a;t.a=z},function(e,t,n){"use strict";n(48);var a,r,o,i=n(30),m=n.n(i),s=(n(61),n(43)),g=n.n(s),l=(n(377),n(98)),y=n.n(l),u=(n(31),n(20)),v=n.n(u),d=(n(36),n(10)),_=n.n(d),c=(n(47),n(26)),f=n.n(c),p=n(13),h=n(14),b=n(22),w=n(16),M=n(15),k=(n(25),n(8)),S=n.n(k),E=(n(385),n(99)),L=n.n(E),x=(n(60),n(17)),T=n.n(x),C=(n(66),n(37)),D=n.n(C),O=(n(41),n(9)),N=n.n(O),Y=n(0),P=n.n(Y),j=n(1),I=n(45),R=(n(700),N.a.Item),A=D.a.Row,H=D.a.Col,F=T.a.Column,z=L.a.Panel,W=(0,S.a.config)((o=r=function(e){Object(w.a)(a,e);var t=Object(M.a)(a);function a(e){var n;return Object(p.a)(this,a),(n=t.call(this,e)).getQueryLater=function(){setTimeout(function(){return n.queryClusterStateList()})},n.setNowNameSpace=function(e,t){return n.setState({nowNamespaceName:e,nowNamespaceId:t})},n.rowColor=function(e){return{className:(e.voteFor,"")}},n.state={loading:!1,total:0,pageSize:10,currentPage:1,keyword:"",dataSource:[]},n.field=new f.a(Object(b.a)(n)),n}return Object(h.a)(a,[{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){try{this.editServiceDialog.current.getInstance().show(this.state.service)}catch(e){}}},{key:"queryClusterStateList",value:function(){var i=this,e=this.state,t=e.currentPage,n=e.pageSize,a=e.keyword,r=e.withInstances,o=["withInstances=".concat(void 0!==r&&r),"pageNo=".concat(t),"pageSize=".concat(n),"keyword=".concat(a)];Object(j.c)({url:"v1/core/cluster/nodes?".concat(o.join("&")),beforeSend:function(){return i.openLoading()},success:function(e){var t=0this.state.pageSize&&P.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},P.a.createElement(g.a,{current:this.state.currentPage,total:this.state.total,pageSize:this.state.pageSize,onChange:function(e){return t.setState({currentPage:e},function(){return t.queryClusterStateList()})}}))))}}]),a}(P.a.Component),r.displayName="ClusterNodeList",a=o))||a;t.a=W},function(e,t,q){"use strict";q.r(t),function(e){q(48);var t,n=q(30),r=q.n(n),a=(q(25),q(8)),o=q.n(a),i=q(13),s=q(14),l=q(16),u=q(15),d=q(21),c=q(0),f=q.n(c),p=q(24),h=q.n(p),m=q(82),g=q(394),y=q(395),v=q(44),_=q(32),b=q(91),w=(q(439),q(413)),M=q(29),k=q(414),S=q(406),E=q(415),L=q(416),x=q(417),T=q(408),C=q(418),D=q(419),O=q(420),N=q(421),Y=q(405),P=q(409),j=q(407),I=q(422),R=q(423),A=q(410),H=q(411),F=q(412),z=q(403),W=q(404),V=q(95);q(703);e.hot,localStorage.getItem(M.e)||localStorage.setItem(M.e,"zh-CN"===navigator.language?"zh-CN":"en-US");var B=Object(m.c)(Object(d.a)(Object(d.a)({},W.a),{},{routing:g.routerReducer})),U=Object(m.e)(B,Object(m.d)(Object(m.a)(y.a),window[M.h]?window[M.h]():function(e){return e})),K=[{path:"/",exact:!0,render:function(){return f.a.createElement(_.a,{to:"/welcome"})}},{path:"/welcome",component:z.a},{path:"/namespace",component:S.a},{path:"/newconfig",component:E.a},{path:"/configsync",component:L.a},{path:"/configdetail",component:x.a},{path:"/configeditor",component:T.a},{path:"/historyDetail",component:C.a},{path:"/configRollback",component:D.a},{path:"/historyRollback",component:O.a},{path:"/listeningToQuery",component:N.a},{path:"/configurationManagement",component:Y.a},{path:"/serviceManagement",component:P.a},{path:"/serviceDetail",component:j.a},{path:"/subscriberList",component:I.a},{path:"/clusterManagement",component:R.a},{path:"/userManagement",component:A.a},{path:"/rolesManagement",component:F.a},{path:"/permissionsManagement",component:H.a}],G=Object(v.b)(function(e){return Object(d.a)({},e.locale)},{changeLanguage:V.a})(t=function(e){Object(l.a)(a,e);var n=Object(u.a)(a);function a(e){var t;return Object(i.a)(this,a),(t=n.call(this,e)).state={shownotice:"none",noticecontent:"",nacosLoading:{}},t}return Object(s.a)(a,[{key:"componentDidMount",value:function(){var e=localStorage.getItem(M.e);this.props.changeLanguage(e)}},{key:"render",value:function(){var e=this.props.locale;return f.a.createElement(r.a,Object.assign({className:"nacos-loading",shape:"flower",tip:"loading...",visible:!1,fullScreen:!0},this.state.nacosLoading),f.a.createElement(o.a,{locale:e},this.router))}},{key:"router",get:function(){return f.a.createElement(b.a,null,f.a.createElement(_.d,null,f.a.createElement(_.b,{path:"/login",component:k.a}),f.a.createElement(w.a,null,K.map(function(e){return f.a.createElement(_.b,Object.assign({key:e.path},e))}))))}}]),a}(f.a.Component))||t;h.a.render(f.a.createElement(v.a,{store:U},f.a.createElement(G,null)),document.getElementById("root"))}.call(this,q(170)(e))},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){"use strict"; +var t;e.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日 HH:mm",LLLL:"YYYY年M月D日dddd HH:mm",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(e,t){if(e===12){e=0}if(t==="凌晨"||t==="早上"||t==="上午"){return e}else if(t==="中午"){return e>=11?e:e+12}else if(t==="下午"||t==="晚上"){return e+12}},meridiem:function(e,t,n){var a=e*100+t;if(a<600){return"凌晨"}else if(a<900){return"早上"}else if(a<1130){return"上午"}else if(a<1230){return"中午"}else if(a<1800){return"下午"}else{return"晚上"}},calendar:{sameDay:"[今天] LT",nextDay:"[明天] LT",nextWeek:"[下]dddd LT",lastDay:"[昨天] LT",lastWeek:"[上]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(日|月|週)/,ordinal:function(e,t){switch(t){case"d":case"D":case"DDD":return e+"日";case"M":return e+"月";case"w":case"W":return e+"週";default:return e}},relativeTime:{future:"%s後",past:"%s前",s:"幾秒",ss:"%d 秒",m:"1 分鐘",mm:"%d 分鐘",h:"1 小時",hh:"%d 小時",d:"1 天",dd:"%d 天",M:"1 個月",MM:"%d 個月",y:"1 年",yy:"%d 年"}})}(n(7))},function(e,t,n){"use strict";t.__esModule=!0;var a,r,w=p(n(4)),o=p(n(3)),i=p(n(5)),s=p(n(6)),l=n(0),M=p(l),u=p(n(2)),d=n(28),k=p(n(12)),c=p(n(42)),S=p(n(23)),E=p(n(116)),f=p(n(8)),L=n(11);function p(e){return e&&e.__esModule?e:{default:e}}function h(){}var m,g=(m=l.Component,(0,s.default)(x,m),x.getDerivedStateFromProps=function(e){return"visible"in e?{visible:e.visible}:{}},x.prototype.render=function(){var e,t=this.props,n=t.prefix,a=(t.pure,t.className),r=t.style,o=t.type,i=t.shape,s=t.size,l=t.title,u=t.children,d=(t.defaultVisible,t.visible,t.iconType),c=t.closeable,f=(t.onClose,t.afterClose),p=t.animation,h=t.rtl,m=t.locale,g=(0,w.default)({},L.obj.pickOthers(Object.keys(x.propTypes),this.props)),y=this.state.visible,v=n+"message",_=(0,k.default)(((e={})[v]=!0,e[n+"message-"+o]=o,e[""+n+i]=i,e[""+n+s]=s,e[n+"title-content"]=!!l,e[n+"only-content"]=!l&&!!u,e[a]=a,e)),b=y?M.default.createElement("div",(0,w.default)({role:"alert",style:r},g,{className:_,dir:h?"rtl":void 0}),c?M.default.createElement("a",{role:"button","aria-label":m.closeAriaLabel,className:v+"-close",onClick:this.onClose},M.default.createElement(S.default,{type:"close"})):null,M.default.createElement(S.default,{className:v+"-symbol "+(!d&&v+"-symbol-icon"),type:d}),l?M.default.createElement("div",{className:v+"-title"},l):null,u?M.default.createElement("div",{className:v+"-content"},u):null):null;return p?M.default.createElement(E.default.Expand,{animationAppear:!1,afterLeave:f},b):b},r=a=x,a.propTypes={prefix:u.default.string,pure:u.default.bool,className:u.default.string,style:u.default.object,type:u.default.oneOf(["success","warning","error","notice","help","loading"]),shape:u.default.oneOf(["inline","addon","toast"]),size:u.default.oneOf(["medium","large"]),title:u.default.node,children:u.default.node,defaultVisible:u.default.bool,visible:u.default.bool,iconType:u.default.string,closeable:u.default.bool,onClose:u.default.func,afterClose:u.default.func,animation:u.default.bool,locale:u.default.object,rtl:u.default.bool},a.defaultProps={prefix:"next-",pure:!1,type:"success",shape:"inline",size:"medium",defaultVisible:!0,closeable:!1,onClose:h,afterClose:h,animation:!0,locale:c.default.Message},r);function x(){var e,t;(0,o.default)(this,x);for(var n=arguments.length,a=Array(n),r=0;re.clientHeight&&0this.popupNode.offsetWidth&&m(this.popupNode,"width",e.offsetWidth+"px"),"outside"!==d||"hoz"===u&&1===a||(m(this.popupNode,"height",p.offsetHeight+"px"),m(this.popupNode,"overflow-y","scroll"));var h=this.popupProps;h.onOpen&&h.onOpen()},j.prototype.handlePopupClose=function(){var e=this.props.root.popupNodes,t=e.indexOf(this.popupNode);-1 "+this.message+" (line "+this.parsedLine+": '"+this.snippet+"')":" "+this.message},e.exports=n},function(e,t){var r={}.hasOwnProperty;function n(e,t,n){this.message=e,this.parsedLine=t,this.snippet=n}(function(e,t){for(var n in t)r.call(t,n)&&(e[n]=t[n]);function a(){this.constructor=e}a.prototype=t.prototype,e.prototype=new a,e.__super__=t.prototype})(n,Error),n.prototype.toString=function(){return null!=this.parsedLine&&null!=this.snippet?" "+this.message+" (line "+this.parsedLine+": '"+this.snippet+"')":" "+this.message},e.exports=n},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,S=m(n(4)),o=m(n(3)),i=m(n(5)),s=m(n(6)),l=n(0),E=m(l),u=n(24),d=m(n(2)),L=m(n(12)),c=n(11),v=m(n(50)),f=m(n(63)),x=m(n(10)),p=m(n(42)),h=m(n(631)),_=m(n(382)),b=n(160);function m(e){return e&&e.__esModule?e:{default:e}}var T=f.default.Popup,g=v.default.Item,y=v.default.Group,w=c.func.noop,M=c.func.bindCtx,C=c.func.makeChain;function k(e){e.preventDefault()}var D,O=(D=E.default.Component,(0,s.default)(N,D),N.prototype.componentDidMount=function(){var e=this;setTimeout(function(){return e.syncWidth()},0),c.events.on(window,"resize",this.handleResize)},N.prototype.componentDidUpdate=function(e,t){e.label===this.props.label&&t.value===this.state.value||this.syncWidth()},N.prototype.componentWillUnmount=function(){c.events.off(window,"resize",this.handleResize),clearTimeout(this.resizeTimeout)},N.prototype.syncWidth=function(){var e,t=this,n=this.props,a=n.popupStyle,r=n.popupProps;a&&"width"in a||r&&r.style&&"width"in r.style||(e=c.dom.getStyle(this.selectDOM,"width"))&&this.width!==e&&(this.width=e,this.popupRef&&this.shouldAutoWidth()&&setTimeout(function(){t.popupRef&&t.popupRef.getInstance().overlay&&c.dom.setStyle(t.popupRef.getInstance().overlay.getInstance().getContentNode(),"width",t.width)},0))},N.prototype.handleResize=function(){var e=this;clearTimeout(this.resizeTimeout),this.state.visible&&(this.resizeTimeout=setTimeout(function(){e.syncWidth()},200))},N.prototype.setDataSource=function(e){var t=e.dataSource,n=e.children;return l.Children.count(n)?this.dataStore.updateByDS(n,!0):Array.isArray(t)?this.dataStore.updateByDS(t,!1):[]},N.prototype.setVisible=function(e,t){this.props.disabled||this.state.visible===e||("visible"in this.props||this.setState({visible:e}),this.props.onVisibleChange(e,t))},N.prototype.setFirstHightLightKeyForMenu=function(){var e;this.props.autoHighlightFirstItem&&this.dataStore.getMenuDS().length&&this.dataStore.getEnableDS().length&&(e=""+this.dataStore.getEnableDS()[0].value,this.setState({highlightKey:e}),this.props.onToggleHighlightItem(e,"autoFirstItem"))},N.prototype.handleChange=function(e){var t;"value"in this.props||this.setState({value:e});for(var n=arguments.length,a=Array(1e.slidesToShow&&(a=e.slideWidth*e.slidesToShow*-1,i=e.slideHeight*e.slidesToShow*-1),e.slideCount%e.slidesToScroll!=0&&(t=e.slideIndex+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow,e.rtl&&(t=(e.slideIndex>=e.slideCount?e.slideCount-e.slideIndex:e.slideIndex)+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow),t&&(i=e.slideIndex>e.slideCount?(a=(e.slidesToShow-(e.slideIndex-e.slideCount))*e.slideWidth*-1,(e.slidesToShow-(e.slideIndex-e.slideCount))*e.slideHeight*-1):(a=e.slideCount%e.slidesToScroll*e.slideWidth*-1,e.slideCount%e.slidesToScroll*e.slideHeight*-1)))):e.slideCount%e.slidesToScroll!=0&&e.slideIndex+e.slidesToScroll>e.slideCount&&e.slideCount>e.slidesToShow&&(a=(e.slidesToShow-e.slideCount%e.slidesToScroll)*e.slideWidth),e.centerMode&&(e.infinite?a+=e.slideWidth*Math.floor(e.slidesToShow/2):a=e.slideWidth*Math.floor(e.slidesToShow/2)),r=e.vertical?e.slideIndex*e.slideHeight*-1+i:e.slideIndex*e.slideWidth*-1+a,!0===e.variableWidth&&(n=void 0,r=(o=e.slideCount<=e.slidesToShow||!1===e.infinite?s.default.findDOMNode(e.trackRef).childNodes[e.slideIndex]:(n=e.slideIndex+e.slidesToShow,s.default.findDOMNode(e.trackRef).childNodes[n]))?-1*o.offsetLeft:0,!0===e.centerMode&&(o=!1===e.infinite?s.default.findDOMNode(e.trackRef).children[e.slideIndex]:s.default.findDOMNode(e.trackRef).children[e.slideIndex+e.slidesToShow+1])&&(r=-1*o.offsetLeft+(e.listWidth-o.offsetWidth)/2)),r)}},function(e,t,n){"use strict";t.__esModule=!0;var a,r,y=c(n(4)),v=c(n(18)),o=c(n(3)),i=c(n(5)),s=c(n(6)),_=c(n(0)),l=c(n(2)),b=c(n(12)),u=c(n(8)),w=c(n(23)),d=n(11);function c(e){return e&&e.__esModule?e:{default:e}}var f,p=(f=_.default.Component,(0,s.default)(h,f),h.prototype.render=function(){var e,t,n=this.props,a=n.title,r=n.children,o=n.className,i=n.isExpanded,s=n.disabled,l=n.style,u=n.prefix,d=n.onClick,c=n.id,f=(0,v.default)(n,["title","children","className","isExpanded","disabled","style","prefix","onClick","id"]),p=(0,b.default)(((e={})[u+"collapse-panel"]=!0,e[u+"collapse-panel-hidden"]=!i,e[u+"collapse-panel-expanded"]=i,e[u+"collapse-panel-disabled"]=s,e[o]=o,e)),h=(0,b.default)(((t={})[u+"collapse-panel-icon"]=!0,t[u+"collapse-panel-icon-expanded"]=i,t)),m=c?c+"-heading":void 0,g=c?c+"-region":void 0;return _.default.createElement("div",(0,y.default)({className:p,style:l,id:c},f),_.default.createElement("div",{id:m,className:u+"collapse-panel-title",onClick:d,onKeyDown:this.onKeyDown,tabIndex:"0","aria-disabled":s,"aria-expanded":i,"aria-controls":g,role:"button"},_.default.createElement(w.default,{type:"arrow-right",className:h,"aria-hidden":"true"}),a),_.default.createElement("div",{className:u+"collapse-panel-content",role:"region",id:g},r))},r=a=h,a.propTypes={prefix:l.default.string,style:l.default.object,children:l.default.any,isExpanded:l.default.bool,disabled:l.default.bool,title:l.default.node,className:l.default.string,onClick:l.default.func,id:l.default.string},a.defaultProps={prefix:"next-",isExpanded:!1,onClick:d.func.noop},a.isNextPanel=!0,r);function h(){var e,n;(0,o.default)(this,h);for(var t=arguments.length,a=Array(t),r=0;r\n com.alibaba.nacos\n nacos-client\n ${version}\n \n*/\npackage com.alibaba.nacos.example;\n\nimport java.util.Properties;\nimport java.util.concurrent.Executor;\nimport com.alibaba.nacos.api.NacosFactory;\nimport com.alibaba.nacos.api.config.ConfigService;\nimport com.alibaba.nacos.api.config.listener.Listener;\nimport com.alibaba.nacos.api.exception.NacosException;\n\n/**\n * Config service example\n *\n * @author Nacos\n *\n */\npublic class ConfigExample {\n\n\tpublic static void main(String[] args) throws NacosException, InterruptedException {\n\t\tString serverAddr = "localhost";\n\t\tString dataId = "'.concat(e.dataId,'";\n\t\tString group = "').concat(e.group,'";\n\t\tProperties properties = new Properties();\n\t\tproperties.put(PropertyKeyConst.SERVER_ADDR, serverAddr);\n\t\tConfigService configService = NacosFactory.createConfigService(properties);\n\t\tString content = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\t\tconfigService.addListener(dataId, group, new Listener() {\n\t\t\t@Override\n\t\t\tpublic void receiveConfigInfo(String configInfo) {\n\t\t\t\tSystem.out.println("recieve:" + configInfo);\n\t\t\t}\n\n\t\t\t@Override\n\t\t\tpublic Executor getExecutor() {\n\t\t\t\treturn null;\n\t\t\t}\n\t\t});\n\n\t\tboolean isPublishOk = configService.publishConfig(dataId, group, "content");\n\t\tSystem.out.println(isPublishOk);\n\n\t\tThread.sleep(3000);\n\t\tcontent = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\n\t\tboolean isRemoveOk = configService.removeConfig(dataId, group);\n\t\tSystem.out.println(isRemoveOk);\n\t\tThread.sleep(3000);\n\n\t\tcontent = configService.getConfig(dataId, group, 5000);\n\t\tSystem.out.println(content);\n\t\tThread.sleep(300000);\n\n\t}\n}\n')}},{key:"getNodejsCode",value:function(){return"TODO"}},{key:"getCppCode",value:function(){return"TODO"}},{key:"getShellCode",value:function(){return"TODO"}},{key:"getPythonCode",value:function(){return"TODO"}},{key:"openDialog",value:function(e){var t=this;this.setState({dialogvisible:!0}),this.record=e,setTimeout(function(){t.getData()})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createCodeMirror",value:function(e,t){var n=this.refs.codepreview;n&&(n.innerHTML="",this.cm=window.CodeMirror(n,{value:t,mode:e,height:400,width:500,lineNumbers:!0,theme:"xq-light",lint:!0,tabMode:"indent",autoMatchParens:!0,textWrapping:!0,gutters:["CodeMirror-lint-markers"],extraKeys:{F1:function(e){e.setOption("fullScreen",!e.getOption("fullScreen"))},Esc:function(e){e.getOption("fullScreen")&&e.setOption("fullScreen",!1)}}}))}},{key:"changeTab",value:function(e,t){var n=this;setTimeout(function(){n[e]=!0,n.createCodeMirror("text/javascript",t)})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=Z.a.createElement("div",null);return Z.a.createElement("div",null,Z.a.createElement(F.a,{title:t.sampleCode,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},Z.a.createElement("div",{style:{height:500}},Z.a.createElement(ie.a,{tip:t.loading,style:{width:"100%"},visible:this.state.loading},Z.a.createElement(le.a,{shape:"text",style:{height:40,paddingBottom:10}},Z.a.createElement(ue,{title:"Java",key:1,onClick:this.changeTab.bind(this,"commoneditor1",this.defaultCode)}),Z.a.createElement(ue,{title:"Spring Boot",key:2,onClick:this.changeTab.bind(this,"commoneditor2",this.sprigboot_code)}),Z.a.createElement(ue,{title:"Spring Cloud",key:21,onClick:this.changeTab.bind(this,"commoneditor21",this.sprigcloud_code)}),Z.a.createElement(ue,{title:"Node.js",key:3,onClick:this.changeTab.bind(this,"commoneditor3",this.nodejsCode)}),Z.a.createElement(ue,{title:"C++",key:4,onClick:this.changeTab.bind(this,"commoneditor4",this.cppCode)}),Z.a.createElement(ue,{title:"Shell",key:5,onClick:this.changeTab.bind(this,"commoneditor5",this.shellCode)}),Z.a.createElement(ue,{title:"Python",key:6,onClick:this.changeTab.bind(this,"commoneditor6",this.pythonCode)})),Z.a.createElement("div",{ref:"codepreview"})))))}}]),a}(Z.a.Component),r.displayName="ShowCodeing",a=o))||a,ce=(n(66),n(37)),fe=n.n(ce),pe=(n(674),fe.a.Row),he=fe.a.Col,me=(0,J.a.config)((l=s=function(e){Object(K.a)(a,e);var n=Object(G.a)(a);function a(e){var t;return Object(V.a)(this,a),(t=n.call(this,e)).state={visible:!1,title:"",content:"",isok:!0,dataId:"",group:""},t}return Object(B.a)(a,[{key:"componentDidMount",value:function(){this.initData()}},{key:"initData",value:function(){var e=this.props.locale,t=void 0===e?{}:e;this.setState({title:t.confManagement})}},{key:"openDialog",value:function(e){this.setState({visible:!0,title:e.title,content:e.content,isok:e.isok,dataId:e.dataId,group:e.group,message:e.message})}},{key:"closeDialog",value:function(){this.setState({visible:!1})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=Z.a.createElement("div",{style:{textAlign:"right"}},Z.a.createElement(M.a,{type:"primary",onClick:this.closeDialog.bind(this)},t.determine));return Z.a.createElement("div",null,Z.a.createElement(F.a,{visible:this.state.visible,footer:n,style:{width:555},onCancel:this.closeDialog.bind(this),onClose:this.closeDialog.bind(this),title:t.deletetitle},Z.a.createElement("div",null,Z.a.createElement(pe,null,Z.a.createElement(he,{span:"4",style:{paddingTop:16}},Z.a.createElement(I.a,{type:"".concat(this.state.isok?"success":"delete","-filling"),style:{color:this.state.isok?"green":"red"},size:"xl"})),Z.a.createElement(he,{span:"20"},Z.a.createElement("div",null,Z.a.createElement("h3",null,this.state.isok?t.deletedSuccessfully:t.deleteFailed),Z.a.createElement("p",null,Z.a.createElement("span",{style:{color:"#999",marginRight:5}},"Data ID:"),Z.a.createElement("span",{style:{color:"#c7254e"}},this.state.dataId)),Z.a.createElement("p",null,Z.a.createElement("span",{style:{color:"#999",marginRight:5}},"Group:"),Z.a.createElement("span",{style:{color:"#c7254e"}},this.state.group)),this.state.isok?"":Z.a.createElement("p",{style:{color:"red"}},this.state.message)))))))}}]),a}(Z.a.Component),s.displayName="DeleteDialog",i=l))||i,ge=(n(675),n(401)),ye=n.n(ge),ve=(0,J.a.config)((c=d=function(e){Object(K.a)(n,e);var t=Object(G.a)(n);function n(){return Object(V.a)(this,n),t.apply(this,arguments)}return Object(B.a)(n,[{key:"render",value:function(){var e=this.props,t=e.data,n=void 0===t?{}:t,a=e.height,r=e.locale,o=void 0===r?{}:r;return Z.a.createElement("div",null,"notice"===n.modeType?Z.a.createElement("div",{"data-spm-click":"gostr=/aliyun;locaid=notice"},Z.a.createElement(ye.a,{style:{marginBottom:1u?P.a.createElement(q.a,{className:"pagination",total:l.count,pageSize:u,onChange:function(e){return a.onChangePage(e)}}):null,P.a.createElement(Q,{ref:this.editInstanceDialog,serviceName:o,clusterName:n,groupName:i,openLoading:function(){return a.openLoading()},closeLoading:function(){return a.closeLoading()},getInstanceList:function(){return a.getInstanceList()}})):null}}]),a}(P.a.Component),d.displayName="InstanceTable",u=c))||u,Z=n(46),ee=(n(698),N.a.Item),te={labelCol:{fixedSpan:10},wrapperCol:{span:14}},ne=(0,D.a.config)((h=p=function(e){Object(x.a)(a,e);var n=Object(T.a)(a);function a(e){var t;return Object(E.a)(this,a),(t=n.call(this,e)).editServiceDialog=P.a.createRef(),t.editClusterDialog=P.a.createRef(),t.state={serviceName:Object(Z.b)(e.location.search,"name"),groupName:Object(Z.b)(e.location.search,"groupName"),loading:!1,currentPage:1,clusters:[],instances:{},service:{},pageSize:10,pageNum:{}},t}return Object(L.a)(a,[{key:"componentDidMount",value:function(){this.state.serviceName?this.getServiceDetail():this.props.history.goBack()}},{key:"getServiceDetail",value:function(){var o=this,e=this.state,t=e.serviceName,n=e.groupName;Object(j.c)({url:"v1/ns/catalog/service?serviceName=".concat(t,"&groupName=").concat(n),beforeSend:function(){return o.openLoading()},success:function(e){var t=e.clusters,n=void 0===t?[]:t,a=e.service,r=void 0===a?{}:a;return o.setState({service:r,clusters:n})},error:function(e){return k.a.error(e.responseText||"error")},complete:function(){return o.closeLoading()}})}},{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){this.editServiceDialog.current.getInstance().show(this.state.service)}},{key:"openClusterDialog",value:function(e){this.editClusterDialog.current.getInstance().show(e)}},{key:"render",value:function(){var t=this,e=this.props.locale,n=void 0===e?{}:e,a=this.state,r=a.serviceName,o=a.groupName,i=a.loading,s=a.service,l=void 0===s?{}:s,u=a.clusters,d=l.metadata,c=void 0===d?{}:d,f=l.selector,p=void 0===f?{}:f,h="";return Object.keys(c).length&&(h=JSON.stringify(c,null,"\t")),P.a.createElement("div",{className:"main-container service-detail"},P.a.createElement(g.a,{shape:"flower",tip:"Loading...",className:"loading",visible:i,color:"#333"},P.a.createElement("h1",{style:{position:"relative",width:"100%"}},n.serviceDetails,P.a.createElement(w.a,{type:"primary",className:"header-btn",onClick:function(){return t.props.history.goBack()}},n.back),P.a.createElement(w.a,{type:"normal",className:"header-btn",onClick:function(){return t.openEditServiceDialog()}},n.editService)),P.a.createElement(N.a,te,P.a.createElement(ee,{label:"".concat(n.serviceName,":")},P.a.createElement(S.a,{value:l.name,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.groupName,":")},P.a.createElement(S.a,{value:l.groupName,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.protectThreshold,":")},P.a.createElement(S.a,{value:l.protectThreshold,readOnly:!0})),P.a.createElement(ee,{label:"".concat(n.metadata,":")},P.a.createElement(U.a,{language:"json",width:"100%",height:200,value:h,options:B.c})),P.a.createElement(ee,{label:"".concat(n.type,":")},P.a.createElement(S.a,{value:p.type,readOnly:!0})),"label"===l.type&&P.a.createElement(ee,{label:"".concat(n.selector,":")},P.a.createElement(S.a,{value:p.selector,readOnly:!0}))),u.map(function(e){return P.a.createElement(v.a,{key:e.name,className:"cluster-card",title:"".concat(n.cluster,":"),subTitle:e.name,contentHeight:"auto",extra:P.a.createElement(w.a,{type:"normal",onClick:function(){return t.openClusterDialog(e)}},n.editCluster)},P.a.createElement(X,{clusterName:e.name,serviceName:r,groupName:o}))})),P.a.createElement(I.a,{ref:this.editServiceDialog,openLoading:function(){return t.openLoading()},closeLoading:function(){return t.closeLoading()},getServiceDetail:function(){return t.getServiceDetail()}}),P.a.createElement(K,{ref:this.editClusterDialog,openLoading:function(){return t.openLoading()},closeLoading:function(){return t.closeLoading()},getServiceDetail:function(){return t.getServiceDetail()}}))}}]),a}(P.a.Component),p.displayName="ServiceDetail",f=h))||f;t.a=ne},function(e,t,d){"use strict";d(48);var n,a,r,o,i,s,l=d(30),y=d.n(l),u=(d(31),d(20)),v=d.n(u),c=(d(376),d(130)),_=d.n(c),f=(d(40),d(23)),b=d.n(f),p=(d(118),d(80)),w=d.n(p),h=(d(102),d(69)),M=d.n(h),m=(d(68),d(33)),k=d.n(m),g=(d(41),d(9)),S=d.n(g),E=(d(36),d(10)),L=d.n(E),x=(d(123),d(57)),T=d.n(x),C=d(58),D=d(21),O=(d(35),d(19)),N=d.n(O),Y=(d(52),d(27)),P=d.n(Y),j=d(13),I=d(14),R=d(16),A=d(15),H=(d(25),d(8)),F=d.n(H),z=(d(66),d(37)),W=d.n(z),V=d(0),B=d.n(V),U=d(1),K=d(46),G=d(39),q=d(129),J=d(96),$=(d(645),W.a.Row),Q=W.a.Col,X=(0,F.a.config)((r=a=function(e){Object(R.a)(a,e);var n=Object(A.a)(a);function a(e){var t;return Object(j.a)(this,a),(t=n.call(this,e)).diffeditor=B.a.createRef(),t.state={dialogvisible:!1},t}return Object(I.a)(a,[{key:"openDialog",value:function(e,t){var n=this;this.setState({dialogvisible:!0}),setTimeout(function(){n.createDiffCodeMirror(e,t)})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createDiffCodeMirror",value:function(e,t){var n=this.diffeditor.current;n.innerHTML="",this.diffeditor=window.CodeMirror.MergeView(n,{value:e||"",readOnly:!0,origLeft:null,orig:t||"",lineNumbers:!0,mode:this.mode,theme:"xq-light",highlightDifferences:!0,connect:"align",collapseIdentical:!1})}},{key:"confirmPub",value:function(){this.closeDialog(),this.props.publishConfig()}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=B.a.createElement("div",null," ",B.a.createElement(v.a,{type:"primary",onClick:this.confirmPub.bind(this)},t.publish));return B.a.createElement("div",null,B.a.createElement(N.a,{title:t.contents,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},B.a.createElement("div",{style:{height:400}},B.a.createElement("div",null,B.a.createElement($,null,B.a.createElement(Q,{style:{textAlign:"center"}},t.currentArea),B.a.createElement(Q,{style:{textAlign:"center"}},t.originalValue))),B.a.createElement("div",{style:{clear:"both",height:480},ref:this.diffeditor}))))}}]),a}(B.a.Component),a.displayName="DiffEditorDialog",n=r))||n,Z=(d(646),d(647),d(166),W.a.Row),ee=W.a.Col,te=[{value:"text",label:"TEXT"},{value:"json",label:"JSON"},{value:"xml",label:"XML"},{value:"yaml",label:"YAML"},{value:"html",label:"HTML"},{value:"properties",label:"Properties"}],ne=["production","beta"],ae=(0,F.a.config)((s=i=function(e){Object(R.a)(a,e);var n=Object(A.a)(a);function a(e){var t;return Object(j.a)(this,a),(t=n.call(this,e)).state={loading:!1,isBeta:!1,isNewConfig:!0,betaPublishSuccess:!1,betaIps:"",tabActiveKey:"",form:{dataId:"",group:"",content:"",appName:"",desc:"",config_tags:[],type:"text"},tagDataSource:[],openAdvancedSettings:!1},t.successDialog=B.a.createRef(),t.diffEditorDialog=B.a.createRef(),t}return Object(I.a)(a,[{key:"componentDidMount",value:function(){var t=this,e=!Object(U.b)("dataId"),n=Object(U.b)("group").trim();this.setState({isNewConfig:e},function(){e?(n&&t.setState({group:n}),t.initMoacoEditor("text","")):t.changeForm({dataId:Object(U.b)("dataId").trim(),group:n},function(){t.getConfig(!0).then(function(e){e?t.setState({isBeta:!0,tabActiveKey:"beta",betaPublishSuccess:!0}):t.getConfig()})})})}},{key:"initMoacoEditor",value:function(e,t){var n=this,a=document.getElementById("container");a.innerHTML="";var r={value:t,language:e,codeLens:!(this.monacoEditor=null),selectOnLineNumbers:!0,roundedSelection:!1,readOnly:!1,lineNumbersMinChars:!0,theme:"vs-dark",wordWrapColumn:120,folding:!1,showFoldingControls:"always",wordWrap:"wordWrapColumn",cursorStyle:"line",automaticLayout:!0};window.monaco?this.monacoEditor=window.monaco.editor.create(a,r):window.importEditor(function(){n.monacoEditor=window.monaco.editor.create(a,r)})}},{key:"createDiffCodeMirror",value:function(e,t){var n=this.diffEditorDialog.current.getInstance();n.innerHTML="",this.diffeditor=window.CodeMirror.MergeView(n,{value:e||"",origLeft:null,orig:t||"",lineNumbers:!0,mode:this.mode,theme:"xq-light",highlightDifferences:!0,connect:"align",collapseIdentical:!1})}},{key:"openDiff",value:function(e){this.diffcb=e;var t=this.monacoEditor.getValue(),n=this.codeVal||"",t=t.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"),n=n.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n");this.diffEditorDialog.current.getInstance().openDialog(t,n)}},{key:"clickTab",value:function(e){var t=this;this.setState({tabActiveKey:e},function(){return t.getConfig("beta"===e)})}},{key:"getCodeVal",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=this.state.form,a=(n.type,n.content),r=this.monacoEditor?this.monacoEditor.getValue():a;return r||(P.a.error({content:t.submitFailed,align:"cc cc"}),!1)}},{key:"publish",value:function(){var n=this,e=this.props.locale,a=void 0===e?{}:e,t=this.state.form.type;this.state.isNewConfig&&this.validation();var r=this.getCodeVal();if(r)return q.a.validate({content:r,type:t})?this._publishConfig():new Promise(function(e,t){N.a.confirm({content:a.codeValErrorPrompt,onOk:function(){return e(n._publishConfig())},onCancel:function(){return e(!1)}})})}},{key:"_publishConfig",value:function(e){var t=this,n=0\n com.alibaba.nacos\n nacos-client\n ${latest.version}\n \n*/\npackage com.alibaba.nacos.example;\n\nimport java.util.Properties;\n\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingFactory;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.listener.Event;\nimport com.alibaba.nacos.api.naming.listener.EventListener;\nimport com.alibaba.nacos.api.naming.listener.NamingEvent;\n\n/**\n * @author nkorange\n */\npublic class NamingExample {\n\n public static void main(String[] args) throws NacosException {\n\n Properties properties = new Properties();\n properties.setProperty("serverAddr", System.getProperty("serverAddr"));\n properties.setProperty("namespace", System.getProperty("namespace"));\n\n NamingService naming = NamingFactory.createNamingService(properties);\n\n naming.registerInstance("'.concat(this.record.name,'", "11.11.11.11", 8888, "TEST1");\n\n naming.registerInstance("').concat(this.record.name,'", "2.2.2.2", 9999, "DEFAULT");\n\n System.out.println(naming.getAllInstances("').concat(this.record.name,'"));\n\n naming.deregisterInstance("').concat(this.record.name,'", "2.2.2.2", 9999, "DEFAULT");\n\n System.out.println(naming.getAllInstances("').concat(this.record.name,'"));\n\n naming.subscribe("').concat(this.record.name,'", new EventListener() {\n @Override\n public void onEvent(Event event) {\n System.out.println(((NamingEvent)event).getServiceName());\n System.out.println(((NamingEvent)event).getInstances());\n }\n });\n }\n}')}},{key:"getSpringCode",value:function(){return'/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-example/nacos-spring-discovery-example\n* pom.xml\n \n com.alibaba.nacos\n nacos-spring-context\n ${latest.version}\n \n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-example/nacos-spring-discovery-example/src/main/java/com/alibaba/nacos/example/spring\npackage com.alibaba.nacos.example.spring;\n\nimport com.alibaba.nacos.api.annotation.NacosProperties;\nimport com.alibaba.nacos.spring.context.annotation.discovery.EnableNacosDiscovery;\nimport org.springframework.context.annotation.Configuration;\n\n@Configuration\n@EnableNacosDiscovery(globalProperties = @NacosProperties(serverAddr = "127.0.0.1:8848"))\npublic class NacosConfiguration {\n\n}\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-example/nacos-spring-discovery-example/src/main/java/com/alibaba/nacos/example/spring/controller\npackage com.alibaba.nacos.example.spring.controller;\n\nimport com.alibaba.nacos.api.annotation.NacosInjected;\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.pojo.Instance;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.bind.annotation.ResponseBody;\n\nimport java.util.List;\n\nimport static org.springframework.web.bind.annotation.RequestMethod.GET;\n\n@Controller\n@RequestMapping("discovery")\npublic class DiscoveryController {\n\n @NacosInjected\n private NamingService namingService;\n\n @RequestMapping(value = "/get", method = GET)\n @ResponseBody\n public List get(@RequestParam String serviceName) throws NacosException {\n return namingService.getAllInstances(serviceName);\n }\n}'}},{key:"getSpringBootCode",value:function(){return'/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example\n* pom.xml\n \n com.alibaba.boot\n nacos-discovery-spring-boot-starter\n ${latest.version}\n \n*/\n/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example/src/main/resources\n* application.properties\n nacos.discovery.server-addr=127.0.0.1:8848\n*/\n// Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-boot-example/nacos-spring-boot-discovery-example/src/main/java/com/alibaba/nacos/example/spring/boot/controller\n\npackage com.alibaba.nacos.example.spring.boot.controller;\n\nimport com.alibaba.nacos.api.annotation.NacosInjected;\nimport com.alibaba.nacos.api.exception.NacosException;\nimport com.alibaba.nacos.api.naming.NamingService;\nimport com.alibaba.nacos.api.naming.pojo.Instance;\nimport org.springframework.stereotype.Controller;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestParam;\nimport org.springframework.web.bind.annotation.ResponseBody;\n\nimport java.util.List;\n\nimport static org.springframework.web.bind.annotation.RequestMethod.GET;\n\n@Controller\n@RequestMapping("discovery")\npublic class DiscoveryController {\n\n @NacosInjected\n private NamingService namingService;\n\n @RequestMapping(value = "/get", method = GET)\n @ResponseBody\n public List get(@RequestParam String serviceName) throws NacosException {\n return namingService.getAllInstances(serviceName);\n }\n}'}},{key:"getSpringCloudCode",value:function(){return"/* Refer to document: https://github.com/nacos-group/nacos-examples/blob/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/\n* pom.xml\n \n org.springframework.cloud\n spring-cloud-starter-alibaba-nacos-discovery\n ${latest.version}\n \n*/\n\n// nacos-spring-cloud-provider-example\n\n/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-provider-example/src/main/resources\n* application.properties\nserver.port=18080\nspring.application.name=".concat(this.record.name,'\nspring.cloud.nacos.discovery.server-addr=127.0.0.1:8848\n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-provider-example/src/main/java/com/alibaba/nacos/example/spring/cloud\npackage com.alibaba.nacos.example.spring.cloud;\n\nimport org.springframework.boot.SpringApplication;\nimport org.springframework.boot.autoconfigure.SpringBootApplication;\nimport org.springframework.cloud.client.discovery.EnableDiscoveryClient;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RestController;\n\n/**\n * @author xiaojing\n */\n@SpringBootApplication\n@EnableDiscoveryClient\npublic class NacosProviderApplication {\n\n public static void main(String[] args) {\n SpringApplication.run(NacosProviderApplication.class, args);\n}\n\n @RestController\n class EchoController {\n @RequestMapping(value = "/echo/{string}", method = RequestMethod.GET)\n public String echo(@PathVariable String string) {\n return "Hello Nacos Discovery " + string;\n }\n }\n}\n\n// nacos-spring-cloud-consumer-example\n\n/* Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-consumer-example/src/main/resources\n* application.properties\nspring.application.name=micro-service-oauth2\nspring.cloud.nacos.discovery.server-addr=127.0.0.1:8848\n*/\n\n// Refer to document: https://github.com/nacos-group/nacos-examples/tree/master/nacos-spring-cloud-example/nacos-spring-cloud-discovery-example/nacos-spring-cloud-consumer-example/src/main/java/com/alibaba/nacos/example/spring/cloud\npackage com.alibaba.nacos.example.spring.cloud;\n\nimport org.springframework.beans.factory.annotation.Autowired;\nimport org.springframework.boot.SpringApplication;\nimport org.springframework.boot.autoconfigure.SpringBootApplication;\nimport org.springframework.cloud.client.discovery.EnableDiscoveryClient;\nimport org.springframework.cloud.client.loadbalancer.LoadBalanced;\nimport org.springframework.context.annotation.Bean;\nimport org.springframework.web.bind.annotation.PathVariable;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RequestMethod;\nimport org.springframework.web.bind.annotation.RestController;\nimport org.springframework.web.client.RestTemplate;\n\n/**\n * @author xiaojing\n */\n@SpringBootApplication\n@EnableDiscoveryClient\npublic class NacosConsumerApplication {\n\n @LoadBalanced\n @Bean\n public RestTemplate restTemplate() {\n return new RestTemplate();\n }\n\n public static void main(String[] args) {\n SpringApplication.run(NacosConsumerApplication.class, args);\n }\n\n @RestController\n public class TestController {\n\n private final RestTemplate restTemplate;\n\n @Autowired\n public TestController(RestTemplate restTemplate) {this.restTemplate = restTemplate;}\n\n @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET)\n public String echo(@PathVariable String str) {\n return restTemplate.getForObject("http://service-provider/echo/" + str, String.class);\n }\n }\n}')}},{key:"getNodejsCode",value:function(){return"TODO"}},{key:"getCppCode",value:function(){return"TODO"}},{key:"getShellCode",value:function(){return"TODO"}},{key:"getPythonCode",value:function(){return"TODO"}},{key:"openDialog",value:function(e){var t=this;this.setState({dialogvisible:!0}),this.record=e,setTimeout(function(){t.getData()})}},{key:"closeDialog",value:function(){this.setState({dialogvisible:!1})}},{key:"createCodeMirror",value:function(e,t){var n=this.refs.codepreview;n&&(n.innerHTML="",this.cm=window.CodeMirror(n,{value:t,mode:e,height:400,width:500,lineNumbers:!0,theme:"xq-light",lint:!0,tabMode:"indent",autoMatchParens:!0,textWrapping:!0,gutters:["CodeMirror-lint-markers"],extraKeys:{F1:function(e){e.setOption("fullScreen",!e.getOption("fullScreen"))},Esc:function(e){e.getOption("fullScreen")&&e.setOption("fullScreen",!1)}}}),this.cm.setSize("auto","490px"))}},{key:"changeTab",value:function(e,t){var n=this;setTimeout(function(){n[e]=!0,n.createCodeMirror("text/javascript",t)})}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=F.a.createElement("div",null);return F.a.createElement("div",null,F.a.createElement(y.a,{title:t.sampleCode,style:{width:"80%"},visible:this.state.dialogvisible,footer:n,onClose:this.closeDialog.bind(this)},F.a.createElement("div",{style:{height:500}},F.a.createElement(S.a,{tip:t.loading,style:{width:"100%"},visible:this.state.loading},F.a.createElement(K.a,{shape:"text",style:{height:40,paddingBottom:10}},F.a.createElement(G,{title:"Java",key:0,onClick:this.changeTab.bind(this,"commoneditor1",this.defaultCode)}),F.a.createElement(G,{title:"Spring",key:1,onClick:this.changeTab.bind(this,"commoneditor1",this.springCode)}),F.a.createElement(G,{title:"Spring Boot",key:2,onClick:this.changeTab.bind(this,"commoneditor2",this.sprigbootCode)}),F.a.createElement(G,{title:"Spring Cloud",key:21,onClick:this.changeTab.bind(this,"commoneditor21",this.sprigcloudCode)}),F.a.createElement(G,{title:"Node.js",key:3,onClick:this.changeTab.bind(this,"commoneditor3",this.nodejsCode)}),F.a.createElement(G,{title:"C++",key:4,onClick:this.changeTab.bind(this,"commoneditor4",this.cppCode)}),F.a.createElement(G,{title:"Shell",key:5,onClick:this.changeTab.bind(this,"commoneditor5",this.shellCode)}),F.a.createElement(G,{title:"Python",key:6,onClick:this.changeTab.bind(this,"commoneditor6",this.pythonCode)})),F.a.createElement("div",{ref:"codepreview"})))))}}]),a}(F.a.Component),r.displayName="ShowServiceCodeing",a=o))||a,J=(n(697),A.a.Item),$=I.a.Row,Q=I.a.Col,X=P.a.Column,Z=(0,N.a.config)((l=s=function(e){Object(k.a)(a,e);var t=Object(D.a)(a);function a(e){var n;return Object(b.a)(this,a),(n=t.call(this,e)).getQueryLater=function(){setTimeout(function(){return n.queryServiceList()})},n.showcode=function(){setTimeout(function(){return n.queryServiceList()})},n.setNowNameSpace=function(e,t){return n.setState({nowNamespaceName:e,nowNamespaceId:t})},n.rowColor=function(e){return{className:e.healthyInstanceCount?"":"row-bg-red"}},n.editServiceDialog=F.a.createRef(),n.showcode=F.a.createRef(),n.state={loading:!1,total:0,pageSize:10,currentPage:1,dataSource:[],search:{serviceName:"",groupName:""},hasIpCount:!("false"===localStorage.getItem("hasIpCount"))},n.field=new _.a(Object(M.a)(n)),n}return Object(w.a)(a,[{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){try{this.editServiceDialog.current.getInstance().show(this.state.service)}catch(e){}}},{key:"queryServiceList",value:function(){var i=this,e=this.state,t=e.currentPage,n=e.pageSize,a=e.search,r=e.withInstances,o=void 0!==r&&r,s=e.hasIpCount,l=["hasIpCount=".concat(s),"withInstances=".concat(o),"pageNo=".concat(t),"pageSize=".concat(n),"serviceNameParam=".concat(a.serviceName),"groupNameParam=".concat(a.groupName)];Object(z.c)({url:"v1/ns/catalog/services?".concat(l.join("&")),success:function(e){var t=0this.state.pageSize&&F.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},F.a.createElement(E.a,{current:this.state.currentPage,total:this.state.total,pageSize:this.state.pageSize,onChange:function(e){return a.setState({currentPage:e},function(){return a.queryServiceList()})}}))),F.a.createElement(q,{ref:this.showcode}),F.a.createElement(B.a,{ref:this.editServiceDialog,openLoading:function(){return a.openLoading()},closeLoading:function(){return a.closeLoading()},queryServiceList:function(){return a.setState({currentPage:1},function(){return a.queryServiceList()})}}))}}]),a}(F.a.Component),s.displayName="ServiceList",i=l))||i;t.a=Z},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),d=n.n(u),c=(n(35),n(19)),f=n.n(c),p=(n(60),n(17)),h=n.n(p),m=(n(31),n(20)),g=n.n(m),y=n(13),v=n(14),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=n(0),S=n.n(k),E=n(44),L=n(51),x=n(45),T=(n(36),n(10)),C=n.n(T),D=n(38),O=(n(47),n(26)),N=n.n(O),Y=n(22),P=(n(41),n(9)),j=n.n(P),I=(n(149),j.a.Item),R={labelCol:{fixedSpan:4},wrapperCol:{span:19}},A=(0,M.a.config)((o=r=function(e){Object(_.a)(o,e);var r=Object(b.a)(o);function o(){var e;Object(y.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;ai&&S.a.createElement(d.a,{className:"users-pagination",current:s,total:n.totalCount,pageSize:i,onChange:function(e){return t.setState({pageNo:e},function(){return t.getUsers()})}}),S.a.createElement(A,{visible:l,onOk:function(e){return Object(L.c)(e).then(function(e){return t.setState({pageNo:1},function(){return t.getUsers()}),e})},onCancel:function(){return t.colseCreateUser()}}),S.a.createElement(H.a,{username:u,onOk:function(e){return Object(L.k)(e).then(function(e){return t.getUsers(),e})},onCancel:function(){return t.setState({passwordResetUser:void 0})}}))}}]),a}(S.a.Component),s.displayName="UserManagement",i=l))||i)||i;t.a=F},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),c=n.n(u),d=(n(35),n(19)),f=n.n(d),p=n(38),h=(n(60),n(17)),m=n.n(h),g=(n(31),n(20)),y=n.n(g),v=n(13),_=n(14),b=n(16),w=n(15),M=(n(25),n(8)),k=n.n(M),S=n(0),E=n.n(S),L=n(44),x=n(51),T=n(94),C=n(45),D=(n(36),n(10)),O=n.n(D),N=(n(47),n(26)),Y=n.n(N),P=n(22),j=(n(68),n(33)),I=n.n(j),R=(n(41),n(9)),A=n.n(R),H=A.a.Item,F=I.a.Option,z={labelCol:{fixedSpan:4},wrapperCol:{span:19}},W=Object(L.b)(function(e){return{namespaces:e.namespace.namespaces}},{getNamespaces:T.b})(a=(0,k.a.config)((o=r=function(e){Object(b.a)(o,e);var r=Object(w.a)(o);function o(){var e;Object(v.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;as&&E.a.createElement(c.a,{className:"users-pagination",current:u,total:t.totalCount,pageSize:s,onChange:function(e){return a.setState({pageNo:e},function(){return a.getPermissions()})}}),E.a.createElement(W,{visible:d,onOk:function(e){return Object(x.a)(e).then(function(e){return a.setState({pageNo:1},function(){return a.getPermissions()}),e})},onCancel:function(){return a.colseCreatePermission()}}))}}]),a}(E.a.Component),s.displayName="PermissionsManagement",i=l))||i)||i);t.a=V},function(e,t,n){"use strict";n(61);var a,r,o,i,s,l,u=n(43),d=n.n(u),c=(n(35),n(19)),f=n.n(c),p=(n(60),n(17)),h=n.n(p),m=(n(31),n(20)),g=n.n(m),y=n(13),v=n(14),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=n(0),S=n.n(k),E=n(44),L=n(51),x=n(45),T=(n(36),n(10)),C=n.n(T),D=(n(47),n(26)),O=n.n(D),N=n(22),Y=(n(41),n(9)),P=n.n(Y),j=P.a.Item,I={labelCol:{fixedSpan:4},wrapperCol:{span:19}},R=(0,M.a.config)((o=r=function(e){Object(_.a)(o,e);var r=Object(b.a)(o);function o(){var e;Object(y.a)(this,o);for(var t=arguments.length,n=new Array(t),a=0;ai&&S.a.createElement(d.a,{className:"users-pagination",current:s,total:t.totalCount,pageSize:i,onChange:function(e){return a.setState({pageNo:e},function(){return a.getRoles()})}}),S.a.createElement(R,{visible:l,onOk:function(e){return Object(L.b)(e).then(function(e){return a.getRoles(),e})},onCancel:function(){return a.colseCreateRole()}}))}}]),a}(S.a.Component),s.displayName="RolesManagement",i=l))||i)||i);t.a=A},function(e,t,n){"use strict";n(48);var a,r,o,i=n(30),m=n.n(i),s=(n(61),n(43)),g=n.n(s),l=(n(377),n(98)),y=n.n(l),u=(n(31),n(20)),v=n.n(u),d=(n(36),n(10)),_=n.n(d),c=(n(47),n(26)),f=n.n(c),p=n(13),h=n(14),b=n(22),w=n(16),M=n(15),k=(n(25),n(8)),S=n.n(k),E=(n(385),n(99)),L=n.n(E),x=(n(60),n(17)),T=n.n(x),C=(n(66),n(37)),D=n.n(C),O=(n(41),n(9)),N=n.n(O),Y=n(0),P=n.n(Y),j=n(1),I=n(45),R=(n(700),N.a.Item),A=D.a.Row,H=D.a.Col,F=T.a.Column,z=L.a.Panel,W=(0,S.a.config)((o=r=function(e){Object(w.a)(a,e);var t=Object(M.a)(a);function a(e){var n;return Object(p.a)(this,a),(n=t.call(this,e)).getQueryLater=function(){setTimeout(function(){return n.queryClusterStateList()})},n.setNowNameSpace=function(e,t){return n.setState({nowNamespaceName:e,nowNamespaceId:t})},n.rowColor=function(e){return{className:(e.voteFor,"")}},n.state={loading:!1,total:0,pageSize:10,currentPage:1,keyword:"",dataSource:[]},n.field=new f.a(Object(b.a)(n)),n}return Object(h.a)(a,[{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"openEditServiceDialog",value:function(){try{this.editServiceDialog.current.getInstance().show(this.state.service)}catch(e){}}},{key:"queryClusterStateList",value:function(){var i=this,e=this.state,t=e.currentPage,n=e.pageSize,a=e.keyword,r=e.withInstances,o=["withInstances=".concat(void 0!==r&&r),"pageNo=".concat(t),"pageSize=".concat(n),"keyword=".concat(a)];Object(j.c)({url:"v1/core/cluster/nodes?".concat(o.join("&")),beforeSend:function(){return i.openLoading()},success:function(e){var t=0this.state.pageSize&&P.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},P.a.createElement(g.a,{current:this.state.currentPage,total:this.state.total,pageSize:this.state.pageSize,onChange:function(e){return t.setState({currentPage:e},function(){return t.queryClusterStateList()})}}))))}}]),a}(P.a.Component),r.displayName="ClusterNodeList",a=o))||a;t.a=W},function(e,t,n){"use strict";n(48);var a,r,o,i=n(30),s=n.n(i),l=(n(31),n(20)),u=n.n(l),d=(n(36),n(10)),c=n.n(d),f=(n(35),n(19)),p=n.n(f),h=(n(47),n(26)),m=n.n(h),g=n(13),y=n(14),v=n(22),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=(n(41),n(9)),S=n.n(k),E=(n(123),n(57)),L=n.n(E),x=n(0),T=n.n(x),C=n(1),D=n(46),O=(n(640),L.a.Item),N=S.a.Item,Y=(0,M.a.config)((o=r=function(e){Object(_.a)(a,e);var n=Object(b.a)(a);function a(e){var t;return Object(g.a)(this,a),(t=n.call(this,e)).state={loading:!1,showmore:!1,activeKey:"normal",hasbeta:!1,ips:"",checkedBeta:!1,switchEncrypt:!1,tag:[]},t.field=new m.a(Object(v.a)(t)),t.dataId=Object(C.b)("dataId")||"yanlin",t.group=Object(C.b)("group")||"DEFAULT_GROUP",t.ips="",t.valueMap={},t.tenant=Object(C.b)("namespace")||"",t.searchDataId=Object(C.b)("searchDataId")||"",t.searchGroup=Object(C.b)("searchGroup")||"",t.pageSize=Object(C.b)("pageSize"),t.pageNo=Object(C.b)("pageNo"),t}return Object(y.a)(a,[{key:"componentDidMount",value:function(){this.initData(),this.getDataDetail()}},{key:"initData",value:function(){var e=this.props.locale,t=void 0===e?{}:e;this.dataId.startsWith("cipher-")&&this.setState({switchEncrypt:!0}),this.setState({tag:[{title:t.official,key:"normal"}]})}},{key:"openLoading",value:function(){this.setState({loading:!0})}},{key:"closeLoading",value:function(){this.setState({loading:!1})}},{key:"changeTab",value:function(e){var t=e.split("-")[0],n=this.valueMap[t];this.setState({activeKey:e}),this.field.setValue("content",n.content),n.betaIps&&this.setState({ips:n.betaIps})}},{key:"toggleMore",value:function(){this.setState({showmore:!this.state.showmore})}},{key:"getDataDetail",value:function(){var e=this.props.locale,n=void 0===e?{}:e,a=this;this.serverId=Object(C.b)("serverId")||"center",this.tenant=Object(C.b)("namespace")||"",this.edasAppName=Object(C.b)("edasAppName")||"",this.inApp=this.edasAppName;var t="v1/cs/configs?show=all&dataId=".concat(this.dataId,"&group=").concat(this.group);Object(C.c)({url:t,beforeSend:function(){a.openLoading()},success:function(e){var t;null!=e?(t=e,a.valueMap.normal=t,a.field.setValue("dataId",t.dataId),a.field.setValue("content",t.content),a.field.setValue("appName",a.inApp?a.edasAppName:t.appName),a.field.setValue("envs",a.serverId),a.field.setValue("group",t.group),a.field.setValue("config_tags",t.configTags),a.field.setValue("desc",t.desc),a.field.setValue("md5",t.md5)):p.a.alert({title:n.error,content:e.message})},complete:function(){a.closeLoading()}})}},{key:"goList",value:function(){this.props.history.push(Object(D.a)("/configurationManagement",{serverId:this.serverId,group:this.searchGroup,dataId:this.searchDataId,namespace:this.tenant,pageNo:this.pageNo,pageSize:this.pageSize}))}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e,n=this.field.init,a={labelCol:{span:2},wrapperCol:{span:22}},r=this.state.activeKey.split("-")[0];return T.a.createElement("div",{style:{padding:10}},T.a.createElement(s.a,{shape:"flower",tip:"Loading...",style:{width:"100%",position:"relative"},visible:this.state.loading,color:"#333"},T.a.createElement("h1",{style:{position:"relative",width:"100%"}},t.configurationDetails),this.state.hasbeta?T.a.createElement("div",{style:{display:"inline-block",height:40,width:"80%",overflow:"hidden"}},T.a.createElement(L.a,{shape:"wrapped",onChange:this.changeTab.bind(this),lazyLoad:!1,activeKey:this.state.activeKey},this.state.tag.map(function(e){return T.a.createElement(O,{title:e.title,key:e.key})}))):"",T.a.createElement(S.a,{inline:!1,field:this.field},T.a.createElement(N,Object.assign({label:"Data ID:",required:!0},a),T.a.createElement(c.a,Object.assign({htmlType:"text",readOnly:!0},n("dataId")))),T.a.createElement(N,Object.assign({label:"Group:",required:!0},a),T.a.createElement(c.a,Object.assign({htmlType:"text",readOnly:!0},n("group")))),T.a.createElement("div",{style:{marginTop:10}},T.a.createElement("a",{style:{fontSize:"12px"},onClick:this.toggleMore.bind(this)},this.state.showmore?t.collapse:t.more)),this.state.showmore?T.a.createElement("div",null,T.a.createElement(N,Object.assign({label:t.home},a),T.a.createElement(c.a,Object.assign({htmlType:"text",readOnly:!0},n("appName")))),T.a.createElement(N,Object.assign({label:t.tags},a),T.a.createElement(c.a,Object.assign({htmlType:"text",readOnly:!0},n("config_tags"))))):"",T.a.createElement(N,Object.assign({label:t.description},a),T.a.createElement(c.a.TextArea,Object.assign({htmlType:"text",multiple:!0,rows:3,readOnly:!0},n("desc")))),"normal"===r?"":T.a.createElement(N,Object.assign({label:t.betaRelease},a),T.a.createElement("div",{style:{width:"100%"},id:"betaips"},T.a.createElement(c.a.TextArea,{multiple:!0,style:{width:"100%"},value:this.state.ips,readOnly:!0,placeholder:"127.0.0.1,127.0.0.2"}))),T.a.createElement(N,Object.assign({label:"MD5:",required:!0},a),T.a.createElement(c.a,Object.assign({htmlType:"text",readOnly:!0},n("md5")))),T.a.createElement(N,Object.assign({label:t.configuration,required:!0},a),T.a.createElement(c.a.TextArea,Object.assign({htmlType:"text",multiple:!0,rows:15,readOnly:!0},n("content")))),T.a.createElement(N,Object.assign({label:" "},a),T.a.createElement(u.a,{type:"primary",onClick:this.goList.bind(this)},t.back)))))}}]),a}(T.a.Component),r.displayName="ConfigDetail",a=o))||a;t.a=Y},function(e,t,n){"use strict";n(48);var a,r,o,i=n(30),s=n.n(i),l=(n(31),n(20)),u=n.n(l),d=(n(102),n(69)),c=n.n(d),f=(n(41),n(9)),p=n.n(f),h=(n(36),n(10)),m=n.n(h),g=(n(35),n(19)),y=n.n(g),v=(n(47),n(26)),_=n.n(v),b=n(13),w=n(14),M=n(22),k=n(16),S=n(15),E=(n(25),n(8)),L=n.n(E),x=n(0),T=n.n(x),C=n(96),D=n(1),O=n(46),N=(n(638),(0,L.a.config)((o=r=function(e){Object(k.a)(a,e);var n=Object(S.a)(a);function a(e){var t;return Object(b.a)(this,a),(t=n.call(this,e)).successDialog=T.a.createRef(),t.field=new _.a(Object(M.a)(t)),t.dataId=Object(D.b)("dataId")||"yanlin",t.group=Object(D.b)("group")||"",t.serverId=Object(D.b)("serverId")||"",t.state={configType:0,envvalues:[],commonvalue:[],envComponent:"",envGroups:[],envlist:[],loading:!1,showmore:!1},t.codeValue="",t.mode="text",t.ips="",t}return Object(w.a)(a,[{key:"componentDidMount",value:function(){this.getDataDetail()}},{key:"toggleMore",value:function(){this.setState({showmore:!this.state.showmore})}},{key:"getEnvList",value:function(e){this.setState({envvalues:e}),this.envs=e}},{key:"getDomain",value:function(){var n=this;Object(D.c)({url:"/diamond-ops/env/domain",success:function(e){var t;200===e.code&&(t=e.data.envGroups,n.setState({envGroups:t}))}})}},{key:"getDataDetail",value:function(){var s=this,e=this.props.locale,l=void 0===e?{}:e;this.tenant=Object(D.b)("namespace")||"",this.serverId=Object(D.b)("serverId")||"center";var t="/diamond-ops/configList/detail/serverId/".concat(this.serverId,"/dataId/").concat(this.dataId,"/group/").concat(this.group,"/tenant/").concat(this.tenant,"?id=");"global"!==this.tenant&&this.tenant||(t="/diamond-ops/configList/detail/serverId/".concat(this.serverId,"/dataId/").concat(this.dataId,"/group/").concat(this.group,"?id=")),Object(D.c)({url:t,beforeSend:function(){s.openLoading()},success:function(e){if(200===e.code){var t=e.data,n=void 0===t?{}:t;s.field.setValue("dataId",n.dataId),s.field.setValue("appName",n.appName),s.field.setValue("group",n.group),s.field.setValue("content",n.content||"");for(var a=n.envs||[],r=[],o=[],i=0;ithis.state.pageSize&&Y.a.createElement("div",{style:{marginTop:10,textAlign:"right"}},Y.a.createElement(E.a,{current:this.state.pageNo,total:s,pageSize:this.state.pageSize,onChange:function(e){return t.setState({pageNo:e},function(){return t.querySubscriberList()})}}))))}}]),a}(Y.a.Component),r.displayName="SubscriberList",a=o))||a)||a;t.a=z},function(e,t,n){"use strict";n(361);var a,r,o,i,s=n(128),l=n.n(s),u=(n(36),n(10)),d=n.n(u),c=n(38),f=(n(47),n(26)),p=n.n(f),h=(n(52),n(27)),m=n.n(h),g=n(13),y=n(14),v=n(22),_=n(16),b=n(15),w=(n(25),n(8)),M=n.n(w),k=(n(41),n(9)),S=n.n(k),E=n(0),L=n.n(E),x=n(32),T=(n(582),n(126)),C=n(92),D=S.a.Item,O=(a=M.a.config,Object(x.g)(r=a((i=o=function(e){Object(_.a)(n,e);var t=Object(b.a)(n);function n(e){var a;return Object(g.a)(this,n),(a=t.call(this,e)).handleSubmit=function(){var e=a.props.locale,n=void 0===e?{}:e;a.field.validate(function(e,t){e||Object(C.c)(t).then(function(e){localStorage.setItem("token",JSON.stringify(e)),a.props.history.push("/")}).catch(function(){m.a.error({content:n.invalidUsernameOrPassword})})})},a.onKeyDown=function(e){"Enter"===e.key&&(e.preventDefault(),e.stopPropagation(),a.handleSubmit())},a.field=new p.a(Object(v.a)(a)),a}return Object(y.a)(n,[{key:"componentDidMount",value:function(){var e,t;localStorage.getItem("token")&&(e=location.href.split("#"),t=Object(c.a)(e,1)[0],location.href="".concat(t,"#/"))}},{key:"render",value:function(){var e=this.props.locale,t=void 0===e?{}:e;return L.a.createElement("div",{className:"home-page"},L.a.createElement(T.a,null),L.a.createElement("section",{className:"top-section",style:{background:"url(img/black_dot.png) repeat",backgroundSize:"14px 14px"}},L.a.createElement("div",{className:"vertical-middle product-area"},L.a.createElement("img",{className:"product-logo",src:"img/nacos.png"}),L.a.createElement("p",{className:"product-desc"},"an easy-to-use dynamic service discovery, configuration and service management platform for building cloud native applications")),L.a.createElement("div",{className:"animation animation1"}),L.a.createElement("div",{className:"animation animation2"}),L.a.createElement("div",{className:"animation animation3"}),L.a.createElement("div",{className:"animation animation4"}),L.a.createElement("div",{className:"animation animation5"}),L.a.createElement(l.a,{className:"login-panel",contentHeight:"auto"},L.a.createElement("div",{className:"login-header"},t.login),L.a.createElement(S.a,{className:"login-form",field:this.field},L.a.createElement(D,null,L.a.createElement(d.a,Object.assign({},this.field.init("username",{rules:[{required:!0,message:t.usernameRequired}]}),{placeholder:t.pleaseInputUsername,onKeyDown:this.onKeyDown}))),L.a.createElement(D,null,L.a.createElement(d.a,Object.assign({htmlType:"password",placeholder:t.pleaseInputPassword},this.field.init("password",{rules:[{required:!0,message:t.passwordRequired}]}),{onKeyDown:this.onKeyDown}))),L.a.createElement(D,{label:" "},L.a.createElement(S.a.Submit,{onClick:this.handleSubmit},t.submit))))))}}]),n}(L.a.Component),o.displayName="Login",r=i))||r)||r);t.a=O},function(e,t,n){"use strict";n(40);function s(e){var t=localStorage.token,n=void 0===t?"{}":t,a=Object(L.c)(n)&&JSON.parse(n)||{};return["naming"===e?void 0:x,{key:"serviceManagementVirtual",children:[{key:"serviceManagement",url:"/serviceManagement"},{key:"subscriberList",url:"/subscriberList"}]},a.globalAdmin?T:void 0,{key:"namespace",url:"/namespace"},{key:"clusterManagementVirtual",children:[{key:"clusterManagement",url:"/clusterManagement"}]}].filter(function(e){return e})}var a,r,o,i,l,u=n(23),d=n.n(u),c=n(13),f=n(14),p=n(16),h=n(15),m=(n(25),n(8)),g=n.n(m),y=n(21),v=(n(79),n(50)),_=n.n(v),b=n(0),w=n.n(b),M=n(32),k=n(44),S=n(126),E=n(92),L=n(46),x={key:"configurationManagementVirtual",children:[{key:"configurationManagement",url:"/configurationManagement"},{key:"historyRollback",url:"/historyRollback"},{key:"listeningToQuery",url:"/listeningToQuery"}]},T={key:"authorityControl",children:[{key:"userList",url:"/userManagement"},{key:"roleManagement",url:"/rolesManagement"},{key:"privilegeManagement",url:"/permissionsManagement"}]},C=_.a.SubMenu,D=_.a.Item,O=(a=Object(k.b)(function(e){return Object(y.a)(Object(y.a)({},e.locale),e.base)},{getState:E.b}),r=g.a.config,Object(M.g)(o=a(o=r((l=i=function(e){Object(p.a)(n,e);var t=Object(h.a)(n);function n(){return Object(c.a)(this,n),t.apply(this,arguments)}return Object(f.a)(n,[{key:"componentDidMount",value:function(){this.props.getState()}},{key:"goBack",value:function(){this.props.history.goBack()}},{key:"navTo",value:function(e){var t=this.props.location.search;this.props.history.push([e,t].join(""))}},{key:"isCurrentPath",value:function(e){return e===this.props.location.pathname?"current-path":void 0}},{key:"defaultOpenKeys",value:function(){for(var t=this,e=s(this.props.functionMode),n=0,a=e.length;n=t.length?{value:void 0,done:!0}:(e=a(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){var l=n(137),u=n(136);e.exports=function(s){return function(e,t){var n,a,r=String(u(e)),o=l(t),i=r.length;return o<0||i<=o?s?"":void 0:(n=r.charCodeAt(o))<55296||56319=e.length?(this._t=void 0,r(1)):r(0,"keys"==t?n:"values"==t?e[n]:[n,e[n]])},"values"),o.Arguments=o.Array,a("keys"),a("values"),a("entries")},function(e,t){e.exports=function(){}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){e.exports={default:n(462),__esModule:!0}},function(e,t,n){n(463),n(468),n(469),n(470),e.exports=n(72).Symbol},function(e,t,n){"use strict";function a(e){var t=G[e]=D(H[W]);return t._k=e,t}function r(e,t){S(e);for(var n,a=M(t=x(t)),r=0,o=a.length;rr;)d(G,t=n[r++])||t==V||t==h||a.push(t);return a}function l(e){for(var t,n=e===J,a=A(n?q:x(e)),r=[],o=0;a.length>o;)!d(G,t=a[o++])||n&&!d(J,t)||r.push(G[t]);return r}var u=n(71),d=n(77),c=n(73),f=n(83),p=n(181),h=n(464).KEY,m=n(101),g=n(139),y=n(145),v=n(114),_=n(87),b=n(146),w=n(147),M=n(465),k=n(466),S=n(100),E=n(85),L=n(142),x=n(86),T=n(135),C=n(111),D=n(144),O=n(467),N=n(183),Y=n(141),P=n(76),j=n(112),I=N.f,R=P.f,A=O.f,H=u.Symbol,F=u.JSON,z=F&&F.stringify,W="prototype",V=_("_hidden"),B=_("toPrimitive"),U={}.propertyIsEnumerable,K=g("symbol-registry"),G=g("symbols"),q=g("op-symbols"),J=Object[W],$="function"==typeof H&&!!Y.f,Q=u.QObject,X=!Q||!Q[W]||!Q[W].findChild,Z=c&&m(function(){return 7!=D(R({},"a",{get:function(){return R(this,"a",{value:7}).a}})).a})?function(e,t,n){var a=I(J,t);a&&delete J[t],R(e,t,n),a&&e!==J&&R(J,t,a)}:R,ee=$&&"symbol"==typeof H.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof H},te=function(e,t,n){return e===J&&te(q,t,n),S(e),t=T(t,!0),S(n),d(G,t)?(n.enumerable?(d(e,V)&&e[V][t]&&(e[V][t]=!1),n=D(n,{enumerable:C(0,!1)})):(d(e,V)||R(e,V,C(1,{})),e[V][t]=!0),Z(e,t,n)):R(e,t,n)};$||(p((H=function(e){if(this instanceof H)throw TypeError("Symbol is not a constructor!");var t=v(0ae;)_(ne[ae++]);for(var re=j(_.store),oe=0;re.length>oe;)w(re[oe++]);f(f.S+f.F*!$,"Symbol",{for:function(e){return d(K,e+="")?K[e]:K[e]=H(e)},keyFor:function(e){if(!ee(e))throw TypeError(e+" is not a symbol!");for(var t in K)if(K[t]===e)return t},useSetter:function(){X=!0},useSimple:function(){X=!1}}),f(f.S+f.F*!$,"Object",{create:function(e,t){return void 0===t?D(e):r(D(e),t)},defineProperty:te,defineProperties:r,getOwnPropertyDescriptor:i,getOwnPropertyNames:s,getOwnPropertySymbols:l});var ie=m(function(){Y.f(1)});f(f.S+f.F*ie,"Object",{getOwnPropertySymbols:function(e){return Y.f(L(e))}}),F&&f(f.S+f.F*(!$||m(function(){var e=H();return"[null]"!=z([e])||"{}"!=z({a:e})||"{}"!=z(Object(e))})),"JSON",{stringify:function(e){for(var t,n,a=[e],r=1;ri;)o.call(e,a=r[i++])&&t.push(a);return t}},function(e,t,n){var a=n(179);e.exports=Array.isArray||function(e){return"Array"==a(e)}},function(e,t,n){var a=n(86),r=n(182).f,o={}.toString,i="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];e.exports.f=function(e){return i&&"[object Window]"==o.call(e)?function(e){try{return r(e)}catch(e){return i.slice()}}(e):r(a(e))}},function(e,t){},function(e,t,n){n(147)("asyncIterator")},function(e,t,n){n(147)("observable")},function(e,t,n){e.exports={default:n(472),__esModule:!0}},function(e,t,n){n(473),e.exports=n(72).Object.setPrototypeOf},function(e,t,n){var a=n(83);a(a.S,"Object",{setPrototypeOf:n(474).set})},function(e,t,r){function o(e,t){if(a(e),!n(t)&&null!==t)throw TypeError(t+": can't set as prototype!")}var n=r(85),a=r(100);e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,a){try{(a=r(174)(Function.call,r(183).f(Object.prototype,"__proto__").set,2))(e,[]),n=!(e instanceof Array)}catch(e){n=!0}return function(e,t){return o(e,t),n?e.__proto__=t:a(e,t),e}}({},!1):void 0),check:o}},function(e,t,n){e.exports={default:n(476),__esModule:!0}},function(e,t,n){n(477);var a=n(72).Object;e.exports=function(e,t){return a.create(e,t)}},function(e,t,n){var a=n(83);a(a.S,"Object",{create:n(144)})},function(e,t,n){"use strict";function l(e,t,n,a){e.removeEventListener&&e.removeEventListener(t,n,a||!1)}function a(e,t,n,a){return e.addEventListener&&e.addEventListener(t,n,a||!1),{off:function(){return l(e,t,n,a)}}}t.__esModule=!0,t.on=a,t.once=function(r,o,i,s){return a(r,o,function e(){for(var t=arguments.length,n=Array(t),a=0;aa.height)&&(i[1]=-t.top-("t"===o?t.height:0))),i},this._getParentScrollOffset=function(e){var t=0,n=0;return e&&e.offsetParent&&e.offsetParent!==document.body&&(isNaN(e.offsetParent.scrollTop)||(t+=e.offsetParent.scrollTop),isNaN(e.offsetParent.scrollLeft)||(n+=e.offsetParent.scrollLeft)),{top:t,left:n}}},r);function m(e){(0,i.default)(this,m),o.call(this),this.pinElement=e.pinElement,this.baseElement=e.baseElement,this.pinFollowBaseElementWhenFixed=e.pinFollowBaseElementWhenFixed,this.container=p(e),this.autoFit=e.autoFit||!1,this.align=e.align||"tl tl",this.offset=e.offset||[0,0],this.needAdjust=e.needAdjust||!1,this.isRtl=e.isRtl||!1}t.default=h,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a,r,p=f(n(18)),h=f(n(4)),o=f(n(3)),i=f(n(5)),s=f(n(6)),c=n(0),m=f(c),g=n(24),l=n(28),u=f(n(2)),d=n(11),y=f(n(331));function f(e){return e&&e.__esModule?e:{default:e}}var v,_=d.func.noop,b=d.func.makeChain,w=d.func.bindCtx,M=(v=c.Component,(0,s.default)(k,v),k.getDerivedStateFromProps=function(e,t){return"visible"in e?(0,h.default)({},t,{visible:e.visible}):null},k.prototype.componentWillUnmount=function(){var t=this;["_timer","_hideTimer","_showTimer"].forEach(function(e){t[e]&&clearTimeout(t[e])})},k.prototype.handleVisibleChange=function(e,t,n){"visible"in this.props||this.setState({visible:e}),this.props.onVisibleChange(e,t,n)},k.prototype.handleTriggerClick=function(e){this.state.visible&&!this.props.canCloseByTrigger||this.handleVisibleChange(!this.state.visible,"fromTrigger",e)},k.prototype.handleTriggerKeyDown=function(e){var t=this.props.triggerClickKeycode;(Array.isArray(t)?t:[t]).includes(e.keyCode)&&(e.preventDefault(),this.handleTriggerClick(e))},k.prototype.handleTriggerMouseEnter=function(e){var t=this;this._mouseNotFirstOnMask=!1,this._hideTimer&&(clearTimeout(this._hideTimer),this._hideTimer=null),this._showTimer&&(clearTimeout(this._showTimer),this._showTimer=null),this.state.visible||(this._showTimer=setTimeout(function(){t.handleVisibleChange(!0,"fromTrigger",e)},this.props.delay))},k.prototype.handleTriggerMouseLeave=function(e,t){var n=this;this._showTimer&&(clearTimeout(this._showTimer),this._showTimer=null),this.state.visible&&(this._hideTimer=setTimeout(function(){n.handleVisibleChange(!1,t||"fromTrigger",e)},this.props.delay))},k.prototype.handleTriggerFocus=function(e){this.handleVisibleChange(!0,"fromTrigger",e)},k.prototype.handleTriggerBlur=function(e){this._isForwardContent||this.handleVisibleChange(!1,"fromTrigger",e),this._isForwardContent=!1},k.prototype.handleContentMouseDown=function(){this._isForwardContent=!0},k.prototype.handleContentMouseEnter=function(){clearTimeout(this._hideTimer)},k.prototype.handleContentMouseLeave=function(e){this.handleTriggerMouseLeave(e,"fromContent")},k.prototype.handleMaskMouseEnter=function(){this._mouseNotFirstOnMask||(clearTimeout(this._hideTimer),this._hideTimer=null,this._mouseNotFirstOnMask=!1)},k.prototype.handleMaskMouseLeave=function(){this._mouseNotFirstOnMask=!0},k.prototype.handleRequestClose=function(e,t){this.handleVisibleChange(!1,e,t)},k.prototype.renderTrigger=function(){var e,t,n,a,r,o,i,s,l,u=this,d=this.props,c=d.trigger,f=d.disabled,p={key:"trigger","aria-haspopup":!0,"aria-expanded":this.state.visible};return this.state.visible||(p["aria-describedby"]=void 0),f||(e=this.props.triggerType,t=Array.isArray(e)?e:[e],n=c&&c.props||{},a=n.onClick,r=n.onKeyDown,o=n.onMouseEnter,i=n.onMouseLeave,s=n.onFocus,l=n.onBlur,t.forEach(function(e){switch(e){case"click":p.onClick=b(u.handleTriggerClick,a),p.onKeyDown=b(u.handleTriggerKeyDown,r);break;case"hover":p.onMouseEnter=b(u.handleTriggerMouseEnter,o),p.onMouseLeave=b(u.handleTriggerMouseLeave,i);break;case"focus":p.onFocus=b(u.handleTriggerFocus,s),p.onBlur=b(u.handleTriggerBlur,l)}})),c&&m.default.cloneElement(c,p)},k.prototype.renderContent=function(){var t=this,e=this.props,n=e.children,a=e.triggerType,r=Array.isArray(a)?a:[a],o=c.Children.only(n),i=o.props,s=i.onMouseDown,l=i.onMouseEnter,u=i.onMouseLeave,d={key:"portal"};return r.forEach(function(e){switch(e){case"focus":d.onMouseDown=b(t.handleContentMouseDown,s);break;case"hover":d.onMouseEnter=b(t.handleContentMouseEnter,l),d.onMouseLeave=b(t.handleContentMouseLeave,u)}}),m.default.cloneElement(o,d)},k.prototype.renderPortal=function(){function e(){return(0,g.findDOMNode)(t)}var t=this,n=this.props,a=n.target,r=n.safeNode,o=n.followTrigger,i=n.triggerType,s=n.hasMask,l=n.wrapperStyle,u=(0,p.default)(n,["target","safeNode","followTrigger","triggerType","hasMask","wrapperStyle"]),d=this.props.container,c=Array.isArray(r)?[].concat(r):[r];c.unshift(e);var f=l||{};return o&&(d=function(e){return e&&e.parentNode||e},f.position="relative"),"hover"===i&&s&&(u.onMaskMouseEnter=this.handleMaskMouseEnter,u.onMaskMouseLeave=this.handleMaskMouseLeave),m.default.createElement(y.default,(0,h.default)({},u,{key:"overlay",ref:function(e){return t.overlay=e},visible:this.state.visible,target:a||e,container:d,safeNode:c,wrapperStyle:f,triggerType:i,hasMask:s,onRequestClose:this.handleRequestClose}),this.renderContent())},k.prototype.render=function(){return[this.renderTrigger(),this.renderPortal()]},r=a=k,a.propTypes={children:u.default.node,trigger:u.default.element,triggerType:u.default.oneOfType([u.default.string,u.default.array]),triggerClickKeycode:u.default.oneOfType([u.default.number,u.default.array]),visible:u.default.bool,defaultVisible:u.default.bool,onVisibleChange:u.default.func,disabled:u.default.bool,autoFit:u.default.bool,delay:u.default.number,canCloseByTrigger:u.default.bool,target:u.default.any,safeNode:u.default.any,followTrigger:u.default.bool,container:u.default.any,hasMask:u.default.bool,wrapperStyle:u.default.object,rtl:u.default.bool},a.defaultProps={triggerType:"hover",triggerClickKeycode:[d.KEYCODE.SPACE,d.KEYCODE.ENTER],defaultVisible:!1,onVisibleChange:_,disabled:!1,autoFit:!1,delay:200,canCloseByTrigger:!0,followTrigger:!1,container:function(){return document.body},rtl:!1},r);function k(e){(0,o.default)(this,k);var t=(0,i.default)(this,v.call(this,e));return t.state={visible:void 0===e.visible?e.defaultVisible:e.visible},w(t,["handleTriggerClick","handleTriggerKeyDown","handleTriggerMouseEnter","handleTriggerMouseLeave","handleTriggerFocus","handleTriggerBlur","handleContentMouseEnter","handleContentMouseLeave","handleContentMouseDown","handleRequestClose","handleMaskMouseEnter","handleMaskMouseLeave"]),t}M.displayName="Popup",t.default=(0,l.polyfill)(M),e.exports=t.default},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){"use strict";n(512)},function(e,t,n){},function(e,t,n){},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,h=d(n(4)),o=d(n(3)),i=d(n(5)),s=d(n(6)),m=d(n(0)),l=d(n(2)),g=d(n(12)),y=n(11),u=d(n(26)),v=d(n(339));function d(e){return e&&e.__esModule?e:{default:e}}function _(e,r){var o=r.size,i=r.device,s=r.labelAlign,l=r.labelTextAlign,u=r.labelCol,d=r.wrapperCol,c=r.responsive;return m.default.Children.map(e,function(e){if(y.obj.isReactFragment(e))return _(e.props.children,r);if(e&&"function"==typeof e.type&&"form_item"===e.type._typeMark){var t={labelCol:e.props.labelCol?e.props.labelCol:u,wrapperCol:e.props.wrapperCol?e.props.wrapperCol:d,labelAlign:e.props.labelAlign?e.props.labelAlign:"phone"===i?"top":s,labelTextAlign:e.props.labelTextAlign?e.props.labelTextAlign:l,size:e.props.size?e.props.size:o,responsive:c};return m.default.cloneElement(e,(n=t,a={},Object.keys(n).forEach(function(e){void 0!==n[e]&&(a[e]=n[e])}),a))}var n,a;return e})}var c,f=(c=m.default.Component,(0,s.default)(b,c),b.prototype.getChildContext=function(){return{_formField:this.props.field?this.props.field:this._formField,_formSize:this.props.size,_formPreview:this.props.isPreview,_formFullWidth:this.props.fullWidth,_formLabelForErrorMessage:this.props.useLabelForErrorMessage}},b.prototype.componentDidUpdate=function(e){var t=this.props;this._formField&&("value"in t&&t.value!==e.value&&this._formField.setValues(t.value),"error"in t&&t.error!==e.error&&this._formField.setValues(t.error))},b.prototype.render=function(){var e,t=this.props,n=t.className,a=t.inline,r=t.size,o=(t.device,t.labelAlign,t.labelTextAlign,t.onSubmit),i=t.children,s=(t.labelCol,t.wrapperCol,t.style),l=t.prefix,u=t.rtl,d=t.component,c=t.responsive,f=(0,g.default)(((e={})[l+"form"]=!0,e[l+"inline"]=a,e[""+l+r]=r,e[l+"form-responsive-grid"]=c,e[n]=!!n,e)),p=_(i,this.props);return m.default.createElement(d,(0,h.default)({role:"grid"},y.obj.pickOthers(b.propTypes,this.props),{className:f,style:s,dir:u?"rtl":void 0,onSubmit:o}),c?m.default.createElement(v.default,null,p):p)},r=a=b,a.propTypes={prefix:l.default.string,inline:l.default.bool,size:l.default.oneOf(["large","medium","small"]),fullWidth:l.default.bool,labelAlign:l.default.oneOf(["top","left","inset"]),labelTextAlign:l.default.oneOf(["left","right"]),field:l.default.any,saveField:l.default.func,labelCol:l.default.object,wrapperCol:l.default.object,onSubmit:l.default.func,children:l.default.any,className:l.default.string,style:l.default.object,value:l.default.object,onChange:l.default.func,component:l.default.oneOfType([l.default.string,l.default.func]),fieldOptions:l.default.object,rtl:l.default.bool,device:l.default.oneOf(["phone","tablet","desktop"]),responsive:l.default.bool,isPreview:l.default.bool,useLabelForErrorMessage:l.default.bool},a.defaultProps={prefix:"next-",onSubmit:function(e){e.preventDefault()},size:"medium",labelAlign:"left",onChange:y.func.noop,component:"form",saveField:y.func.noop,device:"desktop"},a.childContextTypes={_formField:l.default.object,_formSize:l.default.string,_formPreview:l.default.bool,_formFullWidth:l.default.bool,_formLabelForErrorMessage:l.default.bool},r);function b(e){(0,o.default)(this,b);var t,n,a=(0,i.default)(this,c.call(this,e));return a.onChange=function(e,t){a.props.onChange(a._formField.getValues(),{name:e,value:t,field:a._formField})},a._formField=null,!1!==e.field&&(t=(0,h.default)({},e.fieldOptions,{onChange:a.onChange}),e.field?(a._formField=e.field,n=a._formField.options.onChange,t.onChange=y.func.makeChain(n,a.onChange),a._formField.setOptions&&a._formField.setOptions(t)):("value"in e&&(t.values=e.value),a._formField=new u.default(a,t)),e.saveField(a._formField)),a}f.displayName="Form",t.default=f,e.exports=t.default},function(e,t,n){"use strict";var a=n(78);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var _=a(n(150)),r=a(n(151)),s=a(n(334)),N=a(n(152)),Y=a(n(335)),i=a(n(517)),o=a(n(336)),l=a(n(337)),b=a(n(523)),P=n(532),u={state:"",valueName:"value",trigger:"onChange"},d=function(){function a(e){var t=this,n=1e.length)&&(t=e.length);for(var n=0,a=new Array(t);n=a.length)return n;var o=a[r],i=e(t&&t[o],n,a,r+1);if(!t){var s=isNaN(o)?{}:[];return s[o]=i,s}if(Array.isArray(t)){var l=[].concat(t);return l[o]=i,l}return(0,d.default)({},t,(0,u.default)({},o,i))};var n=function(){};void 0!==e&&e.env,r.warning=n}).call(this,o(338))},function(e,t,n){"use strict";t.__esModule=!0,t.cloneAndAddKey=function(e){if(e&&(0,r.isValidElement)(e)){var t=e.key||"error";return(0,r.cloneElement)(e,{key:t})}return e},t.scrollToFirstError=function(e){var t=e.errorsGroup,n=e.options,a=e.instance;if(t&&n.scrollToFirstError){var r,o=void 0,i=void 0;for(var s in t)if(t.hasOwnProperty(s)){var l=d.default.findDOMNode(a[s]);if(!l)return;var u=l.offsetTop;(void 0===i||u), use instead of.'),O.default.cloneElement(e,{className:a,size:h||P(s)})}return(0,D.isValidElement)(e)?e:O.default.createElement("span",{className:r+"btn-helper"},e)}),L=p,x=(0,T.default)({},Y.obj.pickOthers(Object.keys(j.propTypes),b),{type:l,disabled:g,onClick:y,className:(0,N.default)(M)});return"button"!==L&&(delete x.type,x.disabled&&(delete x.onClick,x.href&&delete x.href)),O.default.createElement(L,(0,T.default)({},x,{dir:_?"rtl":void 0,onMouseUp:this.onMouseUp,ref:this.buttonRefHandler}),k,E)},r=a=j,a.propTypes=(0,T.default)({},u.default.propTypes,{prefix:l.default.string,rtl:l.default.bool,type:l.default.oneOf(["primary","secondary","normal"]),size:l.default.oneOf(["small","medium","large"]),icons:l.default.shape({loading:l.default.node}),iconSize:l.default.oneOf(["xxs","xs","small","medium","large","xl","xxl","xxxl","inherit",l.default.number]),htmlType:l.default.oneOf(["submit","reset","button"]),component:l.default.oneOf(["button","a","div","span"]),loading:l.default.bool,ghost:l.default.oneOf([!0,!1,"light","dark"]),text:l.default.bool,warning:l.default.bool,disabled:l.default.bool,onClick:l.default.func,className:l.default.string,onMouseUp:l.default.func,children:l.default.node}),a.defaultProps={prefix:"next-",type:"normal",size:"medium",icons:{},htmlType:"button",component:"button",loading:!1,ghost:!1,text:!1,warning:!1,disabled:!1,onClick:function(){}},r);function j(){var e,t;(0,o.default)(this,j);for(var n=arguments.length,a=Array(n),r=0;r=t.length?{value:void 0,done:!0}:(e=a(t,n),this._i+=e.length,{value:e,done:!1})})},function(e,t,n){var l=n(137),u=n(136);e.exports=function(s){return function(e,t){var n,a,r=String(u(e)),o=l(t),i=r.length;return o<0||i<=o?s?"":void 0:(n=r.charCodeAt(o))<55296||56319=e.length?(this._t=void 0,r(1)):r(0,"keys"==t?n:"values"==t?e[n]:[n,e[n]])},"values"),o.Arguments=o.Array,a("keys"),a("values"),a("entries")},function(e,t){e.exports=function(){}},function(e,t){e.exports=function(e,t){return{value:t,done:!!e}}},function(e,t,n){e.exports={default:n(462),__esModule:!0}},function(e,t,n){n(463),n(468),n(469),n(470),e.exports=n(72).Symbol},function(e,t,n){"use strict";function a(e){var t=G[e]=D(H[W]);return t._k=e,t}function r(e,t){S(e);for(var n,a=M(t=x(t)),r=0,o=a.length;rr;)d(G,t=n[r++])||t==V||t==h||a.push(t);return a}function l(e){for(var t,n=e===J,a=A(n?q:x(e)),r=[],o=0;a.length>o;)!d(G,t=a[o++])||n&&!d(J,t)||r.push(G[t]);return r}var u=n(71),d=n(77),c=n(73),f=n(83),p=n(181),h=n(464).KEY,m=n(101),g=n(139),y=n(145),v=n(114),_=n(87),b=n(146),w=n(147),M=n(465),k=n(466),S=n(100),E=n(85),L=n(142),x=n(86),T=n(135),C=n(111),D=n(144),O=n(467),N=n(183),Y=n(141),P=n(76),j=n(112),I=N.f,R=P.f,A=O.f,H=u.Symbol,F=u.JSON,z=F&&F.stringify,W="prototype",V=_("_hidden"),B=_("toPrimitive"),U={}.propertyIsEnumerable,K=g("symbol-registry"),G=g("symbols"),q=g("op-symbols"),J=Object[W],$="function"==typeof H&&!!Y.f,Q=u.QObject,X=!Q||!Q[W]||!Q[W].findChild,Z=c&&m(function(){return 7!=D(R({},"a",{get:function(){return R(this,"a",{value:7}).a}})).a})?function(e,t,n){var a=I(J,t);a&&delete J[t],R(e,t,n),a&&e!==J&&R(J,t,a)}:R,ee=$&&"symbol"==typeof H.iterator?function(e){return"symbol"==typeof e}:function(e){return e instanceof H},te=function(e,t,n){return e===J&&te(q,t,n),S(e),t=T(t,!0),S(n),d(G,t)?(n.enumerable?(d(e,V)&&e[V][t]&&(e[V][t]=!1),n=D(n,{enumerable:C(0,!1)})):(d(e,V)||R(e,V,C(1,{})),e[V][t]=!0),Z(e,t,n)):R(e,t,n)};$||(p((H=function(e){if(this instanceof H)throw TypeError("Symbol is not a constructor!");var t=v(0ae;)_(ne[ae++]);for(var re=j(_.store),oe=0;re.length>oe;)w(re[oe++]);f(f.S+f.F*!$,"Symbol",{for:function(e){return d(K,e+="")?K[e]:K[e]=H(e)},keyFor:function(e){if(!ee(e))throw TypeError(e+" is not a symbol!");for(var t in K)if(K[t]===e)return t},useSetter:function(){X=!0},useSimple:function(){X=!1}}),f(f.S+f.F*!$,"Object",{create:function(e,t){return void 0===t?D(e):r(D(e),t)},defineProperty:te,defineProperties:r,getOwnPropertyDescriptor:i,getOwnPropertyNames:s,getOwnPropertySymbols:l});var ie=m(function(){Y.f(1)});f(f.S+f.F*ie,"Object",{getOwnPropertySymbols:function(e){return Y.f(L(e))}}),F&&f(f.S+f.F*(!$||m(function(){var e=H();return"[null]"!=z([e])||"{}"!=z({a:e})||"{}"!=z(Object(e))})),"JSON",{stringify:function(e){for(var t,n,a=[e],r=1;ri;)o.call(e,a=r[i++])&&t.push(a);return t}},function(e,t,n){var a=n(179);e.exports=Array.isArray||function(e){return"Array"==a(e)}},function(e,t,n){var a=n(86),r=n(182).f,o={}.toString,i="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];e.exports.f=function(e){return i&&"[object Window]"==o.call(e)?function(e){try{return r(e)}catch(e){return i.slice()}}(e):r(a(e))}},function(e,t){},function(e,t,n){n(147)("asyncIterator")},function(e,t,n){n(147)("observable")},function(e,t,n){e.exports={default:n(472),__esModule:!0}},function(e,t,n){n(473),e.exports=n(72).Object.setPrototypeOf},function(e,t,n){var a=n(83);a(a.S,"Object",{setPrototypeOf:n(474).set})},function(e,t,r){function o(e,t){if(a(e),!n(t)&&null!==t)throw TypeError(t+": can't set as prototype!")}var n=r(85),a=r(100);e.exports={set:Object.setPrototypeOf||("__proto__"in{}?function(e,n,a){try{(a=r(174)(Function.call,r(183).f(Object.prototype,"__proto__").set,2))(e,[]),n=!(e instanceof Array)}catch(e){n=!0}return function(e,t){return o(e,t),n?e.__proto__=t:a(e,t),e}}({},!1):void 0),check:o}},function(e,t,n){e.exports={default:n(476),__esModule:!0}},function(e,t,n){n(477);var a=n(72).Object;e.exports=function(e,t){return a.create(e,t)}},function(e,t,n){var a=n(83);a(a.S,"Object",{create:n(144)})},function(e,t,n){"use strict";function l(e,t,n,a){e.removeEventListener&&e.removeEventListener(t,n,a||!1)}function a(e,t,n,a){return e.addEventListener&&e.addEventListener(t,n,a||!1),{off:function(){return l(e,t,n,a)}}}t.__esModule=!0,t.on=a,t.once=function(r,o,i,s){return a(r,o,function e(){for(var t=arguments.length,n=Array(t),a=0;aa.height)&&(i[1]=-t.top-("t"===o?t.height:0))),i},this._getParentScrollOffset=function(e){var t=0,n=0;return e&&e.offsetParent&&e.offsetParent!==document.body&&(isNaN(e.offsetParent.scrollTop)||(t+=e.offsetParent.scrollTop),isNaN(e.offsetParent.scrollLeft)||(n+=e.offsetParent.scrollLeft)),{top:t,left:n}}},r);function m(e){(0,i.default)(this,m),o.call(this),this.pinElement=e.pinElement,this.baseElement=e.baseElement,this.pinFollowBaseElementWhenFixed=e.pinFollowBaseElementWhenFixed,this.container=p(e),this.autoFit=e.autoFit||!1,this.align=e.align||"tl tl",this.offset=e.offset||[0,0],this.needAdjust=e.needAdjust||!1,this.isRtl=e.isRtl||!1}t.default=h,e.exports=t.default},function(e,t,n){"use strict";t.__esModule=!0;var a,r,p=f(n(18)),h=f(n(4)),o=f(n(3)),i=f(n(5)),s=f(n(6)),c=n(0),m=f(c),g=n(24),l=n(28),u=f(n(2)),d=n(11),y=f(n(331));function f(e){return e&&e.__esModule?e:{default:e}}var v,_=d.func.noop,b=d.func.makeChain,w=d.func.bindCtx,M=(v=c.Component,(0,s.default)(k,v),k.getDerivedStateFromProps=function(e,t){return"visible"in e?(0,h.default)({},t,{visible:e.visible}):null},k.prototype.componentWillUnmount=function(){var t=this;["_timer","_hideTimer","_showTimer"].forEach(function(e){t[e]&&clearTimeout(t[e])})},k.prototype.handleVisibleChange=function(e,t,n){"visible"in this.props||this.setState({visible:e}),this.props.onVisibleChange(e,t,n)},k.prototype.handleTriggerClick=function(e){this.state.visible&&!this.props.canCloseByTrigger||this.handleVisibleChange(!this.state.visible,"fromTrigger",e)},k.prototype.handleTriggerKeyDown=function(e){var t=this.props.triggerClickKeycode;(Array.isArray(t)?t:[t]).includes(e.keyCode)&&(e.preventDefault(),this.handleTriggerClick(e))},k.prototype.handleTriggerMouseEnter=function(e){var t=this;this._mouseNotFirstOnMask=!1,this._hideTimer&&(clearTimeout(this._hideTimer),this._hideTimer=null),this._showTimer&&(clearTimeout(this._showTimer),this._showTimer=null),this.state.visible||(this._showTimer=setTimeout(function(){t.handleVisibleChange(!0,"fromTrigger",e)},this.props.delay))},k.prototype.handleTriggerMouseLeave=function(e,t){var n=this;this._showTimer&&(clearTimeout(this._showTimer),this._showTimer=null),this.state.visible&&(this._hideTimer=setTimeout(function(){n.handleVisibleChange(!1,t||"fromTrigger",e)},this.props.delay))},k.prototype.handleTriggerFocus=function(e){this.handleVisibleChange(!0,"fromTrigger",e)},k.prototype.handleTriggerBlur=function(e){this._isForwardContent||this.handleVisibleChange(!1,"fromTrigger",e),this._isForwardContent=!1},k.prototype.handleContentMouseDown=function(){this._isForwardContent=!0},k.prototype.handleContentMouseEnter=function(){clearTimeout(this._hideTimer)},k.prototype.handleContentMouseLeave=function(e){this.handleTriggerMouseLeave(e,"fromContent")},k.prototype.handleMaskMouseEnter=function(){this._mouseNotFirstOnMask||(clearTimeout(this._hideTimer),this._hideTimer=null,this._mouseNotFirstOnMask=!1)},k.prototype.handleMaskMouseLeave=function(){this._mouseNotFirstOnMask=!0},k.prototype.handleRequestClose=function(e,t){this.handleVisibleChange(!1,e,t)},k.prototype.renderTrigger=function(){var e,t,n,a,r,o,i,s,l,u=this,d=this.props,c=d.trigger,f=d.disabled,p={key:"trigger","aria-haspopup":!0,"aria-expanded":this.state.visible};return this.state.visible||(p["aria-describedby"]=void 0),f||(e=this.props.triggerType,t=Array.isArray(e)?e:[e],n=c&&c.props||{},a=n.onClick,r=n.onKeyDown,o=n.onMouseEnter,i=n.onMouseLeave,s=n.onFocus,l=n.onBlur,t.forEach(function(e){switch(e){case"click":p.onClick=b(u.handleTriggerClick,a),p.onKeyDown=b(u.handleTriggerKeyDown,r);break;case"hover":p.onMouseEnter=b(u.handleTriggerMouseEnter,o),p.onMouseLeave=b(u.handleTriggerMouseLeave,i);break;case"focus":p.onFocus=b(u.handleTriggerFocus,s),p.onBlur=b(u.handleTriggerBlur,l)}})),c&&m.default.cloneElement(c,p)},k.prototype.renderContent=function(){var t=this,e=this.props,n=e.children,a=e.triggerType,r=Array.isArray(a)?a:[a],o=c.Children.only(n),i=o.props,s=i.onMouseDown,l=i.onMouseEnter,u=i.onMouseLeave,d={key:"portal"};return r.forEach(function(e){switch(e){case"focus":d.onMouseDown=b(t.handleContentMouseDown,s);break;case"hover":d.onMouseEnter=b(t.handleContentMouseEnter,l),d.onMouseLeave=b(t.handleContentMouseLeave,u)}}),m.default.cloneElement(o,d)},k.prototype.renderPortal=function(){function e(){return(0,g.findDOMNode)(t)}var t=this,n=this.props,a=n.target,r=n.safeNode,o=n.followTrigger,i=n.triggerType,s=n.hasMask,l=n.wrapperStyle,u=(0,p.default)(n,["target","safeNode","followTrigger","triggerType","hasMask","wrapperStyle"]),d=this.props.container,c=Array.isArray(r)?[].concat(r):[r];c.unshift(e);var f=l||{};return o&&(d=function(e){return e&&e.parentNode||e},f.position="relative"),"hover"===i&&s&&(u.onMaskMouseEnter=this.handleMaskMouseEnter,u.onMaskMouseLeave=this.handleMaskMouseLeave),m.default.createElement(y.default,(0,h.default)({},u,{key:"overlay",ref:function(e){return t.overlay=e},visible:this.state.visible,target:a||e,container:d,safeNode:c,wrapperStyle:f,triggerType:i,hasMask:s,onRequestClose:this.handleRequestClose}),this.renderContent())},k.prototype.render=function(){return[this.renderTrigger(),this.renderPortal()]},r=a=k,a.propTypes={children:u.default.node,trigger:u.default.element,triggerType:u.default.oneOfType([u.default.string,u.default.array]),triggerClickKeycode:u.default.oneOfType([u.default.number,u.default.array]),visible:u.default.bool,defaultVisible:u.default.bool,onVisibleChange:u.default.func,disabled:u.default.bool,autoFit:u.default.bool,delay:u.default.number,canCloseByTrigger:u.default.bool,target:u.default.any,safeNode:u.default.any,followTrigger:u.default.bool,container:u.default.any,hasMask:u.default.bool,wrapperStyle:u.default.object,rtl:u.default.bool},a.defaultProps={triggerType:"hover",triggerClickKeycode:[d.KEYCODE.SPACE,d.KEYCODE.ENTER],defaultVisible:!1,onVisibleChange:_,disabled:!1,autoFit:!1,delay:200,canCloseByTrigger:!0,followTrigger:!1,container:function(){return document.body},rtl:!1},r);function k(e){(0,o.default)(this,k);var t=(0,i.default)(this,v.call(this,e));return t.state={visible:void 0===e.visible?e.defaultVisible:e.visible},w(t,["handleTriggerClick","handleTriggerKeyDown","handleTriggerMouseEnter","handleTriggerMouseLeave","handleTriggerFocus","handleTriggerBlur","handleContentMouseEnter","handleContentMouseLeave","handleContentMouseDown","handleRequestClose","handleMaskMouseEnter","handleMaskMouseLeave"]),t}M.displayName="Popup",t.default=(0,l.polyfill)(M),e.exports=t.default},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){},function(e,t,n){"use strict";n(512)},function(e,t,n){},function(e,t,n){},function(e,t,n){"use strict";t.__esModule=!0,t.default=void 0;var a,r,h=d(n(4)),o=d(n(3)),i=d(n(5)),s=d(n(6)),m=d(n(0)),l=d(n(2)),g=d(n(12)),y=n(11),u=d(n(26)),v=d(n(339));function d(e){return e&&e.__esModule?e:{default:e}}function _(e,r){var o=r.size,i=r.device,s=r.labelAlign,l=r.labelTextAlign,u=r.labelCol,d=r.wrapperCol,c=r.responsive;return m.default.Children.map(e,function(e){if(y.obj.isReactFragment(e))return _(e.props.children,r);if(e&&"function"==typeof e.type&&"form_item"===e.type._typeMark){var t={labelCol:e.props.labelCol?e.props.labelCol:u,wrapperCol:e.props.wrapperCol?e.props.wrapperCol:d,labelAlign:e.props.labelAlign?e.props.labelAlign:"phone"===i?"top":s,labelTextAlign:e.props.labelTextAlign?e.props.labelTextAlign:l,size:e.props.size?e.props.size:o,responsive:c};return m.default.cloneElement(e,(n=t,a={},Object.keys(n).forEach(function(e){void 0!==n[e]&&(a[e]=n[e])}),a))}var n,a;return e})}var c,f=(c=m.default.Component,(0,s.default)(b,c),b.prototype.getChildContext=function(){return{_formField:this.props.field?this.props.field:this._formField,_formSize:this.props.size,_formPreview:this.props.isPreview,_formFullWidth:this.props.fullWidth,_formLabelForErrorMessage:this.props.useLabelForErrorMessage}},b.prototype.componentDidUpdate=function(e){var t=this.props;this._formField&&("value"in t&&t.value!==e.value&&this._formField.setValues(t.value),"error"in t&&t.error!==e.error&&this._formField.setValues(t.error))},b.prototype.render=function(){var e,t=this.props,n=t.className,a=t.inline,r=t.size,o=(t.device,t.labelAlign,t.labelTextAlign,t.onSubmit),i=t.children,s=(t.labelCol,t.wrapperCol,t.style),l=t.prefix,u=t.rtl,d=t.component,c=t.responsive,f=(0,g.default)(((e={})[l+"form"]=!0,e[l+"inline"]=a,e[""+l+r]=r,e[l+"form-responsive-grid"]=c,e[n]=!!n,e)),p=_(i,this.props);return m.default.createElement(d,(0,h.default)({role:"grid"},y.obj.pickOthers(b.propTypes,this.props),{className:f,style:s,dir:u?"rtl":void 0,onSubmit:o}),c?m.default.createElement(v.default,null,p):p)},r=a=b,a.propTypes={prefix:l.default.string,inline:l.default.bool,size:l.default.oneOf(["large","medium","small"]),fullWidth:l.default.bool,labelAlign:l.default.oneOf(["top","left","inset"]),labelTextAlign:l.default.oneOf(["left","right"]),field:l.default.any,saveField:l.default.func,labelCol:l.default.object,wrapperCol:l.default.object,onSubmit:l.default.func,children:l.default.any,className:l.default.string,style:l.default.object,value:l.default.object,onChange:l.default.func,component:l.default.oneOfType([l.default.string,l.default.func]),fieldOptions:l.default.object,rtl:l.default.bool,device:l.default.oneOf(["phone","tablet","desktop"]),responsive:l.default.bool,isPreview:l.default.bool,useLabelForErrorMessage:l.default.bool},a.defaultProps={prefix:"next-",onSubmit:function(e){e.preventDefault()},size:"medium",labelAlign:"left",onChange:y.func.noop,component:"form",saveField:y.func.noop,device:"desktop"},a.childContextTypes={_formField:l.default.object,_formSize:l.default.string,_formPreview:l.default.bool,_formFullWidth:l.default.bool,_formLabelForErrorMessage:l.default.bool},r);function b(e){(0,o.default)(this,b);var t,n,a=(0,i.default)(this,c.call(this,e));return a.onChange=function(e,t){a.props.onChange(a._formField.getValues(),{name:e,value:t,field:a._formField})},a._formField=null,!1!==e.field&&(t=(0,h.default)({},e.fieldOptions,{onChange:a.onChange}),e.field?(a._formField=e.field,n=a._formField.options.onChange,t.onChange=y.func.makeChain(n,a.onChange),a._formField.setOptions&&a._formField.setOptions(t)):("value"in e&&(t.values=e.value),a._formField=new u.default(a,t)),e.saveField(a._formField)),a}f.displayName="Form",t.default=f,e.exports=t.default},function(e,t,n){"use strict";var a=n(78);Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var _=a(n(150)),r=a(n(151)),s=a(n(334)),N=a(n(152)),Y=a(n(335)),i=a(n(517)),o=a(n(336)),l=a(n(337)),b=a(n(523)),P=n(532),u={state:"",valueName:"value",trigger:"onChange"},d=function(){function a(e){var t=this,n=1e.length)&&(t=e.length);for(var n=0,a=new Array(t);n=a.length)return n;var o=a[r],i=e(t&&t[o],n,a,r+1);if(!t){var s=isNaN(o)?{}:[];return s[o]=i,s}if(Array.isArray(t)){var l=[].concat(t);return l[o]=i,l}return(0,d.default)({},t,(0,u.default)({},o,i))};var n=function(){};void 0!==e&&e.env,r.warning=n}).call(this,o(338))},function(e,t,n){"use strict";t.__esModule=!0,t.cloneAndAddKey=function(e){if(e&&(0,r.isValidElement)(e)){var t=e.key||"error";return(0,r.cloneElement)(e,{key:t})}return e},t.scrollToFirstError=function(e){var t=e.errorsGroup,n=e.options,a=e.instance;if(t&&n.scrollToFirstError){var r,o=void 0,i=void 0;for(var s in t)if(t.hasOwnProperty(s)){var l=d.default.findDOMNode(a[s]);if(!l)return;var u=l.offsetTop;(void 0===i||u), use instead of.'),O.default.cloneElement(e,{className:a,size:h||P(s)})}return(0,D.isValidElement)(e)?e:O.default.createElement("span",{className:r+"btn-helper"},e)}),L=p,x=(0,T.default)({},Y.obj.pickOthers(Object.keys(j.propTypes),b),{type:l,disabled:g,onClick:y,className:(0,N.default)(M)});return"button"!==L&&(delete x.type,x.disabled&&(delete x.onClick,x.href&&delete x.href)),O.default.createElement(L,(0,T.default)({},x,{dir:_?"rtl":void 0,onMouseUp:this.onMouseUp,ref:this.buttonRefHandler}),k,E)},r=a=j,a.propTypes=(0,T.default)({},u.default.propTypes,{prefix:l.default.string,rtl:l.default.bool,type:l.default.oneOf(["primary","secondary","normal"]),size:l.default.oneOf(["small","medium","large"]),icons:l.default.shape({loading:l.default.node}),iconSize:l.default.oneOfType([l.default.oneOf(["xxs","xs","small","medium","large","xl","xxl","xxxl","inherit"]),l.default.number]),htmlType:l.default.oneOf(["submit","reset","button"]),component:l.default.oneOf(["button","a","div","span"]),loading:l.default.bool,ghost:l.default.oneOf([!0,!1,"light","dark"]),text:l.default.bool,warning:l.default.bool,disabled:l.default.bool,onClick:l.default.func,className:l.default.string,onMouseUp:l.default.func,children:l.default.node}),a.defaultProps={prefix:"next-",type:"normal",size:"medium",icons:{},htmlType:"button",component:"button",loading:!1,ghost:!1,text:!1,warning:!1,disabled:!1,onClick:function(){}},r);function j(){var e,t;(0,o.default)(this,j);for(var n=arguments.length,a=Array(n),r=0;r com.pig4cloud pig-upms - 2.8.1 + 2.9.0 pig-upms-api @@ -37,7 +35,7 @@ com.pig4cloud pig-common-core - 2.8.1 + 2.9.0 diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/DeptTree.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/DeptTree.java index 3aa9b558..267422ad 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/DeptTree.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/DeptTree.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.dto; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/MenuTree.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/MenuTree.java index 3bf2b1b1..335e3050 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/MenuTree.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/MenuTree.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.dto; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/RoleDTO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/RoleDTO.java index 7bf64e57..23960bff 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/RoleDTO.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/RoleDTO.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.dto; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/TreeNode.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/TreeNode.java index ea4de5fb..1ea4fdeb 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/TreeNode.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/TreeNode.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + /* * * 此类来自 https://gitee.com/geek_qi/cloud-platform/blob/master/ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/TreeNode.java diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java index 1718e7f3..40989b0f 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserDTO.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.dto; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java index b393e4ae..1c76397f 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/UserInfo.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.dto; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java index 47077476..b8692e07 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDept.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java index 5561ed70..4f9c0dcd 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDeptRelation.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java index 7ff72ee0..5539defe 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDict.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java index fe82f701..07cf17d3 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysDictItem.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java index 1152ed68..cbd9cce2 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysLog.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java index 4760dafb..813bafbd 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysMenu.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java index 79962cde..35ca927b 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysOauthClientDetails.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java index 9e50cc34..65df2fea 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRole.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java index 4e48be88..9c0d29f2 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysRoleMenu.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java index 2a469be0..26a7993e 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUser.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java index 0918c43c..9b3b8682 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/entity/SysUserRole.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.entity; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java index 13b761f2..70c8175f 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java index c81bf628..01229a75 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java index 7294bea8..30d5926e 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteLogServiceFallbackFactory.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteLogServiceFallbackFactory.java index 53153b9e..897e2e2d 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteLogServiceFallbackFactory.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteLogServiceFallbackFactory.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.factory; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteTokenServiceFallbackFactory.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteTokenServiceFallbackFactory.java index c1d0dcf2..18ebea59 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteTokenServiceFallbackFactory.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteTokenServiceFallbackFactory.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.factory; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteUserServiceFallbackFactory.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteUserServiceFallbackFactory.java index f2e2a428..4acaf8dd 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteUserServiceFallbackFactory.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/factory/RemoteUserServiceFallbackFactory.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.factory; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteLogServiceFallbackImpl.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteLogServiceFallbackImpl.java index 5ae3c847..aba15613 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteLogServiceFallbackImpl.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteLogServiceFallbackImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.fallback; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java index 8c2faac1..d344216e 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.fallback; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteUserServiceFallbackImpl.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteUserServiceFallbackImpl.java index fbab03a7..db12847b 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteUserServiceFallbackImpl.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/fallback/RemoteUserServiceFallbackImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.feign.fallback; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/ImageCode.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/ImageCode.java index 451fae58..1256a5f6 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/ImageCode.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/ImageCode.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.vo; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/LogVO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/LogVO.java index 8b68f267..a62cf6c5 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/LogVO.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/LogVO.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.vo; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/MenuVO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/MenuVO.java index 1500f1f0..baae170f 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/MenuVO.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/MenuVO.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.vo; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVo.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVo.java index 691de4bf..783093db 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVo.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/RoleVo.java @@ -1,18 +1,17 @@ /* - * Copyright (c) 2018-2025, lengleng All rights reserved. + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: + * 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 * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) + * 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.pig4cloud.pig.admin.api.vo; diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TreeUtil.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TreeUtil.java index 90fa8b20..5a7ca81e 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TreeUtil.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TreeUtil.java @@ -1,3 +1,19 @@ +/* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. + * + * 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. + */ + /* * * 此类来自 https://gitee.com/geek_qi/cloud-platform/blob/master/ace-common/src/main/java/com/github/wxiaoqi/security/common/util/TreeUtil.java diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java index 9bb9cbed..b030955f 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/UserVO.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.api.vo; diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index d7b7f827..e6bd0c35 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-upms - 2.8.1 + 2.9.0 pig-upms-biz @@ -36,31 +34,31 @@ com.pig4cloud pig-upms-api - 2.8.1 + 2.9.0 com.pig4cloud pig-common-security - 2.8.1 + 2.9.0 com.pig4cloud pig-common-log - 2.8.1 + 2.9.0 com.pig4cloud pig-common-swagger - 2.8.1 + 2.9.0 com.pig4cloud pig-common-mybatis - 2.8.1 + 2.9.0 @@ -76,7 +74,7 @@ com.pig4cloud pig-common-sentinel - 2.8.1 + 2.9.0 diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/PigAdminApplication.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/PigAdminApplication.java index e3b832d7..4d89b2b8 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/PigAdminApplication.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/PigAdminApplication.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java index b71e0f1c..e56bc548 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java index aabab88e..c392ecfb 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java index b1afec1b..bffc21af 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java index b2b026ea..51a95cb0 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java index 155d8909..c554f62c 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java index de7cf55b..1abb38b4 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java index 0e30a0a8..6d0716ba 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java index 93a6cec2..3f6113aa 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.controller; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java index d5f42acd..fe8c985a 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java index c6768b52..4ac9e2f4 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDeptRelationMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java index b5740332..14b7d1db 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictItemMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java index 29659483..4993e29e 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysDictMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java index affb838f..140accba 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysLogMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java index d43fd7c9..ab738b55 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysMenuMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java index 357c600a..124097e7 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysOauthClientDetailsMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java index 12980380..2c9ec2d2 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java index ee8cad9a..b6196ab4 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysRoleMenuMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java index 3499f462..3907d114 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java index 188ba420..95b44ef5 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/mapper/SysUserRoleMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.mapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptRelationService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptRelationService.java index c469218c..f1a601a5 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptRelationService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptRelationService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java index 31a94f44..3531c865 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDeptService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java index 52ddb470..a97e572c 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictItemService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java index dcc0aeb9..98eeb5f0 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysDictService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java index 7b151a20..08eee0b0 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysLogService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java index bd4ee184..2e5fac77 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysMenuService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java index 04930c3d..6d4ba871 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysOauthClientDetailsService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java index f10c4e5a..f20bafcc 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleMenuService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java index 2d5cff8f..661160bb 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysRoleService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java index 5c0a7e69..4dff057e 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserRoleService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java index f3bb8bea..a9a482ca 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/SysUserService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java index b6a73306..cb36784c 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java index 6203c263..5b4f88de 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java index 48f686df..cae34298 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java index 3d368e0a..d10187d7 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java index 36fe15cc..afaf6234 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysLogServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java index 037be264..84e8c60b 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 3c392819..46d22a70 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java index 0b1eaf7f..d13ff9d8 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java index 5caec12d..f56c7266 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java index c53131ce..5d71d779 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserRoleServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java index e0b260c8..887c4dfa 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.admin.service.impl; diff --git a/pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml b/pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml index ab81e126..fa238198 100755 --- a/pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml index de4bf364..f0d456c8 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml index 9c21d14d..df245832 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDeptRelationMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml index 289e593c..8b054cd1 100755 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictItemMapper.xml @@ -1,21 +1,19 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictMapper.xml index f3a68c51..22229c18 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysDictMapper.xml @@ -1,21 +1,19 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysLogMapper.xml index 28ea26e8..3d45614f 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysLogMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysLogMapper.xml @@ -1,21 +1,19 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index 00044d89..13d8f61c 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml index b2a1a3ae..798a47a6 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml @@ -1,21 +1,19 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml index bb20f02b..9b9d3931 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysRoleMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 9526c4d5..f590cde0 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserRoleMapper.xml b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserRoleMapper.xml index 1e2242ac..de2a62a7 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserRoleMapper.xml +++ b/pig-upms/pig-upms-biz/src/main/resources/mapper/SysUserRoleMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index 76a3424d..b34b151e 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig - 2.8.1 + 2.9.0 pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index 3283bb12..48651210 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-visual - 2.8.1 + 2.9.0 pig-codegen @@ -37,7 +35,7 @@ com.pig4cloud pig-common-swagger - 2.8.1 + 2.9.0 @@ -53,36 +51,36 @@ com.pig4cloud pig-common-sentinel - 2.8.1 + 2.9.0 com.pig4cloud pig-common-datasource - 2.8.1 + 2.9.0 com.pig4cloud pig-common-mybatis - 2.8.1 + 2.9.0 com.pig4cloud pig-common-core - 2.8.1 + 2.9.0 com.pig4cloud pig-common-log - 2.8.1 + 2.9.0 com.pig4cloud pig-common-security - 2.8.1 + 2.9.0 diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java index cf79f88b..4052e835 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/PigCodeGenApplication.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java index 9abb69a1..bf301fe7 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.controller; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java index a8985819..e5ddee73 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.controller; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java index 0bd7a962..4e078593 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.controller; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java index 06dfb6df..1755b4fa 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/ColumnEntity.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.entity; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java index 59d40194..dbbc6173 100644 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenConfig.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.entity; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java index f04e02ef..18974769 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenDatasourceConf.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.entity; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFormConf.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFormConf.java index 099f9904..43edd777 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFormConf.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/GenFormConf.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.entity; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java index 6fa24a37..a682efae 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/entity/TableEntity.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.entity; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java index 8339291c..be10be26 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenDatasourceConfMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.mapper; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFormConfMapper.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFormConfMapper.java index 03f2aca2..6a9da95b 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFormConfMapper.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GenFormConfMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.mapper; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java index ec6c2163..da0c91eb 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/mapper/GeneratorMapper.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.mapper; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java index 6633a4a9..9dfa4cb3 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenDatasourceConfService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFormConfService.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFormConfService.java index 7f2fd032..0b79b535 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFormConfService.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GenFormConfService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java index 790babf1..efa03a0c 100644 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/GeneratorService.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java index 83a895d0..55a9bce8 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service.impl; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java index 386ddaae..00e80a98 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service.impl; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java index 76f37754..da3ee9b9 100755 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.codegen.service.impl; diff --git a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CodeGenUtils.java b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CodeGenUtils.java index c1030c3b..0314e0e8 100644 --- a/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CodeGenUtils.java +++ b/pig-visual/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/util/CodeGenUtils.java @@ -1,17 +1,17 @@ /* - * Copyright 2019-2020 Zheng Jie + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * 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 + * 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 + * 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. + * 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.pig4cloud.pig.codegen.util; diff --git a/pig-visual/pig-codegen/src/main/resources/generator.properties b/pig-visual/pig-codegen/src/main/resources/generator.properties index 45d0f5a3..e05993fa 100755 --- a/pig-visual/pig-codegen/src/main/resources/generator.properties +++ b/pig-visual/pig-codegen/src/main/resources/generator.properties @@ -1,19 +1,17 @@ # -# /* -# * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). -# *

-# * Licensed under the GNU Lesser General Public License 3.0 (the "License"); -# * you may not use this file except in compliance with the License. -# * You may obtain a copy of the License at -# *

-# * https://www.gnu.org/licenses/lgpl.html -# *

-# * 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. -# */ +# Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. +# +# 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. # #\u4EE3\u7801\u751F\u6210\u5668\uFF0C\u914D\u7F6E\u4FE1\u606F diff --git a/pig-visual/pig-codegen/src/main/resources/logback-spring.xml b/pig-visual/pig-codegen/src/main/resources/logback-spring.xml index ab81e126..fa238198 100755 --- a/pig-visual/pig-codegen/src/main/resources/logback-spring.xml +++ b/pig-visual/pig-codegen/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-visual/pig-codegen/src/main/resources/mapper/GenFormConfMapper.xml b/pig-visual/pig-codegen/src/main/resources/mapper/GenFormConfMapper.xml index 941f155a..422acb7c 100755 --- a/pig-visual/pig-codegen/src/main/resources/mapper/GenFormConfMapper.xml +++ b/pig-visual/pig-codegen/src/main/resources/mapper/GenFormConfMapper.xml @@ -1,21 +1,19 @@ diff --git a/pig-visual/pig-codegen/src/main/resources/mapper/GeneratorMapper.xml b/pig-visual/pig-codegen/src/main/resources/mapper/GeneratorMapper.xml index 3c86e172..f226b6fb 100755 --- a/pig-visual/pig-codegen/src/main/resources/mapper/GeneratorMapper.xml +++ b/pig-visual/pig-codegen/src/main/resources/mapper/GeneratorMapper.xml @@ -1,20 +1,18 @@ diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index bea9a277..44c8442c 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -1,20 +1,18 @@ com.pig4cloud pig-visual - 2.8.1 + 2.9.0 pig-monitor @@ -52,7 +50,7 @@ com.pig4cloud pig-common-sentinel - 2.8.1 + 2.9.0 diff --git a/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/PigMonitorApplication.java b/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/PigMonitorApplication.java index 5f8e9e81..17b09a6e 100755 --- a/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/PigMonitorApplication.java +++ b/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/PigMonitorApplication.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.monitor; diff --git a/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/config/WebSecurityConfigurer.java b/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/config/WebSecurityConfigurer.java index e390c736..363b7cf1 100755 --- a/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/config/WebSecurityConfigurer.java +++ b/pig-visual/pig-monitor/src/main/java/com/pig4cloud/pig/monitor/config/WebSecurityConfigurer.java @@ -1,19 +1,17 @@ /* + * Copyright (c) 2020 pig4cloud Authors. All Rights Reserved. * - * * Copyright (c) 2019-2020, 冷冷 (wangiegie@gmail.com). - * *

- * * Licensed under the GNU Lesser General Public License 3.0 (the "License"); - * * you may not use this file except in compliance with the License. - * * You may obtain a copy of the License at - * *

- * * https://www.gnu.org/licenses/lgpl.html - * *

- * * 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. + * 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. */ package com.pig4cloud.pig.monitor.config; diff --git a/pig-visual/pig-monitor/src/main/resources/logback-spring.xml b/pig-visual/pig-monitor/src/main/resources/logback-spring.xml index ab81e126..fa238198 100755 --- a/pig-visual/pig-monitor/src/main/resources/logback-spring.xml +++ b/pig-visual/pig-monitor/src/main/resources/logback-spring.xml @@ -1,20 +1,18 @@ diff --git a/pig-visual/pig-sentinel-dashboard/Dockerfile b/pig-visual/pig-sentinel-dashboard/Dockerfile index 482cac31..26b6f363 100644 --- a/pig-visual/pig-sentinel-dashboard/Dockerfile +++ b/pig-visual/pig-sentinel-dashboard/Dockerfile @@ -1,17 +1,18 @@ -FROM anapsix/alpine-java:8_server-jre_unlimited +FROM pig4cloud/java:8-jre MAINTAINER wangiegie@gmail.com ENV TZ=Asia/Shanghai +ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN mkdir -p /pig-sentinel +RUN mkdir -p /pig-sentinel-dashboard -WORKDIR /pig-sentinel +WORKDIR /pig-sentinel-dashboard -EXPOSE 5003 +EXPOSE 5020 ADD ./target/pig-sentinel-dashboard.jar ./ -CMD sleep 30;java -Djava.security.egd=file:/dev/./urandom -jar pig-sentinel-dashboard.jar +CMD sleep 120;java $JAVA_OPTS -jar pig-sentinel-dashboard.jar diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml index 573354e9..c4eae43a 100755 --- a/pig-visual/pig-sentinel-dashboard/pom.xml +++ b/pig-visual/pig-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-visual - 2.8.1 + 2.9.0 pig-sentinel-dashboard @@ -42,16 +42,6 @@ org.springframework.boot spring-boot-starter-undertow - - org.springframework.boot - spring-boot-starter-logging - - - - log4j - log4j - 1.2.14 - commons-lang @@ -82,12 +72,12 @@ - pig-sentinel-dashboard + pigx-sentinel-dashboard src/main/resources + true - src/main/webapp/ diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/PigSentinelApplication.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/PigSentinelApplication.java index 6ac930c0..046faec9 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/PigSentinelApplication.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/PigSentinelApplication.java @@ -21,9 +21,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; /** - * @author nacos - *

- * sentinel console 源码运行,方便开发 生产建议从官网下载最新版配置运行 + * Sentinel dashboard application. + * + * @author Carpenter Lee */ @SpringBootApplication public class PigSentinelApplication { diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java index 2fe43ef2..60bb6624 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java @@ -69,6 +69,7 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.concurrent.FutureCallback; import org.apache.http.entity.ContentType; import org.apache.http.impl.client.DefaultRedirectStrategy; @@ -95,6 +96,11 @@ public class SentinelApiClient { private static final Charset DEFAULT_CHARSET = Charset.forName(SentinelConfig.charset()); + private static final String HTTP_HEADER_CONTENT_TYPE = "Content-Type"; + + private static final String HTTP_HEADER_CONTENT_TYPE_URLENCODED = ContentType.create(URLEncodedUtils.CONTENT_TYPE) + .toString(); + private static final String RESOURCE_URL_PATH = "jsonTree"; private static final String CLUSTER_NODE_PATH = "clusterNode"; @@ -115,8 +121,6 @@ public class SentinelApiClient { private static final String MODIFY_CLUSTER_CLIENT_CONFIG_PATH = "cluster/client/modifyConfig"; - private static final String FETCH_CLUSTER_SERVER_ALL_CONFIG_PATH = "cluster/server/fetchConfig"; - private static final String FETCH_CLUSTER_SERVER_BASIC_INFO_PATH = "cluster/server/info"; private static final String MODIFY_CLUSTER_SERVER_TRANSPORT_CONFIG_PATH = "cluster/server/modifyTransportConfig"; @@ -145,6 +149,8 @@ public class SentinelApiClient { private static final SentinelVersion version160 = new SentinelVersion(1, 6, 0); + private static final SentinelVersion version171 = new SentinelVersion(1, 7, 1); + @Autowired private AppManagement appManagement; @@ -169,6 +175,27 @@ public class SentinelApiClient { && body.contains(CommandConstants.MSG_UNKNOWN_COMMAND_PREFIX); } + protected boolean isSupportPost(String app, String ip, int port) { + return StringUtil.isNotEmpty(app) + && Optional.ofNullable(appManagement.getDetailApp(app)).flatMap(e -> e.getMachine(ip, port)) + .flatMap(m -> VersionUtils.parseVersion(m.getVersion()).map(v -> v.greaterOrEqual(version160))) + .orElse(false); + } + + /** + * Check wheter target instance (identified by tuple of app-ip:port) supports the form + * of "xxxxx; xx=xx" in "Content-Type" header. + * @param app target app name + * @param ip target node's address + * @param port target node's port + */ + protected boolean isSupportEnhancedContentType(String app, String ip, int port) { + return StringUtil.isNotEmpty(app) + && Optional.ofNullable(appManagement.getDetailApp(app)).flatMap(e -> e.getMachine(ip, port)) + .flatMap(m -> VersionUtils.parseVersion(m.getVersion()).map(v -> v.greaterOrEqual(version171))) + .orElse(false); + } + private StringBuilder queryString(Map params) { StringBuilder queryStringBuilder = new StringBuilder(); for (Entry entry : params.entrySet()) { @@ -187,7 +214,16 @@ public class SentinelApiClient { return queryStringBuilder; } - private HttpUriRequest postRequest(String url, Map params) { + /** + * Build an `HttpUriRequest` in POST way. + * @param url + * @param params + * @param supportEnhancedContentType see + * {@link #isSupportEnhancedContentType(String, String, int)} + * @return + */ + protected static HttpUriRequest postRequest(String url, Map params, + boolean supportEnhancedContentType) { HttpPost httpPost = new HttpPost(url); if (params != null && params.size() > 0) { List list = new ArrayList<>(params.size()); @@ -195,6 +231,9 @@ public class SentinelApiClient { list.add(new BasicNameValuePair(entry.getKey(), entry.getValue())); } httpPost.setEntity(new UrlEncodedFormEntity(list, Consts.UTF_8)); + if (!supportEnhancedContentType) { + httpPost.setHeader(HTTP_HEADER_CONTENT_TYPE, HTTP_HEADER_CONTENT_TYPE_URLENCODED); + } } return httpPost; } @@ -212,7 +251,7 @@ public class SentinelApiClient { private String getBody(HttpResponse response) throws Exception { Charset charset = null; try { - String contentTypeStr = response.getFirstHeader("Content-type").getValue(); + String contentTypeStr = response.getFirstHeader(HTTP_HEADER_CONTENT_TYPE).getValue(); if (StringUtil.isNotEmpty(contentTypeStr)) { ContentType contentType = ContentType.parse(contentTypeStr); charset = contentType.getCharset(); @@ -269,11 +308,7 @@ public class SentinelApiClient { if (params == null) { params = Collections.emptyMap(); } - boolean supportPost = StringUtil.isNotEmpty(app) - && Optional.ofNullable(appManagement.getDetailApp(app)).flatMap(e -> e.getMachine(ip, port)) - .flatMap(m -> VersionUtils.parseVersion(m.getVersion()).map(v -> v.greaterOrEqual(version160))) - .orElse(false); - if (!useHttpPost || !supportPost) { + if (!useHttpPost || !isSupportPost(app, ip, port)) { // Using GET in older versions, append parameters after url if (!params.isEmpty()) { if (urlBuilder.indexOf("?") == -1) { @@ -288,7 +323,8 @@ public class SentinelApiClient { } else { // Using POST - return executeCommand(postRequest(urlBuilder.toString(), params)); + return executeCommand( + postRequest(urlBuilder.toString(), params, isSupportEnhancedContentType(app, ip, port))); } } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java index 0eea1aca..6a23ea93 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java @@ -22,41 +22,47 @@ import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; +import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; import com.alibaba.csp.sentinel.slots.block.RuleConstant; +import com.alibaba.csp.sentinel.slots.block.degrade.circuitbreaker.CircuitBreakerStrategy; import com.alibaba.csp.sentinel.util.StringUtil; import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.DegradeRuleEntity; import com.alibaba.csp.sentinel.dashboard.domain.Result; -import com.alibaba.csp.sentinel.dashboard.repository.rule.InMemDegradeRuleStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; /** - * @author leyou + * Controller regarding APIs of degrade rules. Refactored since 1.8.0. + * + * @author Carpenter Lee + * @author Eric Zhao */ -@Controller -@RequestMapping(value = "/degrade", produces = MediaType.APPLICATION_JSON_VALUE) +@RestController +@RequestMapping("/degrade") public class DegradeController { private final Logger logger = LoggerFactory.getLogger(DegradeController.class); @Autowired - private InMemDegradeRuleStore repository; + private RuleRepository repository; @Autowired private SentinelApiClient sentinelApiClient; - @ResponseBody - @RequestMapping("/rules.json") + @GetMapping("/rules.json") @AuthAction(PrivilegeType.READ_RULE) - public Result> queryMachineRules(String app, String ip, Integer port) { - + public Result> apiQueryMachineRules(String app, String ip, Integer port) { if (StringUtil.isEmpty(app)) { return Result.ofFail(-1, "app can't be null or empty"); } @@ -77,119 +83,66 @@ public class DegradeController { } } - @ResponseBody - @RequestMapping("/new.json") + @PostMapping("/rule") @AuthAction(PrivilegeType.WRITE_RULE) - public Result add(String app, String ip, Integer port, String limitApp, String resource, - Double count, Integer timeWindow, Integer grade) { - if (StringUtil.isBlank(app)) { - return Result.ofFail(-1, "app can't be null or empty"); + public Result apiAddRule(@RequestBody DegradeRuleEntity entity) { + Result checkResult = checkEntityInternal(entity); + if (checkResult != null) { + return checkResult; } - if (StringUtil.isBlank(ip)) { - return Result.ofFail(-1, "ip can't be null or empty"); - } - if (port == null) { - return Result.ofFail(-1, "port can't be null"); - } - if (StringUtil.isBlank(limitApp)) { - return Result.ofFail(-1, "limitApp can't be null or empty"); - } - if (StringUtil.isBlank(resource)) { - return Result.ofFail(-1, "resource can't be null or empty"); - } - if (count == null) { - return Result.ofFail(-1, "count can't be null"); - } - if (timeWindow == null) { - return Result.ofFail(-1, "timeWindow can't be null"); - } - if (grade == null) { - return Result.ofFail(-1, "grade can't be null"); - } - if (grade < RuleConstant.DEGRADE_GRADE_RT || grade > RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT) { - return Result.ofFail(-1, "Invalid grade: " + grade); - } - DegradeRuleEntity entity = new DegradeRuleEntity(); - entity.setApp(app.trim()); - entity.setIp(ip.trim()); - entity.setPort(port); - entity.setLimitApp(limitApp.trim()); - entity.setResource(resource.trim()); - entity.setCount(count); - entity.setTimeWindow(timeWindow); - entity.setGrade(grade); Date date = new Date(); entity.setGmtCreate(date); entity.setGmtModified(date); try { entity = repository.save(entity); } - catch (Throwable throwable) { - logger.error("add error:", throwable); - return Result.ofThrowable(-1, throwable); + catch (Throwable t) { + logger.error("Failed to add new degrade rule, app={}, ip={}", entity.getApp(), entity.getIp(), t); + return Result.ofThrowable(-1, t); } - if (!publishRules(app, ip, port)) { - logger.info("publish degrade rules fail after rule add"); + if (!publishRules(entity.getApp(), entity.getIp(), entity.getPort())) { + logger.warn("Publish degrade rules failed, app={}", entity.getApp()); } return Result.ofSuccess(entity); } - @ResponseBody - @RequestMapping("/save.json") + @PutMapping("/rule/{id}") @AuthAction(PrivilegeType.WRITE_RULE) - public Result updateIfNotNull(Long id, String app, String limitApp, String resource, - Double count, Integer timeWindow, Integer grade) { - if (id == null) { - return Result.ofFail(-1, "id can't be null"); + public Result apiUpdateRule(@PathVariable("id") Long id, @RequestBody DegradeRuleEntity entity) { + if (id == null || id <= 0) { + return Result.ofFail(-1, "id can't be null or negative"); } - if (grade != null) { - if (grade < RuleConstant.DEGRADE_GRADE_RT || grade > RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT) { - return Result.ofFail(-1, "Invalid grade: " + grade); - } + DegradeRuleEntity oldEntity = repository.findById(id); + if (oldEntity == null) { + return Result.ofFail(-1, "Degrade rule does not exist, id=" + id); } - DegradeRuleEntity entity = repository.findById(id); - if (entity == null) { - return Result.ofFail(-1, "id " + id + " dose not exist"); + entity.setApp(oldEntity.getApp()); + entity.setIp(oldEntity.getIp()); + entity.setPort(oldEntity.getPort()); + entity.setId(oldEntity.getId()); + Result checkResult = checkEntityInternal(entity); + if (checkResult != null) { + return checkResult; } - if (StringUtil.isNotBlank(app)) { - entity.setApp(app.trim()); - } - - if (StringUtil.isNotBlank(limitApp)) { - entity.setLimitApp(limitApp.trim()); - } - if (StringUtil.isNotBlank(resource)) { - entity.setResource(resource.trim()); - } - if (count != null) { - entity.setCount(count); - } - if (timeWindow != null) { - entity.setTimeWindow(timeWindow); - } - if (grade != null) { - entity.setGrade(grade); - } - Date date = new Date(); - entity.setGmtModified(date); + entity.setGmtCreate(oldEntity.getGmtCreate()); + entity.setGmtModified(new Date()); try { entity = repository.save(entity); } - catch (Throwable throwable) { - logger.error("save error:", throwable); - return Result.ofThrowable(-1, throwable); + catch (Throwable t) { + logger.error("Failed to save degrade rule, id={}, rule={}", id, entity, t); + return Result.ofThrowable(-1, t); } if (!publishRules(entity.getApp(), entity.getIp(), entity.getPort())) { - logger.info("publish degrade rules fail after rule update"); + logger.warn("Publish degrade rules failed, app={}", entity.getApp()); } return Result.ofSuccess(entity); } - @ResponseBody - @RequestMapping("/delete.json") + @DeleteMapping("/rule/{id}") @AuthAction(PrivilegeType.DELETE_RULE) - public Result delete(Long id) { + public Result delete(@PathVariable("id") Long id) { if (id == null) { return Result.ofFail(-1, "id can't be null"); } @@ -203,11 +156,11 @@ public class DegradeController { repository.delete(id); } catch (Throwable throwable) { - logger.error("delete error:", throwable); + logger.error("Failed to delete degrade rule, id={}", id, throwable); return Result.ofThrowable(-1, throwable); } if (!publishRules(oldEntity.getApp(), oldEntity.getIp(), oldEntity.getPort())) { - logger.info("publish degrade rules fail after rule delete"); + logger.warn("Publish degrade rules failed, app={}", oldEntity.getApp()); } return Result.ofSuccess(id); } @@ -217,4 +170,59 @@ public class DegradeController { return sentinelApiClient.setDegradeRuleOfMachine(app, ip, port, rules); } + private Result checkEntityInternal(DegradeRuleEntity entity) { + if (StringUtil.isBlank(entity.getApp())) { + return Result.ofFail(-1, "app can't be blank"); + } + if (StringUtil.isBlank(entity.getIp())) { + return Result.ofFail(-1, "ip can't be null or empty"); + } + if (entity.getPort() == null || entity.getPort() <= 0) { + return Result.ofFail(-1, "invalid port: " + entity.getPort()); + } + if (StringUtil.isBlank(entity.getLimitApp())) { + return Result.ofFail(-1, "limitApp can't be null or empty"); + } + if (StringUtil.isBlank(entity.getResource())) { + return Result.ofFail(-1, "resource can't be null or empty"); + } + Double threshold = entity.getCount(); + if (threshold == null || threshold < 0) { + return Result.ofFail(-1, "invalid threshold: " + threshold); + } + Integer recoveryTimeoutSec = entity.getTimeWindow(); + if (recoveryTimeoutSec == null || recoveryTimeoutSec <= 0) { + return Result.ofFail(-1, "recoveryTimeout should be positive"); + } + Integer strategy = entity.getGrade(); + if (strategy == null) { + return Result.ofFail(-1, "circuit breaker strategy cannot be null"); + } + if (strategy < CircuitBreakerStrategy.SLOW_REQUEST_RATIO.getType() + || strategy > RuleConstant.DEGRADE_GRADE_EXCEPTION_COUNT) { + return Result.ofFail(-1, "Invalid circuit breaker strategy: " + strategy); + } + if (entity.getMinRequestAmount() == null || entity.getMinRequestAmount() <= 0) { + return Result.ofFail(-1, "Invalid minRequestAmount"); + } + if (entity.getStatIntervalMs() == null || entity.getStatIntervalMs() <= 0) { + return Result.ofFail(-1, "Invalid statInterval"); + } + if (strategy == RuleConstant.DEGRADE_GRADE_RT) { + Double slowRatio = entity.getSlowRatioThreshold(); + if (slowRatio == null) { + return Result.ofFail(-1, "SlowRatioThreshold is required for slow request ratio strategy"); + } + else if (slowRatio < 0 || slowRatio > 1) { + return Result.ofFail(-1, "SlowRatioThreshold should be in range: [0.0, 1.0]"); + } + } + else if (strategy == RuleConstant.DEGRADE_GRADE_EXCEPTION_RATIO) { + if (threshold > 1) { + return Result.ofFail(-1, "Ratio threshold should be in range: [0.0, 1.0]"); + } + } + return null; + } + } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java index c876d5a1..ae61723e 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java @@ -112,7 +112,7 @@ public class DemoController { try { e1 = SphU.entry(name); - if (slow == true) { + if (slow) { TimeUnit.MILLISECONDS.sleep(3000); } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java old mode 100755 new mode 100644 index f81d64cd..e960bd34 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java @@ -15,30 +15,40 @@ */ package com.alibaba.csp.sentinel.dashboard.controller; -import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; -import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; -import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; -import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; -import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; -import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; -import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; -import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; -import com.alibaba.csp.sentinel.dashboard.domain.Result; -import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; -import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; -import com.alibaba.csp.sentinel.slots.block.RuleConstant; -import com.alibaba.csp.sentinel.util.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - import java.util.Date; import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; +import com.alibaba.csp.sentinel.dashboard.auth.AuthAction; +import com.alibaba.csp.sentinel.dashboard.client.CommandNotFoundException; +import com.alibaba.csp.sentinel.dashboard.client.SentinelApiClient; +import com.alibaba.csp.sentinel.dashboard.discovery.AppManagement; +import com.alibaba.csp.sentinel.dashboard.discovery.MachineInfo; +import com.alibaba.csp.sentinel.dashboard.auth.AuthService; +import com.alibaba.csp.sentinel.dashboard.auth.AuthService.PrivilegeType; +import com.alibaba.csp.sentinel.slots.block.RuleConstant; +import com.alibaba.csp.sentinel.util.StringUtil; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.SentinelVersion; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.rule.ParamFlowRuleEntity; +import com.alibaba.csp.sentinel.dashboard.domain.Result; +import com.alibaba.csp.sentinel.dashboard.repository.rule.RuleRepository; +import com.alibaba.csp.sentinel.dashboard.util.VersionUtils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + /** * @author Eric Zhao * @since 0.2.1 @@ -110,7 +120,7 @@ public class ParamFlowRuleController { } @PostMapping("/rule") - @AuthAction(PrivilegeType.WRITE_RULE) + @AuthAction(AuthService.PrivilegeType.WRITE_RULE) public Result apiAddParamFlowRule(@RequestBody ParamFlowRuleEntity entity) { Result checkResult = checkEntityInternal(entity); if (checkResult != null) { @@ -182,7 +192,7 @@ public class ParamFlowRuleController { } @PutMapping("/rule/{id}") - @AuthAction(PrivilegeType.WRITE_RULE) + @AuthAction(AuthService.PrivilegeType.WRITE_RULE) public Result apiUpdateParamFlowRule(@PathVariable("id") Long id, @RequestBody ParamFlowRuleEntity entity) { if (id == null || id <= 0) { diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java old mode 100755 new mode 100644 index 697dcd1b..0638982c --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java @@ -147,19 +147,19 @@ public class GatewayFlowRuleController { return Result.ofFail(-1, "fieldName can't be null or empty"); } itemEntity.setFieldName(paramItem.getFieldName()); + } - String pattern = paramItem.getPattern(); - // 如果匹配串不为空,验证匹配模式 - if (StringUtil.isNotEmpty(pattern)) { - itemEntity.setPattern(pattern); - - Integer matchStrategy = paramItem.getMatchStrategy(); - if (!Arrays.asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, - PARAM_MATCH_STRATEGY_REGEX).contains(matchStrategy)) { - return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy); - } - itemEntity.setMatchStrategy(matchStrategy); + String pattern = paramItem.getPattern(); + // 如果匹配串不为空,验证匹配模式 + if (StringUtil.isNotEmpty(pattern)) { + itemEntity.setPattern(pattern); + Integer matchStrategy = paramItem.getMatchStrategy(); + if (!Arrays + .asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, PARAM_MATCH_STRATEGY_REGEX) + .contains(matchStrategy)) { + return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy); } + itemEntity.setMatchStrategy(matchStrategy); } } @@ -298,19 +298,19 @@ public class GatewayFlowRuleController { return Result.ofFail(-1, "fieldName can't be null or empty"); } itemEntity.setFieldName(paramItem.getFieldName()); + } - String pattern = paramItem.getPattern(); - // 如果匹配串不为空,验证匹配模式 - if (StringUtil.isNotEmpty(pattern)) { - itemEntity.setPattern(pattern); - - Integer matchStrategy = paramItem.getMatchStrategy(); - if (!Arrays.asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, - PARAM_MATCH_STRATEGY_REGEX).contains(matchStrategy)) { - return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy); - } - itemEntity.setMatchStrategy(matchStrategy); + String pattern = paramItem.getPattern(); + // 如果匹配串不为空,验证匹配模式 + if (StringUtil.isNotEmpty(pattern)) { + itemEntity.setPattern(pattern); + Integer matchStrategy = paramItem.getMatchStrategy(); + if (!Arrays + .asList(PARAM_MATCH_STRATEGY_EXACT, PARAM_MATCH_STRATEGY_CONTAINS, PARAM_MATCH_STRATEGY_REGEX) + .contains(matchStrategy)) { + return Result.ofFail(-1, "invalid matchStrategy: " + matchStrategy); } + itemEntity.setMatchStrategy(matchStrategy); } } else { diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java index 6df62602..e243132c 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java @@ -137,7 +137,7 @@ public class FlowControllerV2 { } @PostMapping("/rule") - @AuthAction(value = PrivilegeType.WRITE_RULE) + @AuthAction(value = AuthService.PrivilegeType.WRITE_RULE) public Result apiAddFlowRule(@RequestBody FlowRuleEntity entity) { Result checkResult = checkEntityInternal(entity); @@ -162,7 +162,7 @@ public class FlowControllerV2 { } @PutMapping("/rule/{id}") - @AuthAction(PrivilegeType.WRITE_RULE) + @AuthAction(AuthService.PrivilegeType.WRITE_RULE) public Result apiUpdateFlowRule(@PathVariable("id") Long id, @RequestBody FlowRuleEntity entity) { if (id == null || id <= 0) { diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java index 4e89b454..0f90f945 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java @@ -71,7 +71,6 @@ public class MetricEntity { entity.setExceptionQps(oldEntity.getExceptionQps()); entity.setRt(oldEntity.getRt()); entity.setCount(oldEntity.getCount()); - entity.setResource(oldEntity.getResource()); return entity; } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java index 1aa2fc29..1be3746d 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java @@ -40,11 +40,14 @@ public class DegradeRuleEntity implements RuleEntity { private Integer timeWindow; - /** - * 0 rt 限流; 1为异常; - */ private Integer grade; + private Integer minRequestAmount; + + private Double slowRatioThreshold; + + private Integer statIntervalMs; + private Date gmtCreate; private Date gmtModified; @@ -59,6 +62,9 @@ public class DegradeRuleEntity implements RuleEntity { entity.setCount(rule.getCount()); entity.setTimeWindow(rule.getTimeWindow()); entity.setGrade(rule.getGrade()); + entity.setMinRequestAmount(rule.getMinRequestAmount()); + entity.setSlowRatioThreshold(rule.getSlowRatioThreshold()); + entity.setStatIntervalMs(rule.getStatIntervalMs()); return entity; } @@ -139,6 +145,33 @@ public class DegradeRuleEntity implements RuleEntity { this.grade = grade; } + public Integer getMinRequestAmount() { + return minRequestAmount; + } + + public DegradeRuleEntity setMinRequestAmount(Integer minRequestAmount) { + this.minRequestAmount = minRequestAmount; + return this; + } + + public Double getSlowRatioThreshold() { + return slowRatioThreshold; + } + + public DegradeRuleEntity setSlowRatioThreshold(Double slowRatioThreshold) { + this.slowRatioThreshold = slowRatioThreshold; + return this; + } + + public Integer getStatIntervalMs() { + return statIntervalMs; + } + + public DegradeRuleEntity setStatIntervalMs(Integer statIntervalMs) { + this.statIntervalMs = statIntervalMs; + return this; + } + @Override public Date getGmtCreate() { return gmtCreate; @@ -164,6 +197,16 @@ public class DegradeRuleEntity implements RuleEntity { rule.setCount(count); rule.setTimeWindow(timeWindow); rule.setGrade(grade); + if (minRequestAmount != null) { + rule.setMinRequestAmount(minRequestAmount); + } + if (slowRatioThreshold != null) { + rule.setSlowRatioThreshold(slowRatioThreshold); + } + if (statIntervalMs != null) { + rule.setStatIntervalMs(statIntervalMs); + } + return rule; } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java old mode 100755 new mode 100644 index 97409b74..c6eb22fd --- a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java +++ b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java @@ -15,6 +15,11 @@ */ package com.alibaba.csp.sentinel.dashboard.repository.metric; +import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; +import com.alibaba.csp.sentinel.util.StringUtil; +import com.alibaba.csp.sentinel.util.TimeUtil; +import org.springframework.stereotype.Component; + import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -22,14 +27,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import com.alibaba.csp.sentinel.dashboard.datasource.entity.MetricEntity; -import com.alibaba.csp.sentinel.util.StringUtil; - -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; -import org.springframework.stereotype.Component; - /** * Caches metrics data in a period of time in memory. * @@ -44,56 +44,73 @@ public class InMemoryMetricsRepository implements MetricsRepository resource -> timestamp -> metric} */ - private Map>> allMetrics = new ConcurrentHashMap<>(); + private Map>> allMetrics = new ConcurrentHashMap<>(); + + private final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); @Override - public synchronized void save(MetricEntity entity) { + public void save(MetricEntity entity) { if (entity == null || StringUtil.isBlank(entity.getApp())) { return; } - allMetrics.computeIfAbsent(entity.getApp(), e -> new ConcurrentHashMap<>(16)) - .computeIfAbsent(entity.getResource(), - e -> new ConcurrentLinkedHashMap.Builder() - .maximumWeightedCapacity(MAX_METRIC_LIVE_TIME_MS).weigher((key, value) -> { - // Metric older than {@link #MAX_METRIC_LIVE_TIME_MS} - // will be removed. - int weight = (int) (System.currentTimeMillis() - key); - // weight must be a number greater than or equal to - // one - return Math.max(weight, 1); - }).build()) - .put(entity.getTimestamp().getTime(), entity); + readWriteLock.writeLock().lock(); + try { + allMetrics.computeIfAbsent(entity.getApp(), e -> new HashMap<>(16)) + .computeIfAbsent(entity.getResource(), e -> new LinkedHashMap() { + @Override + protected boolean removeEldestEntry(Entry eldest) { + // Metric older than {@link #MAX_METRIC_LIVE_TIME_MS} will be + // removed. + return eldest.getKey() < TimeUtil.currentTimeMillis() - MAX_METRIC_LIVE_TIME_MS; + } + }).put(entity.getTimestamp().getTime(), entity); + } + finally { + readWriteLock.writeLock().unlock(); + } + } @Override - public synchronized void saveAll(Iterable metrics) { + public void saveAll(Iterable metrics) { if (metrics == null) { return; } - metrics.forEach(this::save); + readWriteLock.writeLock().lock(); + try { + metrics.forEach(this::save); + } + finally { + readWriteLock.writeLock().unlock(); + } } @Override - public synchronized List queryByAppAndResourceBetween(String app, String resource, long startTime, - long endTime) { + public List queryByAppAndResourceBetween(String app, String resource, long startTime, long endTime) { List results = new ArrayList<>(); if (StringUtil.isBlank(app)) { return results; } - Map> resourceMap = allMetrics.get(app); + Map> resourceMap = allMetrics.get(app); if (resourceMap == null) { return results; } - ConcurrentLinkedHashMap metricsMap = resourceMap.get(resource); + LinkedHashMap metricsMap = resourceMap.get(resource); if (metricsMap == null) { return results; } - for (Entry entry : metricsMap.entrySet()) { - if (entry.getKey() >= startTime && entry.getKey() <= endTime) { - results.add(entry.getValue()); + readWriteLock.readLock().lock(); + try { + for (Entry entry : metricsMap.entrySet()) { + if (entry.getKey() >= startTime && entry.getKey() <= endTime) { + results.add(entry.getValue()); + } } + return results; + } + finally { + readWriteLock.readLock().unlock(); } - return results; } @Override @@ -103,42 +120,48 @@ public class InMemoryMetricsRepository implements MetricsRepository timestamp -> metric - Map> resourceMap = allMetrics.get(app); + Map> resourceMap = allMetrics.get(app); if (resourceMap == null) { return results; } final long minTimeMs = System.currentTimeMillis() - 1000 * 60; Map resourceCount = new ConcurrentHashMap<>(32); - for (Entry> resourceMetrics : resourceMap.entrySet()) { - for (Entry metrics : resourceMetrics.getValue().entrySet()) { - if (metrics.getKey() < minTimeMs) { - continue; - } - MetricEntity newEntity = metrics.getValue(); - if (resourceCount.containsKey(resourceMetrics.getKey())) { - MetricEntity oldEntity = resourceCount.get(resourceMetrics.getKey()); - oldEntity.addPassQps(newEntity.getPassQps()); - oldEntity.addRtAndSuccessQps(newEntity.getRt(), newEntity.getSuccessQps()); - oldEntity.addBlockQps(newEntity.getBlockQps()); - oldEntity.addExceptionQps(newEntity.getExceptionQps()); - oldEntity.addCount(1); - } - else { - resourceCount.put(resourceMetrics.getKey(), MetricEntity.copyOf(newEntity)); + readWriteLock.readLock().lock(); + try { + for (Entry> resourceMetrics : resourceMap.entrySet()) { + for (Entry metrics : resourceMetrics.getValue().entrySet()) { + if (metrics.getKey() < minTimeMs) { + continue; + } + MetricEntity newEntity = metrics.getValue(); + if (resourceCount.containsKey(resourceMetrics.getKey())) { + MetricEntity oldEntity = resourceCount.get(resourceMetrics.getKey()); + oldEntity.addPassQps(newEntity.getPassQps()); + oldEntity.addRtAndSuccessQps(newEntity.getRt(), newEntity.getSuccessQps()); + oldEntity.addBlockQps(newEntity.getBlockQps()); + oldEntity.addExceptionQps(newEntity.getExceptionQps()); + oldEntity.addCount(1); + } + else { + resourceCount.put(resourceMetrics.getKey(), MetricEntity.copyOf(newEntity)); + } } } + // Order by last minute b_qps DESC. + return resourceCount.entrySet().stream().sorted((o1, o2) -> { + MetricEntity e1 = o1.getValue(); + MetricEntity e2 = o2.getValue(); + int t = e2.getBlockQps().compareTo(e1.getBlockQps()); + if (t != 0) { + return t; + } + return e2.getPassQps().compareTo(e1.getPassQps()); + }).map(Entry::getKey).collect(Collectors.toList()); + } + finally { + readWriteLock.readLock().unlock(); } - // Order by last minute b_qps DESC. - return resourceCount.entrySet().stream().sorted((o1, o2) -> { - MetricEntity e1 = o1.getValue(); - MetricEntity e2 = o2.getValue(); - int t = e2.getBlockQps().compareTo(e1.getBlockQps()); - if (t != 0) { - return t; - } - return e2.getPassQps().compareTo(e1.getPassQps()); - }).map(Entry::getKey).collect(Collectors.toList()); } } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java b/pig-visual/pig-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/resources/application.yml b/pig-visual/pig-sentinel-dashboard/src/main/resources/application.yml index 86d17709..d85b338e 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/resources/application.yml +++ b/pig-visual/pig-sentinel-dashboard/src/main/resources/application.yml @@ -1,9 +1,10 @@ server: - port: 5003 - servlet: + port: 5020 + +spring: + http: encoding: force: true - logging: level: org: @@ -23,4 +24,4 @@ auth: sentinel: dashboard: - version: 1.7.1 + version: @project.version@ \ No newline at end of file diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README.md b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README.md new file mode 100755 index 00000000..c88ea68c --- /dev/null +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README.md @@ -0,0 +1,32 @@ +# Sentinel Dashboard Frontend + +## Env Requirement + +- Node.js > 6.x + +## Code Guide + +- [Code Style Guide for HTML/CSS](https://codeguide.bootcss.com/) +- [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript/tree/es5-deprecated/es5) + +## Install Packages + +``` +npm install +``` + +## Start Development + +``` +npm start +``` + +## Build for production + +``` +npm run build +``` + +## Credit + +- [sb-admin-angular](https://github.com/start-angular/sb-admin-angular) \ No newline at end of file diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README_zh.md b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README_zh.md new file mode 100644 index 00000000..5daf33ef --- /dev/null +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/README_zh.md @@ -0,0 +1,32 @@ +# Sentinel Dashboard Frontend + +## 环境要求 + +- Node.js > 6.x + +## 编码规范 + +- HTML/CSS 遵循 [Bootstrap 编码规范](https://codeguide.bootcss.com/) +- JavaScript 遵循 [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript/tree/es5-deprecated/es5) 以及最新的 ES 6 标准 + +## 安装依赖 + +``` +npm i +``` + +## 开始本地开发 + +``` +npm start +``` + +## 构建前端资源 + +``` +npm run build +``` + +## Credit + +- [sb-admin-angular](https://github.com/start-angular/sb-admin-angular) \ No newline at end of file diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js index 8a05323e..d2eac6da 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js @@ -66,7 +66,9 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia app: $scope.app, ip: mac[0], port: mac[1], - limitApp: 'default' + limitApp: 'default', + minRequestAmount: 5, + statIntervalMs: 1000, }; $scope.degradeRuleDialog = { title: '新增降级规则', @@ -95,7 +97,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia function parseDegradeMode(grade) { switch (grade) { case 0: - return 'RT'; + return '慢调用比例'; case 1: return '异常比例'; case 2: @@ -137,7 +139,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia getMachineRules(); confirmDialog.close(); } else { - alert('失败!'); + alert('失败:' + data.msg); } }); }; @@ -148,7 +150,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia getMachineRules(); degradeRuleDialog.close(); } else { - alert('失败!'); + alert('失败:' + data.msg); } }); }; @@ -163,7 +165,7 @@ app.controller('DegradeCtl', ['$scope', '$stateParams', 'DegradeService', 'ngDia confirmDialog.close(); } } else { - alert('失败!'); + alert('失败:' + data.msg); } }); } diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js index f8116be7..2a14eb1e 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js @@ -132,6 +132,8 @@ app.controller('IdentityCtl', ['$scope', '$stateParams', 'IdentityService', strategy: 0, resource: resource, limitApp: 'default', + minRequestAmount: 5, + statIntervalMs: 1000, app: $scope.app, ip: mac[0], port: mac[1] diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js index b10c672d..4e6c8f2c 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js @@ -27,7 +27,15 @@ angular.module('sentinelDashboardApp') } }); } else { - handleLogout($scope, JSON.parse($window.localStorage.getItem("session_sentinel_admin")).id) + try { + var id = JSON.parse($window.localStorage.getItem("session_sentinel_admin")).id; + handleLogout($scope, id); + } catch (e) { + // Historical version compatibility processing, fixes issue-1449 + // If error happens while parsing, remove item in localStorage and redirect to login page. + $window.localStorage.removeItem("session_sentinel_admin"); + $state.go('login'); + } } function handleLogout($scope, id) { diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degradeservice.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js similarity index 50% rename from pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degradeservice.js rename to pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js index 146d841d..a242b22a 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degradeservice.js +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js @@ -15,21 +15,10 @@ app.service('DegradeService', ['$http', function ($http) { }; this.newRule = function (rule) { - var param = { - id: rule.id, - resource: rule.resource, - limitApp: rule.limitApp, - count: rule.count, - timeWindow: rule.timeWindow, - grade: rule.grade, - app: rule.app, - ip: rule.ip, - port: rule.port - }; return $http({ - url: '/degrade/new.json', - params: param, - method: 'GET' + url: '/degrade/rule', + data: rule, + method: 'POST' }); }; @@ -41,24 +30,22 @@ app.service('DegradeService', ['$http', function ($http) { grade: rule.grade, count: rule.count, timeWindow: rule.timeWindow, + statIntervalMs: rule.statIntervalMs, + minRequestAmount: rule.minRequestAmount, + slowRatioThreshold: rule.slowRatioThreshold, }; return $http({ - url: '/degrade/save.json', - params: param, - method: 'GET' + url: '/degrade/rule/' + rule.id, + data: param, + method: 'PUT' }); }; this.deleteRule = function (rule) { - var param = { - id: rule.id, - app: rule.app - }; - return $http({ - url: '/degrade/delete.json', - params: param, - method: 'GET' - }); + return $http({ + url: '/degrade/rule/' + rule.id, + method: 'DELETE' + }); }; this.checkRuleValid = function (rule) { @@ -74,8 +61,20 @@ app.service('DegradeService', ['$http', function ($http) { alert('降级阈值不能为空或小于 0'); return false; } - if (rule.timeWindow === undefined || rule.timeWindow === '' || rule.timeWindow <= 0) { - alert('降级时间窗口必须大于 0'); + if (rule.timeWindow == undefined || rule.timeWindow === '' || rule.timeWindow <= 0) { + alert('熔断时长必须大于 0s'); + return false; + } + if (rule.minRequestAmount == undefined || rule.minRequestAmount <= 0) { + alert('最小请求数目需大于 0'); + return false; + } + if (rule.statIntervalMs == undefined || rule.statIntervalMs <= 0) { + alert('统计窗口时长需大于 0s'); + return false; + } + if (rule.statIntervalMs !== undefined && rule.statIntervalMs > 60 * 1000 * 2) { + alert('统计窗口时长不能超过 120 分钟'); return false; } // 异常比率类型. @@ -83,6 +82,16 @@ app.service('DegradeService', ['$http', function ($http) { alert('异常比率超出范围:[0.0 - 1.0]'); return false; } + if (rule.grade == 0) { + if (rule.slowRatioThreshold == undefined) { + alert('慢调用比率不能为空'); + return false; + } + if (rule.slowRatioThreshold < 0 || rule.slowRatioThreshold > 1) { + alert('慢调用比率超出范围:[0.0 - 1.0]'); + return false; + } + } return true; }; }]); diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html index 1ed7458f..c2b67528 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html @@ -33,21 +33,15 @@ 资源名 - - - - 降级模式 + 降级策略 阈值 - 时间窗口(s) + 熔断时长(s) - - - 操作 @@ -59,9 +53,9 @@ {{rule.resource}} - RT - 异常比例 - 异常数 + 慢调用比例 + 异常比例 + 异常数 {{rule.count}} diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html index 7dddbbb8..df241ec1 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html @@ -22,30 +22,53 @@

- +
-  RT   -  异常比例   -  异常数 +  慢调用比例   +  异常比例   +  异常数
- - + + -
- - +
+ +
- -
- +
+ +
+ +
+ +
+ +
+
+ + s +
+
+ + +
+ +
+
+ +
diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html index f832ce3e..e68fb6b4 100755 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html @@ -78,7 +78,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
@@ -130,7 +130,7 @@
-
+ diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html old mode 100755 new mode 100644 diff --git a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html old mode 100755 new mode 100644 index 7dca16d7..ea744a71 --- a/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html +++ b/pig-visual/pig-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html @@ -70,7 +70,7 @@
-
+