diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 9f63349..0000000 --- a/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre - -ARG IMAGE_TAG - -RUN mkdir -p /opt/apps - -RUN mkdir -p /opt/dataease/data/feature/full - -ADD mapFiles/* /opt/dataease/data/feature/full/ - -ADD backend/target/backend-$IMAGE_TAG.jar /opt/apps - -ENV JAVA_APP_JAR=/opt/apps/backend-$IMAGE_TAG.jar - -ENV AB_OFF=true - -ENV JAVA_OPTIONS=-Dfile.encoding=utf-8 - -HEALTHCHECK --interval=15s --timeout=5s --retries=20 --start-period=30s CMD curl -f 127.0.0.1:8081 - -CMD ["/deployments/run-java.sh"] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d159169..0000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/README_orignal.md b/README_orignal.md deleted file mode 100644 index e193e14..0000000 --- a/README_orignal.md +++ /dev/null @@ -1,91 +0,0 @@ -

DataEase

-

人人可用的开源数据可视化分析工具

-

- License: GPL v2 - Codacy - Latest release - Stars - Downloads -

-
-DataEase 是开源的数据可视化分析工具，帮助用户快速分析数据并洞察业务趋势，从而实现业务的改进与优化。DataEase 支持丰富的数据源连接，能够通过拖拉拽方式快速制作图表，并可以方便的与他人分享。 - -### DataEase 的功能： - -- 图表展示：支持 PC 端、移动端及大屏; -- 图表制作：支持丰富的图表类型(Apache ECharts / AntV)、支持拖拉拽方式快速制作仪表板; -- 数据引擎：支持直连模式、本地模式(基于 Apache Doris / Kettle 实现); -- 数据连接：支持关系型数据库、Excel 等文件、Hadoop 等大数据平台、NoSQL 等各种数据源。 - -### DataEase 的优势： - -- 开源开放：零门槛，线上快速获取和安装；快速获取用户反馈、按月发布新版本； -- 简单易用：极易上手，通过鼠标点击和拖拽即可完成分析； -- 秒级响应：集成 Apache Doris，超大数据量下秒级查询返回延时； -- 安全分享：支持多种数据分享方式，确保数据安全。 - -### DataEase 已支持的数据源: - -- Excel -- MySQL -- Oracle -- SQL Server -- PostgreSQL -- Elasticsearch -- MariaDB -- Apache Doris -- ClickHouse -- MongoDB -- Amazon Redshift - -> 更多数据源支持持续增加中... - -## UI 展示 - -![de-ui](https://www.fit2cloud.com/dataease/images/screenshot/dataease-v1.gif) - -## 功能架构 - -![de-architecture](https://dataease.oss-cn-hangzhou.aliyuncs.com/img/de-architecture.png) - -## 在线体验 - -- 环境地址： -- 用户名：demo -- 密码：dataease - -## 快速开始 - -仅需两步快速安装 DataEase： - -1. 准备一台不小于 8 G内存的 64位 Linux 主机； -2. 以 root 用户执行如下命令一键安装 DataEase。 - -```sh -curl -sSL https://github.com/dataease/dataease/releases/latest/download/quick_start.sh | sh -``` - -- [在线文档](https://dataease.io/docs/) -- [演示视频](https://www.bilibili.com/video/BV1UB4y1K7jA) - -## 微信群 - - - -## 技术栈 - -- 后端：[Spring Boot](https://spring.io/projects/spring-boot) -- 前端：[Vue.js](https://vuejs.org/)、[Element](https://element.eleme.cn/)、[Apache ECharts](https://github.com/apache/echarts)、[AntV](https://antv.vision/zh) -- 中间件：[MySQL](https://www.mysql.com/) -- 数据处理：[Kettle](https://github.com/pentaho/pentaho-kettle)、[Apache Doris](https://github.com/apache/incubator-doris/) -- 基础设施：[Docker](https://www.docker.com/) - -## License & Copyright - -Copyright (c) 2014-2021 飞致云 FIT2CLOUD, All rights reserved. - -Licensed under The GNU General Public License version 2 (GPLv2) (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - - - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT 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/backend/pom.xml b/backend/pom.xml index 56c47df..4e47a0a 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dataease-server - io.dataease + ipsos-bi-server + com.ipsos 1.3.0 @@ -154,9 +154,9 @@ - com.fit2cloud + com.ipsos quartz-spring-boot-starter - 0.0.7 + 0.0.7-LOCAL @@ -198,9 +198,9 @@ - io.dataease - dataease-plugin-interface - 1.3 + com.ipsos + plugin-interface + 1.3-LOCAL cn.hutool diff --git a/backend/src/main/java/io/dataease/Application.java b/backend/src/main/java/com/ipsos/Application.java similarity index 97% rename from backend/src/main/java/io/dataease/Application.java rename to backend/src/main/java/com/ipsos/Application.java index d68685d..dce613f 100644 --- a/backend/src/main/java/io/dataease/Application.java +++ b/backend/src/main/java/com/ipsos/Application.java @@ -1,4 +1,4 @@ -package io.dataease; +package com.ipsos; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/com/ipsos/auth/api/AuthApi.java similarity index 89% rename from backend/src/main/java/io/dataease/auth/api/AuthApi.java rename to backend/src/main/java/com/ipsos/auth/api/AuthApi.java index f5e72af..b83e8f4 100644 --- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java +++ b/backend/src/main/java/com/ipsos/auth/api/AuthApi.java @@ -1,8 +1,8 @@ -package io.dataease.auth.api; +package com.ipsos.auth.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.auth.api.dto.CurrentUserDto; -import io.dataease.auth.api.dto.LoginDto; +import com.ipsos.auth.api.dto.CurrentUserDto; +import com.ipsos.auth.api.dto.LoginDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java b/backend/src/main/java/com/ipsos/auth/api/DynamicMenuApi.java similarity index 82% rename from backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java rename to backend/src/main/java/com/ipsos/auth/api/DynamicMenuApi.java index 790c491..889242c 100644 --- a/backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java +++ b/backend/src/main/java/com/ipsos/auth/api/DynamicMenuApi.java @@ -1,9 +1,9 @@ -package io.dataease.auth.api; +package com.ipsos.auth.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; -import io.dataease.auth.api.dto.DynamicMenuDto; -import io.dataease.controller.handler.annotation.I18n; +import com.ipsos.auth.api.dto.DynamicMenuDto; +import com.ipsos.controller.handler.annotation.I18n; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java b/backend/src/main/java/com/ipsos/auth/api/dto/CurrentRoleDto.java similarity index 89% rename from backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java rename to backend/src/main/java/com/ipsos/auth/api/dto/CurrentRoleDto.java index 65660c5..3655e81 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/CurrentRoleDto.java +++ b/backend/src/main/java/com/ipsos/auth/api/dto/CurrentRoleDto.java @@ -1,4 +1,4 @@ -package io.dataease.auth.api.dto; +package com.ipsos.auth.api.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java b/backend/src/main/java/com/ipsos/auth/api/dto/CurrentUserDto.java similarity index 83% rename from backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java rename to backend/src/main/java/com/ipsos/auth/api/dto/CurrentUserDto.java index 9bc1ac6..3f89316 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java +++ b/backend/src/main/java/com/ipsos/auth/api/dto/CurrentUserDto.java @@ -1,6 +1,6 @@ -package io.dataease.auth.api.dto; +package com.ipsos.auth.api.dto; -import io.dataease.auth.entity.SysUserEntity; +import com.ipsos.auth.entity.SysUserEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java b/backend/src/main/java/com/ipsos/auth/api/dto/DynamicMenuDto.java similarity index 96% rename from backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java rename to backend/src/main/java/com/ipsos/auth/api/dto/DynamicMenuDto.java index 0bb5b9b..0c3ad27 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/DynamicMenuDto.java +++ b/backend/src/main/java/com/ipsos/auth/api/dto/DynamicMenuDto.java @@ -1,4 +1,4 @@ -package io.dataease.auth.api.dto; +package com.ipsos.auth.api.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java b/backend/src/main/java/com/ipsos/auth/api/dto/LoginDto.java similarity index 94% rename from backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java rename to backend/src/main/java/com/ipsos/auth/api/dto/LoginDto.java index 62af1ce..a42ecde 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java +++ b/backend/src/main/java/com/ipsos/auth/api/dto/LoginDto.java @@ -1,4 +1,4 @@ -package io.dataease.auth.api.dto; +package com.ipsos.auth.api.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/auth/api/dto/MenuMeta.java b/backend/src/main/java/com/ipsos/auth/api/dto/MenuMeta.java similarity index 88% rename from backend/src/main/java/io/dataease/auth/api/dto/MenuMeta.java rename to backend/src/main/java/com/ipsos/auth/api/dto/MenuMeta.java index 7fea563..e57084e 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/MenuMeta.java +++ b/backend/src/main/java/com/ipsos/auth/api/dto/MenuMeta.java @@ -1,4 +1,4 @@ -package io.dataease.auth.api.dto; +package com.ipsos.auth.api.dto; import io.swagger.annotations.ApiModelProperty; diff --git a/backend/src/main/java/io/dataease/auth/config/CorsConfig.java b/backend/src/main/java/com/ipsos/auth/config/CorsConfig.java similarity index 97% rename from backend/src/main/java/io/dataease/auth/config/CorsConfig.java rename to backend/src/main/java/com/ipsos/auth/config/CorsConfig.java index 8dbbe29..491b323 100644 --- a/backend/src/main/java/io/dataease/auth/config/CorsConfig.java +++ b/backend/src/main/java/com/ipsos/auth/config/CorsConfig.java @@ -1,4 +1,4 @@ -package io.dataease.auth.config; +package com.ipsos.auth.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/com/ipsos/auth/config/F2CRealm.java similarity index 89% rename from backend/src/main/java/io/dataease/auth/config/F2CRealm.java rename to backend/src/main/java/com/ipsos/auth/config/F2CRealm.java index c7a4665..93d060f 100644 --- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java +++ b/backend/src/main/java/com/ipsos/auth/config/F2CRealm.java @@ -1,17 +1,17 @@ -package io.dataease.auth.config; - -import io.dataease.auth.api.dto.CurrentRoleDto; -import io.dataease.auth.api.dto.CurrentUserDto; -import io.dataease.auth.entity.ASKToken; -import io.dataease.auth.entity.JWTToken; -import io.dataease.auth.entity.SysUserEntity; -import io.dataease.auth.entity.TokenInfo; -import io.dataease.auth.handler.ApiKeyHandler; -import io.dataease.auth.service.AuthUserService; -import io.dataease.auth.util.JWTUtils; -import io.dataease.commons.utils.BeanUtils; -import io.dataease.commons.utils.LogUtil; -import io.dataease.listener.util.CacheUtils; +package com.ipsos.auth.config; + +import com.ipsos.auth.entity.ASKToken; +import com.ipsos.auth.entity.JWTToken; +import com.ipsos.auth.entity.SysUserEntity; +import com.ipsos.auth.entity.TokenInfo; +import com.ipsos.auth.handler.ApiKeyHandler; +import com.ipsos.auth.service.AuthUserService; +import com.ipsos.auth.api.dto.CurrentRoleDto; +import com.ipsos.auth.api.dto.CurrentUserDto; +import com.ipsos.auth.util.JWTUtils; +import com.ipsos.commons.utils.BeanUtils; +import com.ipsos.commons.utils.LogUtil; +import com.ipsos.listener.util.CacheUtils; import org.apache.shiro.authc.*; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; diff --git a/backend/src/main/java/io/dataease/auth/config/RsaProperties.java b/backend/src/main/java/com/ipsos/auth/config/RsaProperties.java similarity index 94% rename from backend/src/main/java/io/dataease/auth/config/RsaProperties.java rename to backend/src/main/java/com/ipsos/auth/config/RsaProperties.java index f44742d..62f456c 100644 --- a/backend/src/main/java/io/dataease/auth/config/RsaProperties.java +++ b/backend/src/main/java/com/ipsos/auth/config/RsaProperties.java @@ -1,4 +1,4 @@ -package io.dataease.auth.config; +package com.ipsos.auth.config; import lombok.Data; import org.springframework.beans.factory.annotation.Value; diff --git a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java b/backend/src/main/java/com/ipsos/auth/config/ShiroConfig.java similarity index 96% rename from backend/src/main/java/io/dataease/auth/config/ShiroConfig.java rename to backend/src/main/java/com/ipsos/auth/config/ShiroConfig.java index 764aefb..aa6cd2a 100644 --- a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java +++ b/backend/src/main/java/com/ipsos/auth/config/ShiroConfig.java @@ -1,7 +1,8 @@ -package io.dataease.auth.config; +package com.ipsos.auth.config; -import io.dataease.auth.service.ShiroService; +import com.ipsos.auth.filter.*; +import com.ipsos.auth.service.ShiroService; import org.apache.shiro.mgt.DefaultSessionStorageEvaluator; import org.apache.shiro.mgt.DefaultSubjectDAO; import org.apache.shiro.spring.LifecycleBeanPostProcessor; @@ -14,7 +15,6 @@ import org.springframework.context.annotation.Configuration; import javax.servlet.Filter; import java.util.LinkedHashMap; import java.util.Map; -import io.dataease.auth.filter.*; import org.springframework.context.annotation.DependsOn; @Configuration diff --git a/backend/src/main/java/io/dataease/auth/entity/ASKToken.java b/backend/src/main/java/com/ipsos/auth/entity/ASKToken.java similarity index 93% rename from backend/src/main/java/io/dataease/auth/entity/ASKToken.java rename to backend/src/main/java/com/ipsos/auth/entity/ASKToken.java index 4112fe1..51c70c6 100644 --- a/backend/src/main/java/io/dataease/auth/entity/ASKToken.java +++ b/backend/src/main/java/com/ipsos/auth/entity/ASKToken.java @@ -1,4 +1,4 @@ -package io.dataease.auth.entity; +package com.ipsos.auth.entity; import org.apache.shiro.authc.AuthenticationToken; diff --git a/backend/src/main/java/io/dataease/auth/entity/JWTToken.java b/backend/src/main/java/com/ipsos/auth/entity/JWTToken.java similarity index 91% rename from backend/src/main/java/io/dataease/auth/entity/JWTToken.java rename to backend/src/main/java/com/ipsos/auth/entity/JWTToken.java index afd4f3f..ed7d409 100644 --- a/backend/src/main/java/io/dataease/auth/entity/JWTToken.java +++ b/backend/src/main/java/com/ipsos/auth/entity/JWTToken.java @@ -1,4 +1,4 @@ -package io.dataease.auth.entity; +package com.ipsos.auth.entity; import org.apache.shiro.authc.AuthenticationToken; diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/com/ipsos/auth/entity/SysUserEntity.java similarity index 95% rename from backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java rename to backend/src/main/java/com/ipsos/auth/entity/SysUserEntity.java index 2eb61eb..f1c19bf 100644 --- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java +++ b/backend/src/main/java/com/ipsos/auth/entity/SysUserEntity.java @@ -1,4 +1,4 @@ -package io.dataease.auth.entity; +package com.ipsos.auth.entity; import io.swagger.annotations.ApiModelProperty; diff --git a/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java b/backend/src/main/java/com/ipsos/auth/entity/TokenInfo.java similarity index 90% rename from backend/src/main/java/io/dataease/auth/entity/TokenInfo.java rename to backend/src/main/java/com/ipsos/auth/entity/TokenInfo.java index e018cca..36adb4f 100644 --- a/backend/src/main/java/io/dataease/auth/entity/TokenInfo.java +++ b/backend/src/main/java/com/ipsos/auth/entity/TokenInfo.java @@ -1,4 +1,4 @@ -package io.dataease.auth.entity; +package com.ipsos.auth.entity; import lombok.Builder; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java b/backend/src/main/java/com/ipsos/auth/filter/F2CDocFilter.java similarity index 95% rename from backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java rename to backend/src/main/java/com/ipsos/auth/filter/F2CDocFilter.java index 022180c..1af4c09 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java +++ b/backend/src/main/java/com/ipsos/auth/filter/F2CDocFilter.java @@ -1,4 +1,4 @@ -package io.dataease.auth.filter; +package com.ipsos.auth.filter; import org.apache.shiro.web.filter.authc.AnonymousFilter; diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java b/backend/src/main/java/com/ipsos/auth/filter/F2CLinkFilter.java similarity index 83% rename from backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java rename to backend/src/main/java/com/ipsos/auth/filter/F2CLinkFilter.java index 94a43bc..43d509f 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java +++ b/backend/src/main/java/com/ipsos/auth/filter/F2CLinkFilter.java @@ -1,16 +1,15 @@ -package io.dataease.auth.filter; +package com.ipsos.auth.filter; import cn.hutool.core.util.ObjectUtil; import com.auth0.jwt.JWT; import com.auth0.jwt.interfaces.Claim; import com.auth0.jwt.interfaces.DecodedJWT; -import io.dataease.auth.config.RsaProperties; -import io.dataease.auth.util.JWTUtils; -import io.dataease.auth.util.LinkUtil; -import io.dataease.auth.util.RsaUtil; -import io.dataease.base.domain.PanelLink; -import io.dataease.commons.utils.LogUtil; -import org.apache.commons.lang3.StringUtils; +import com.ipsos.auth.config.RsaProperties; +import com.ipsos.auth.util.JWTUtils; +import com.ipsos.auth.util.LinkUtil; +import com.ipsos.auth.util.RsaUtil; +import com.ipsos.base.domain.PanelLink; +import com.ipsos.commons.utils.LogUtil; import org.apache.shiro.web.filter.authc.AnonymousFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLogoutFilter.java b/backend/src/main/java/com/ipsos/auth/filter/F2CLogoutFilter.java similarity index 95% rename from backend/src/main/java/io/dataease/auth/filter/F2CLogoutFilter.java rename to backend/src/main/java/com/ipsos/auth/filter/F2CLogoutFilter.java index 3587c52..50aca69 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CLogoutFilter.java +++ b/backend/src/main/java/com/ipsos/auth/filter/F2CLogoutFilter.java @@ -1,4 +1,4 @@ -package io.dataease.auth.filter; +package com.ipsos.auth.filter; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authc.LogoutFilter; diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CPermissionsFilter.java b/backend/src/main/java/com/ipsos/auth/filter/F2CPermissionsFilter.java similarity index 96% rename from backend/src/main/java/io/dataease/auth/filter/F2CPermissionsFilter.java rename to backend/src/main/java/com/ipsos/auth/filter/F2CPermissionsFilter.java index c3f6b46..81e2b65 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CPermissionsFilter.java +++ b/backend/src/main/java/com/ipsos/auth/filter/F2CPermissionsFilter.java @@ -1,4 +1,4 @@ -package io.dataease.auth.filter; +package com.ipsos.auth.filter; import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter; diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/com/ipsos/auth/filter/JWTFilter.java similarity index 92% rename from backend/src/main/java/io/dataease/auth/filter/JWTFilter.java rename to backend/src/main/java/com/ipsos/auth/filter/JWTFilter.java index 3077a33..6e4b667 100644 --- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java +++ b/backend/src/main/java/com/ipsos/auth/filter/JWTFilter.java @@ -1,16 +1,16 @@ -package io.dataease.auth.filter; - -import io.dataease.auth.entity.ASKToken; -import io.dataease.auth.entity.JWTToken; -import io.dataease.auth.entity.SysUserEntity; -import io.dataease.auth.entity.TokenInfo; -import io.dataease.auth.handler.ApiKeyHandler; -import io.dataease.auth.service.AuthUserService; -import io.dataease.auth.util.JWTUtils; -import io.dataease.commons.utils.CommonBeanFactory; -import io.dataease.commons.utils.LogUtil; -import io.dataease.exception.DataEaseException; -import io.dataease.i18n.Translator; +package com.ipsos.auth.filter; + +import com.ipsos.auth.handler.ApiKeyHandler; +import com.ipsos.auth.service.AuthUserService; +import com.ipsos.auth.entity.ASKToken; +import com.ipsos.auth.entity.JWTToken; +import com.ipsos.auth.entity.SysUserEntity; +import com.ipsos.auth.entity.TokenInfo; +import com.ipsos.auth.util.JWTUtils; +import com.ipsos.commons.utils.CommonBeanFactory; +import com.ipsos.commons.utils.LogUtil; +import com.ipsos.exception.DataEaseException; +import com.ipsos.i18n.Translator; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.subject.Subject; diff --git a/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java b/backend/src/main/java/com/ipsos/auth/handler/ApiKeyHandler.java similarity index 90% rename from backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java rename to backend/src/main/java/com/ipsos/auth/handler/ApiKeyHandler.java index bd0a0e3..5ed9877 100644 --- a/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java +++ b/backend/src/main/java/com/ipsos/auth/handler/ApiKeyHandler.java @@ -1,10 +1,10 @@ -package io.dataease.auth.handler; +package com.ipsos.auth.handler; -import io.dataease.auth.entity.ASKToken; -import io.dataease.commons.utils.CodingUtil; -import io.dataease.plugins.config.SpringContextUtil; -import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto; -import io.dataease.plugins.xpack.ukey.service.UkeyXpackService; +import com.ipsos.auth.entity.ASKToken; +import com.ipsos.commons.utils.CodingUtil; +import com.ipsos.plugins.config.SpringContextUtil; +import com.ipsos.plugins.xpack.ukey.dto.request.XpackUkeyDto; +import com.ipsos.plugins.xpack.ukey.service.UkeyXpackService; import org.apache.commons.lang3.StringUtils; import javax.servlet.http.HttpServletRequest; diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/com/ipsos/auth/server/AuthServer.java similarity index 83% rename from backend/src/main/java/io/dataease/auth/server/AuthServer.java rename to backend/src/main/java/com/ipsos/auth/server/AuthServer.java index 96979bf..ec5cfcb 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/com/ipsos/auth/server/AuthServer.java @@ -1,30 +1,30 @@ -package io.dataease.auth.server; - -import io.dataease.auth.api.AuthApi; -import io.dataease.auth.api.dto.CurrentRoleDto; -import io.dataease.auth.api.dto.CurrentUserDto; -import io.dataease.auth.api.dto.LoginDto; -import io.dataease.auth.config.RsaProperties; -import io.dataease.auth.entity.SysUserEntity; -import io.dataease.auth.entity.TokenInfo; -import io.dataease.auth.service.AuthUserService; -import io.dataease.auth.util.JWTUtils; -import io.dataease.auth.util.RsaUtil; -import io.dataease.commons.utils.BeanUtils; -import io.dataease.commons.utils.CodingUtil; -import io.dataease.commons.utils.LogUtil; -import io.dataease.commons.utils.ServletUtils; -import io.dataease.controller.sys.request.LdapAddRequest; -import io.dataease.exception.DataEaseException; -import io.dataease.i18n.Translator; -import io.dataease.plugins.common.entity.XpackLdapUserEntity; -import io.dataease.plugins.config.SpringContextUtil; -import io.dataease.plugins.util.PluginUtils; -import io.dataease.plugins.xpack.ldap.dto.request.LdapValidateRequest; -import io.dataease.plugins.xpack.ldap.dto.response.ValidateResult; -import io.dataease.plugins.xpack.ldap.service.LdapXpackService; -import io.dataease.plugins.xpack.oidc.service.OidcXpackService; -import io.dataease.service.sys.SysUserService; +package com.ipsos.auth.server; + +import com.ipsos.auth.service.AuthUserService; +import com.ipsos.auth.api.AuthApi; +import com.ipsos.auth.api.dto.CurrentRoleDto; +import com.ipsos.auth.api.dto.CurrentUserDto; +import com.ipsos.auth.api.dto.LoginDto; +import com.ipsos.auth.config.RsaProperties; +import com.ipsos.auth.entity.SysUserEntity; +import com.ipsos.auth.entity.TokenInfo; +import com.ipsos.auth.util.JWTUtils; +import com.ipsos.auth.util.RsaUtil; +import com.ipsos.commons.utils.BeanUtils; +import com.ipsos.commons.utils.CodingUtil; +import com.ipsos.commons.utils.LogUtil; +import com.ipsos.commons.utils.ServletUtils; +import com.ipsos.controller.sys.request.LdapAddRequest; +import com.ipsos.exception.DataEaseException; +import com.ipsos.i18n.Translator; +import com.ipsos.common.entity.XpackLdapUserEntity; +import com.ipsos.plugins.config.SpringContextUtil; +import com.ipsos.plugins.util.PluginUtils; +import com.ipsos.plugins.xpack.ldap.dto.request.LdapValidateRequest; +import com.ipsos.plugins.xpack.ldap.dto.response.ValidateResult; +import com.ipsos.plugins.xpack.ldap.service.LdapXpackService; +import com.ipsos.plugins.xpack.oidc.service.OidcXpackService; +import com.ipsos.service.sys.SysUserService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java b/backend/src/main/java/com/ipsos/auth/server/DynamicMenuServer.java similarity index 71% rename from backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java rename to backend/src/main/java/com/ipsos/auth/server/DynamicMenuServer.java index 4ed2eb0..8aa89b5 100644 --- a/backend/src/main/java/io/dataease/auth/server/DynamicMenuServer.java +++ b/backend/src/main/java/com/ipsos/auth/server/DynamicMenuServer.java @@ -1,8 +1,8 @@ -package io.dataease.auth.server; +package com.ipsos.auth.server; -import io.dataease.auth.api.DynamicMenuApi; -import io.dataease.auth.api.dto.DynamicMenuDto; -import io.dataease.auth.service.DynamicMenuService; +import com.ipsos.auth.service.DynamicMenuService; +import com.ipsos.auth.api.DynamicMenuApi; +import com.ipsos.auth.api.dto.DynamicMenuDto; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; import java.util.List; diff --git a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java b/backend/src/main/java/com/ipsos/auth/service/AuthUserService.java similarity index 79% rename from backend/src/main/java/io/dataease/auth/service/AuthUserService.java rename to backend/src/main/java/com/ipsos/auth/service/AuthUserService.java index a01fe2a..aceff90 100644 --- a/backend/src/main/java/io/dataease/auth/service/AuthUserService.java +++ b/backend/src/main/java/com/ipsos/auth/service/AuthUserService.java @@ -1,7 +1,7 @@ -package io.dataease.auth.service; +package com.ipsos.auth.service; -import io.dataease.auth.api.dto.CurrentRoleDto; -import io.dataease.auth.entity.SysUserEntity; +import com.ipsos.auth.api.dto.CurrentRoleDto; +import com.ipsos.auth.entity.SysUserEntity; import java.util.List; diff --git a/backend/src/main/java/io/dataease/auth/service/DynamicMenuService.java b/backend/src/main/java/com/ipsos/auth/service/DynamicMenuService.java similarity index 57% rename from backend/src/main/java/io/dataease/auth/service/DynamicMenuService.java rename to backend/src/main/java/com/ipsos/auth/service/DynamicMenuService.java index cdcd5ec..c3a870b 100644 --- a/backend/src/main/java/io/dataease/auth/service/DynamicMenuService.java +++ b/backend/src/main/java/com/ipsos/auth/service/DynamicMenuService.java @@ -1,6 +1,6 @@ -package io.dataease.auth.service; +package com.ipsos.auth.service; -import io.dataease.auth.api.dto.DynamicMenuDto; +import com.ipsos.auth.api.dto.DynamicMenuDto; import java.util.List; diff --git a/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java b/backend/src/main/java/com/ipsos/auth/service/ExtAuthService.java similarity index 66% rename from backend/src/main/java/io/dataease/auth/service/ExtAuthService.java rename to backend/src/main/java/com/ipsos/auth/service/ExtAuthService.java index 7a69be1..5d48ea1 100644 --- a/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java +++ b/backend/src/main/java/com/ipsos/auth/service/ExtAuthService.java @@ -1,6 +1,6 @@ -package io.dataease.auth.service; +package com.ipsos.auth.service; -import io.dataease.commons.model.AuthURD; +import com.ipsos.commons.model.AuthURD; import java.util.Set; diff --git a/backend/src/main/java/io/dataease/auth/service/ShiroService.java b/backend/src/main/java/com/ipsos/auth/service/ShiroService.java similarity index 96% rename from backend/src/main/java/io/dataease/auth/service/ShiroService.java rename to backend/src/main/java/com/ipsos/auth/service/ShiroService.java index 795521d..d3f8a0f 100644 --- a/backend/src/main/java/io/dataease/auth/service/ShiroService.java +++ b/backend/src/main/java/com/ipsos/auth/service/ShiroService.java @@ -1,4 +1,4 @@ -package io.dataease.auth.service; +package com.ipsos.auth.service; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; diff --git a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java b/backend/src/main/java/com/ipsos/auth/service/impl/AuthUserServiceImpl.java similarity index 88% rename from backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java rename to backend/src/main/java/com/ipsos/auth/service/impl/AuthUserServiceImpl.java index ebd6feb..4eb79dc 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java +++ b/backend/src/main/java/com/ipsos/auth/service/impl/AuthUserServiceImpl.java @@ -1,16 +1,16 @@ -package io.dataease.auth.service.impl; - -import io.dataease.auth.api.dto.CurrentRoleDto; -import io.dataease.auth.entity.SysUserEntity; -import io.dataease.base.domain.SysUser; -import io.dataease.base.mapper.SysUserMapper; -import io.dataease.base.mapper.ext.AuthMapper; -import io.dataease.auth.service.AuthUserService; -import io.dataease.commons.constants.AuthConstants; -import io.dataease.commons.utils.LogUtil; -import io.dataease.plugins.config.SpringContextUtil; -import io.dataease.plugins.xpack.ldap.service.LdapXpackService; -import io.dataease.plugins.xpack.oidc.service.OidcXpackService; +package com.ipsos.auth.service.impl; + +import com.ipsos.auth.api.dto.CurrentRoleDto; +import com.ipsos.auth.entity.SysUserEntity; +import com.ipsos.base.domain.SysUser; +import com.ipsos.base.mapper.SysUserMapper; +import com.ipsos.base.mapper.ext.AuthMapper; +import com.ipsos.auth.service.AuthUserService; +import com.ipsos.commons.constants.AuthConstants; +import com.ipsos.commons.utils.LogUtil; +import com.ipsos.plugins.config.SpringContextUtil; +import com.ipsos.plugins.xpack.ldap.service.LdapXpackService; +import com.ipsos.plugins.xpack.oidc.service.OidcXpackService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; diff --git a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java b/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java similarity index 91% rename from backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java rename to backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java index 0bee01c..e1f409c 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/DynamicMenuServiceImpl.java +++ b/backend/src/main/java/com/ipsos/auth/service/impl/DynamicMenuServiceImpl.java @@ -1,14 +1,14 @@ -package io.dataease.auth.service.impl; +package com.ipsos.auth.service.impl; -import io.dataease.auth.api.dto.DynamicMenuDto; -import io.dataease.auth.api.dto.MenuMeta; -import io.dataease.auth.service.DynamicMenuService; -import io.dataease.base.domain.SysMenu; -import io.dataease.base.domain.SysMenuExample; -import io.dataease.base.mapper.SysMenuMapper; -import io.dataease.base.mapper.ext.ExtPluginSysMenuMapper; -import io.dataease.plugins.common.dto.PluginSysMenu; -import io.dataease.plugins.util.PluginUtils; +import com.ipsos.auth.api.dto.DynamicMenuDto; +import com.ipsos.auth.api.dto.MenuMeta; +import com.ipsos.auth.service.DynamicMenuService; +import com.ipsos.base.domain.SysMenu; +import com.ipsos.base.domain.SysMenuExample; +import com.ipsos.base.mapper.SysMenuMapper; +import com.ipsos.base.mapper.ext.ExtPluginSysMenuMapper; +import com.ipsos.plugins.common.dto.PluginSysMenu; +import com.ipsos.plugins.util.PluginUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/com/ipsos/auth/service/impl/ExtAuthServiceImpl.java similarity index 88% rename from backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java rename to backend/src/main/java/com/ipsos/auth/service/impl/ExtAuthServiceImpl.java index 4220d88..6c87ce9 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java +++ b/backend/src/main/java/com/ipsos/auth/service/impl/ExtAuthServiceImpl.java @@ -1,10 +1,10 @@ -package io.dataease.auth.service.impl; +package com.ipsos.auth.service.impl; -import io.dataease.auth.service.ExtAuthService; -import io.dataease.base.domain.SysAuth; -import io.dataease.base.mapper.SysAuthMapper; -import io.dataease.base.mapper.ext.ExtAuthMapper; -import io.dataease.commons.model.AuthURD; +import com.ipsos.base.domain.SysAuth; +import com.ipsos.auth.service.ExtAuthService; +import com.ipsos.base.mapper.SysAuthMapper; +import com.ipsos.base.mapper.ext.ExtAuthMapper; +import com.ipsos.commons.model.AuthURD; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/com/ipsos/auth/service/impl/ShiroServiceImpl.java similarity index 97% rename from backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java rename to backend/src/main/java/com/ipsos/auth/service/impl/ShiroServiceImpl.java index aecb307..6de1214 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/com/ipsos/auth/service/impl/ShiroServiceImpl.java @@ -1,6 +1,6 @@ -package io.dataease.auth.service.impl; +package com.ipsos.auth.service.impl; -import io.dataease.auth.service.ShiroService; +import com.ipsos.auth.service.ShiroService; import org.apache.shiro.spring.web.ShiroFilterFactoryBean; import org.springframework.stereotype.Service; import java.util.LinkedHashMap; diff --git a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java b/backend/src/main/java/com/ipsos/auth/util/JWTUtils.java similarity index 95% rename from backend/src/main/java/io/dataease/auth/util/JWTUtils.java rename to backend/src/main/java/com/ipsos/auth/util/JWTUtils.java index 544c7a9..1ff4af1 100644 --- a/backend/src/main/java/io/dataease/auth/util/JWTUtils.java +++ b/backend/src/main/java/com/ipsos/auth/util/JWTUtils.java @@ -1,4 +1,4 @@ -package io.dataease.auth.util; +package com.ipsos.auth.util; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; @@ -7,10 +7,10 @@ import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.interfaces.DecodedJWT; import com.auth0.jwt.interfaces.Verification; -import io.dataease.auth.entity.TokenInfo; -import io.dataease.auth.entity.TokenInfo.TokenInfoBuilder; -import io.dataease.commons.utils.CommonBeanFactory; -import io.dataease.exception.DataEaseException; +import com.ipsos.auth.entity.TokenInfo; +import com.ipsos.auth.entity.TokenInfo.TokenInfoBuilder; +import com.ipsos.commons.utils.CommonBeanFactory; +import com.ipsos.exception.DataEaseException; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.core.env.Environment; diff --git a/backend/src/main/java/io/dataease/auth/util/LinkUtil.java b/backend/src/main/java/com/ipsos/auth/util/LinkUtil.java similarity index 79% rename from backend/src/main/java/io/dataease/auth/util/LinkUtil.java rename to backend/src/main/java/com/ipsos/auth/util/LinkUtil.java index df29abc..982ba5b 100644 --- a/backend/src/main/java/io/dataease/auth/util/LinkUtil.java +++ b/backend/src/main/java/com/ipsos/auth/util/LinkUtil.java @@ -1,7 +1,7 @@ -package io.dataease.auth.util; +package com.ipsos.auth.util; -import io.dataease.base.domain.PanelLink; -import io.dataease.service.panel.PanelLinkService; +import com.ipsos.base.domain.PanelLink; +import com.ipsos.service.panel.PanelLinkService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/io/dataease/auth/util/RsaUtil.java b/backend/src/main/java/com/ipsos/auth/util/RsaUtil.java similarity index 98% rename from backend/src/main/java/io/dataease/auth/util/RsaUtil.java rename to backend/src/main/java/com/ipsos/auth/util/RsaUtil.java index 46c5ed2..37048cb 100644 --- a/backend/src/main/java/io/dataease/auth/util/RsaUtil.java +++ b/backend/src/main/java/com/ipsos/auth/util/RsaUtil.java @@ -1,4 +1,4 @@ -package io.dataease.auth.util; +package com.ipsos.auth.util; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.ArrayUtils; diff --git a/backend/src/main/java/io/dataease/base/domain/AreaMapping.java b/backend/src/main/java/com/ipsos/base/domain/AreaMapping.java similarity index 91% rename from backend/src/main/java/io/dataease/base/domain/AreaMapping.java rename to backend/src/main/java/com/ipsos/base/domain/AreaMapping.java index 46c59b7..e38f5df 100644 --- a/backend/src/main/java/io/dataease/base/domain/AreaMapping.java +++ b/backend/src/main/java/com/ipsos/base/domain/AreaMapping.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/AreaMappingExample.java b/backend/src/main/java/com/ipsos/base/domain/AreaMappingExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/AreaMappingExample.java rename to backend/src/main/java/com/ipsos/base/domain/AreaMappingExample.java index 056db48..aae57ec 100644 --- a/backend/src/main/java/io/dataease/base/domain/AreaMappingExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/AreaMappingExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/AuthSource.java b/backend/src/main/java/com/ipsos/base/domain/AuthSource.java similarity index 92% rename from backend/src/main/java/io/dataease/base/domain/AuthSource.java rename to backend/src/main/java/com/ipsos/base/domain/AuthSource.java index 4dd383d..53cf32b 100644 --- a/backend/src/main/java/io/dataease/base/domain/AuthSource.java +++ b/backend/src/main/java/com/ipsos/base/domain/AuthSource.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/AuthSourceExample.java b/backend/src/main/java/com/ipsos/base/domain/AuthSourceExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/AuthSourceExample.java rename to backend/src/main/java/com/ipsos/base/domain/AuthSourceExample.java index 94e6915..b6ac1ff 100644 --- a/backend/src/main/java/io/dataease/base/domain/AuthSourceExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/AuthSourceExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroup.java b/backend/src/main/java/com/ipsos/base/domain/ChartGroup.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/ChartGroup.java rename to backend/src/main/java/com/ipsos/base/domain/ChartGroup.java index 0e11ff2..317c42e 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartGroup.java +++ b/backend/src/main/java/com/ipsos/base/domain/ChartGroup.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java b/backend/src/main/java/com/ipsos/base/domain/ChartGroupExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java rename to backend/src/main/java/com/ipsos/base/domain/ChartGroupExample.java index c3bf497..907b43f 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartGroupExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/ChartGroupExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/com/ipsos/base/domain/ChartView.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/ChartView.java rename to backend/src/main/java/com/ipsos/base/domain/ChartView.java index ed807bd..f274308 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartView.java +++ b/backend/src/main/java/com/ipsos/base/domain/ChartView.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/com/ipsos/base/domain/ChartViewExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/ChartViewExample.java rename to backend/src/main/java/com/ipsos/base/domain/ChartViewExample.java index 7aaf8d2..e0a85e5 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/ChartViewExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/com/ipsos/base/domain/ChartViewWithBLOBs.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java rename to backend/src/main/java/com/ipsos/base/domain/ChartViewWithBLOBs.java index 61779e0..f6269c6 100644 --- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java +++ b/backend/src/main/java/com/ipsos/base/domain/ChartViewWithBLOBs.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetGroup.java b/backend/src/main/java/com/ipsos/base/domain/DatasetGroup.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/DatasetGroup.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetGroup.java index ebc60cf..304ee2c 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetGroup.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetGroup.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetGroupExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetGroupExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetGroupExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetGroupExample.java index c000f8f..8efb42e 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetGroupExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetGroupExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTable.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTable.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/DatasetTable.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTable.java index e2ad34e..fa9be70 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTable.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTable.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableExample.java index 539348e..01538f4 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableField.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableField.java similarity index 97% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableField.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableField.java index b193215..247aa70 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableField.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableField.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFieldExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableFieldExample.java index 60eb780..6432029 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableFieldExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFieldExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableFunction.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFunction.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableFunction.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableFunction.java index dc2c419..1982b7d 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableFunction.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFunction.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableFunctionExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFunctionExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableFunctionExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableFunctionExample.java index f098e79..085d5a7 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableFunctionExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableFunctionExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfig.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfig.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfig.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfig.java index c664db4..c47d1ce 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfig.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfig.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfigExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfigExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfigExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfigExample.java index 9750ace..fc7e4ee 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableIncrementalConfigExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableIncrementalConfigExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTask.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableTask.java index e7878c3..b0d8e95 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTask.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTask.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskExample.java index 9501570..fe1f871 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLog.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLog.java index 363499b..3535d0c 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLog.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLog.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLogExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLogExample.java index 82ca70c..c49073e 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableTaskLogExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableTaskLogExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableUnion.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableUnion.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableUnion.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableUnion.java index 15817f6..b2f2ab0 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableUnion.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableUnion.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasetTableUnionExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasetTableUnionExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasetTableUnionExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasetTableUnionExample.java index b6292e3..e7fc051 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasetTableUnionExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasetTableUnionExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/Datasource.java b/backend/src/main/java/com/ipsos/base/domain/Datasource.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/Datasource.java rename to backend/src/main/java/com/ipsos/base/domain/Datasource.java index a564406..671e1e8 100644 --- a/backend/src/main/java/io/dataease/base/domain/Datasource.java +++ b/backend/src/main/java/com/ipsos/base/domain/Datasource.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java b/backend/src/main/java/com/ipsos/base/domain/DatasourceExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/DatasourceExample.java rename to backend/src/main/java/com/ipsos/base/domain/DatasourceExample.java index c59e358..7c3f475 100644 --- a/backend/src/main/java/io/dataease/base/domain/DatasourceExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/DatasourceExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/FileContent.java b/backend/src/main/java/com/ipsos/base/domain/FileContent.java similarity index 86% rename from backend/src/main/java/io/dataease/base/domain/FileContent.java rename to backend/src/main/java/com/ipsos/base/domain/FileContent.java index cbc5f29..66c593e 100644 --- a/backend/src/main/java/io/dataease/base/domain/FileContent.java +++ b/backend/src/main/java/com/ipsos/base/domain/FileContent.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/FileContentExample.java b/backend/src/main/java/com/ipsos/base/domain/FileContentExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/FileContentExample.java rename to backend/src/main/java/com/ipsos/base/domain/FileContentExample.java index 95c97bb..a99436f 100644 --- a/backend/src/main/java/io/dataease/base/domain/FileContentExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/FileContentExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/FileMetadata.java b/backend/src/main/java/com/ipsos/base/domain/FileMetadata.java similarity index 90% rename from backend/src/main/java/io/dataease/base/domain/FileMetadata.java rename to backend/src/main/java/com/ipsos/base/domain/FileMetadata.java index a6bafdd..ec88dac 100644 --- a/backend/src/main/java/io/dataease/base/domain/FileMetadata.java +++ b/backend/src/main/java/com/ipsos/base/domain/FileMetadata.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/FileMetadataExample.java b/backend/src/main/java/com/ipsos/base/domain/FileMetadataExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/FileMetadataExample.java rename to backend/src/main/java/com/ipsos/base/domain/FileMetadataExample.java index 1ac532d..ef3d729 100644 --- a/backend/src/main/java/io/dataease/base/domain/FileMetadataExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/FileMetadataExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/License.java b/backend/src/main/java/com/ipsos/base/domain/License.java similarity index 98% rename from backend/src/main/java/io/dataease/base/domain/License.java rename to backend/src/main/java/com/ipsos/base/domain/License.java index 71ca47d..39c6d8b 100644 --- a/backend/src/main/java/io/dataease/base/domain/License.java +++ b/backend/src/main/java/com/ipsos/base/domain/License.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import java.util.Date; diff --git a/backend/src/main/java/io/dataease/base/domain/LicenseExample.java b/backend/src/main/java/com/ipsos/base/domain/LicenseExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/LicenseExample.java rename to backend/src/main/java/com/ipsos/base/domain/LicenseExample.java index 5dd276f..3fe65bb 100644 --- a/backend/src/main/java/io/dataease/base/domain/LicenseExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/LicenseExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.Date; diff --git a/backend/src/main/java/io/dataease/base/domain/MyPlugin.java b/backend/src/main/java/com/ipsos/base/domain/MyPlugin.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/MyPlugin.java rename to backend/src/main/java/com/ipsos/base/domain/MyPlugin.java index e7c9e0c..72b9792 100644 --- a/backend/src/main/java/io/dataease/base/domain/MyPlugin.java +++ b/backend/src/main/java/com/ipsos/base/domain/MyPlugin.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/MyPluginExample.java b/backend/src/main/java/com/ipsos/base/domain/MyPluginExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/MyPluginExample.java rename to backend/src/main/java/com/ipsos/base/domain/MyPluginExample.java index ab2c8f5..450e367 100644 --- a/backend/src/main/java/io/dataease/base/domain/MyPluginExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/MyPluginExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelDesign.java b/backend/src/main/java/com/ipsos/base/domain/PanelDesign.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/PanelDesign.java rename to backend/src/main/java/com/ipsos/base/domain/PanelDesign.java index 0e19f42..9e4ed6e 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelDesign.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelDesign.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelDesignExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelDesignExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelDesignExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelDesignExample.java index 20283b3..31fa4e3 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelDesignExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelDesignExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelGroup.java b/backend/src/main/java/com/ipsos/base/domain/PanelGroup.java similarity index 96% rename from backend/src/main/java/io/dataease/base/domain/PanelGroup.java rename to backend/src/main/java/com/ipsos/base/domain/PanelGroup.java index db49938..80abfac 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelGroup.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelGroup.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelGroupExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelGroupExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelGroupExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelGroupExample.java index 0455d45..c25fa4a 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelGroupExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelGroupExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelGroupWithBLOBs.java b/backend/src/main/java/com/ipsos/base/domain/PanelGroupWithBLOBs.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/PanelGroupWithBLOBs.java rename to backend/src/main/java/com/ipsos/base/domain/PanelGroupWithBLOBs.java index b697bc3..6bc7553 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelGroupWithBLOBs.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelGroupWithBLOBs.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLink.java b/backend/src/main/java/com/ipsos/base/domain/PanelLink.java similarity index 89% rename from backend/src/main/java/io/dataease/base/domain/PanelLink.java rename to backend/src/main/java/com/ipsos/base/domain/PanelLink.java index efe0e38..eff260c 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelLink.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelLink.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelLinkExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelLinkExample.java index 0dccb6d..b499296 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelLinkExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelLinkExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelPdfTemplate.java b/backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplate.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/PanelPdfTemplate.java rename to backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplate.java index f1eb7a7..327d262 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelPdfTemplate.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplate.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelPdfTemplateExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplateExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelPdfTemplateExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplateExample.java index 3f3b9d3..b96a609 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelPdfTemplateExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelPdfTemplateExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelShare.java b/backend/src/main/java/com/ipsos/base/domain/PanelShare.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/PanelShare.java rename to backend/src/main/java/com/ipsos/base/domain/PanelShare.java index cabda76..402fd49 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelShare.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelShare.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelShareExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelShareExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelShareExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelShareExample.java index 0f589d6..9e9d911 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelShareExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelShareExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelStore.java b/backend/src/main/java/com/ipsos/base/domain/PanelStore.java similarity index 89% rename from backend/src/main/java/io/dataease/base/domain/PanelStore.java rename to backend/src/main/java/com/ipsos/base/domain/PanelStore.java index 902dcd6..6ae6757 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelStore.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelStore.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelStoreExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelStoreExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelStoreExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelStoreExample.java index 58bf825..ffcb9ac 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelStoreExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelStoreExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelSubject.java b/backend/src/main/java/com/ipsos/base/domain/PanelSubject.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/PanelSubject.java rename to backend/src/main/java/com/ipsos/base/domain/PanelSubject.java index 7926c32..b0cb648 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelSubject.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelSubject.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelSubjectExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelSubjectExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelSubjectExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelSubjectExample.java index fef8987..8870311 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelSubjectExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelSubjectExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelTemplate.java b/backend/src/main/java/com/ipsos/base/domain/PanelTemplate.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/PanelTemplate.java rename to backend/src/main/java/com/ipsos/base/domain/PanelTemplate.java index 2834715..e1018f4 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelTemplate.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelTemplate.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelTemplateExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelTemplateExample.java index b5b7de1..ef123ea 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelTemplateExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelTemplateExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java b/backend/src/main/java/com/ipsos/base/domain/PanelTemplateWithBLOBs.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java rename to backend/src/main/java/com/ipsos/base/domain/PanelTemplateWithBLOBs.java index a776c56..c3d4790 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelTemplateWithBLOBs.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelTemplateWithBLOBs.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelView.java b/backend/src/main/java/com/ipsos/base/domain/PanelView.java similarity index 92% rename from backend/src/main/java/io/dataease/base/domain/PanelView.java rename to backend/src/main/java/com/ipsos/base/domain/PanelView.java index 0f323c6..d101bfb 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelView.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelView.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelViewExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelViewExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelViewExample.java index 2592896..4495574 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelViewExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkage.java b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkage.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/PanelViewLinkage.java rename to backend/src/main/java/com/ipsos/base/domain/PanelViewLinkage.java index 903863b..8845d1f 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkage.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkage.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelViewLinkageExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageExample.java index b9ab61a..6cd52be 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageField.java b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageField.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/PanelViewLinkageField.java rename to backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageField.java index 112d699..8a91f3d 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageField.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageField.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageFieldExample.java b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageFieldExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/PanelViewLinkageFieldExample.java rename to backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageFieldExample.java index 5fda790..fa96e15 100644 --- a/backend/src/main/java/io/dataease/base/domain/PanelViewLinkageFieldExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/PanelViewLinkageFieldExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerState.java b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerState.java similarity index 91% rename from backend/src/main/java/io/dataease/base/domain/QrtzSchedulerState.java rename to backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerState.java index 2f12a06..507c22c 100644 --- a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerState.java +++ b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerState.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateExample.java b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateExample.java rename to backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateExample.java index 4d94ea4..2fb1774 100644 --- a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateKey.java b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateKey.java similarity index 87% rename from backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateKey.java rename to backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateKey.java index 40062d5..d31ea6b 100644 --- a/backend/src/main/java/io/dataease/base/domain/QrtzSchedulerStateKey.java +++ b/backend/src/main/java/com/ipsos/base/domain/QrtzSchedulerStateKey.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/Schedule.java b/backend/src/main/java/com/ipsos/base/domain/Schedule.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/Schedule.java rename to backend/src/main/java/com/ipsos/base/domain/Schedule.java index 4b9dbcc..d556e48 100644 --- a/backend/src/main/java/io/dataease/base/domain/Schedule.java +++ b/backend/src/main/java/com/ipsos/base/domain/Schedule.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/ScheduleExample.java b/backend/src/main/java/com/ipsos/base/domain/ScheduleExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/ScheduleExample.java rename to backend/src/main/java/com/ipsos/base/domain/ScheduleExample.java index e80305b..7022ffe 100644 --- a/backend/src/main/java/io/dataease/base/domain/ScheduleExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/ScheduleExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysAuth.java b/backend/src/main/java/com/ipsos/base/domain/SysAuth.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/SysAuth.java rename to backend/src/main/java/com/ipsos/base/domain/SysAuth.java index 2bec28d..22e74a1 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysAuth.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysAuth.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import java.util.Date; diff --git a/backend/src/main/java/io/dataease/base/domain/SysAuthDetail.java b/backend/src/main/java/com/ipsos/base/domain/SysAuthDetail.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/SysAuthDetail.java rename to backend/src/main/java/com/ipsos/base/domain/SysAuthDetail.java index 70b4b2e..bf4c7c7 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysAuthDetail.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysAuthDetail.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SysAuthDetailExample.java b/backend/src/main/java/com/ipsos/base/domain/SysAuthDetailExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysAuthDetailExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysAuthDetailExample.java index 35afb43..4c87340 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysAuthDetailExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysAuthDetailExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysAuthExample.java b/backend/src/main/java/com/ipsos/base/domain/SysAuthExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysAuthExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysAuthExample.java index b4c299f..e8893d1 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysAuthExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysAuthExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.Date; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDept.java b/backend/src/main/java/com/ipsos/base/domain/SysDept.java similarity index 92% rename from backend/src/main/java/io/dataease/base/domain/SysDept.java rename to backend/src/main/java/com/ipsos/base/domain/SysDept.java index 636da7d..303609c 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDept.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDept.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java b/backend/src/main/java/com/ipsos/base/domain/SysDeptExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysDeptExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysDeptExample.java index 8b72401..fc0a693 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDeptExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDeptExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDict.java b/backend/src/main/java/com/ipsos/base/domain/SysDict.java similarity index 92% rename from backend/src/main/java/io/dataease/base/domain/SysDict.java rename to backend/src/main/java/com/ipsos/base/domain/SysDict.java index 4ddd111..c9f151b 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDict.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDict.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDictExample.java b/backend/src/main/java/com/ipsos/base/domain/SysDictExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysDictExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysDictExample.java index 1328dac..79750c8 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDictExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDictExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDictItem.java b/backend/src/main/java/com/ipsos/base/domain/SysDictItem.java similarity index 93% rename from backend/src/main/java/io/dataease/base/domain/SysDictItem.java rename to backend/src/main/java/com/ipsos/base/domain/SysDictItem.java index 68989fd..7db8142 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDictItem.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDictItem.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java b/backend/src/main/java/com/ipsos/base/domain/SysDictItemExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysDictItemExample.java index 37d0b17..71d26dd 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysDictItemExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysDictItemExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMenu.java b/backend/src/main/java/com/ipsos/base/domain/SysMenu.java similarity index 97% rename from backend/src/main/java/io/dataease/base/domain/SysMenu.java rename to backend/src/main/java/com/ipsos/base/domain/SysMenu.java index a9df1d5..eebab9f 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMenu.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMenu.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import java.util.Objects; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMenuExample.java b/backend/src/main/java/com/ipsos/base/domain/SysMenuExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysMenuExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysMenuExample.java index 568db3a..a9abbb6 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMenuExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMenuExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsg.java b/backend/src/main/java/com/ipsos/base/domain/SysMsg.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/SysMsg.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsg.java index 9a80170..a8e0cdf 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsg.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsg.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgChannel.java similarity index 91% rename from backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgChannel.java index 2bae1b3..2ac2282 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgChannel.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgChannelExample.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgChannelExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysMsgChannelExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgChannelExample.java index 6c860f8..9f93f8b 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgChannelExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgChannelExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgExample.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysMsgExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgExample.java index e242693..71bfba4 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgSetting.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgSetting.java index 49862f0..62a5afa 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgSetting.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgSettingExample.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgSettingExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysMsgSettingExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgSettingExample.java index 6e2f095..75b1c10 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgSettingExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgSettingExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgType.java similarity index 94% rename from backend/src/main/java/io/dataease/base/domain/SysMsgType.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgType.java index 9726245..c1730db 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgType.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgTypeExample.java b/backend/src/main/java/com/ipsos/base/domain/SysMsgTypeExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysMsgTypeExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysMsgTypeExample.java index 143c4a9..e088bf4 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysMsgTypeExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysMsgTypeExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysRole.java b/backend/src/main/java/com/ipsos/base/domain/SysRole.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/SysRole.java rename to backend/src/main/java/com/ipsos/base/domain/SysRole.java index 654cefb..bdaa0d0 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysRole.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysRole.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; diff --git a/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java b/backend/src/main/java/com/ipsos/base/domain/SysRoleExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysRoleExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysRoleExample.java index bf2c892..0ae1325 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysRoleExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysRoleExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/com/ipsos/base/domain/SysUser.java similarity index 95% rename from backend/src/main/java/io/dataease/base/domain/SysUser.java rename to backend/src/main/java/com/ipsos/base/domain/SysUser.java index 8867cc7..0f22416 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUser.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysUser.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java b/backend/src/main/java/com/ipsos/base/domain/SysUserExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysUserExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysUserExample.java index 1b8fc36..0d55ff6 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUserExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysUserExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUsersRolesExample.java b/backend/src/main/java/com/ipsos/base/domain/SysUsersRolesExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SysUsersRolesExample.java rename to backend/src/main/java/com/ipsos/base/domain/SysUsersRolesExample.java index 7065c28..0b907c7 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUsersRolesExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysUsersRolesExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/SysUsersRolesKey.java b/backend/src/main/java/com/ipsos/base/domain/SysUsersRolesKey.java similarity index 86% rename from backend/src/main/java/io/dataease/base/domain/SysUsersRolesKey.java rename to backend/src/main/java/com/ipsos/base/domain/SysUsersRolesKey.java index 5fd0a89..77c0682 100644 --- a/backend/src/main/java/io/dataease/base/domain/SysUsersRolesKey.java +++ b/backend/src/main/java/com/ipsos/base/domain/SysUsersRolesKey.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SystemParameter.java b/backend/src/main/java/com/ipsos/base/domain/SystemParameter.java similarity index 89% rename from backend/src/main/java/io/dataease/base/domain/SystemParameter.java rename to backend/src/main/java/com/ipsos/base/domain/SystemParameter.java index eb56695..eb3d454 100644 --- a/backend/src/main/java/io/dataease/base/domain/SystemParameter.java +++ b/backend/src/main/java/com/ipsos/base/domain/SystemParameter.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/SystemParameterExample.java b/backend/src/main/java/com/ipsos/base/domain/SystemParameterExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/SystemParameterExample.java rename to backend/src/main/java/com/ipsos/base/domain/SystemParameterExample.java index 637c108..650c0a5 100644 --- a/backend/src/main/java/io/dataease/base/domain/SystemParameterExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/SystemParameterExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/domain/UserKey.java b/backend/src/main/java/com/ipsos/base/domain/UserKey.java similarity index 90% rename from backend/src/main/java/io/dataease/base/domain/UserKey.java rename to backend/src/main/java/com/ipsos/base/domain/UserKey.java index bd9aaab..c49229a 100644 --- a/backend/src/main/java/io/dataease/base/domain/UserKey.java +++ b/backend/src/main/java/com/ipsos/base/domain/UserKey.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.io.Serializable; import lombok.Data; diff --git a/backend/src/main/java/io/dataease/base/domain/UserKeyExample.java b/backend/src/main/java/com/ipsos/base/domain/UserKeyExample.java similarity index 99% rename from backend/src/main/java/io/dataease/base/domain/UserKeyExample.java rename to backend/src/main/java/com/ipsos/base/domain/UserKeyExample.java index eca0701..120b2e5 100644 --- a/backend/src/main/java/io/dataease/base/domain/UserKeyExample.java +++ b/backend/src/main/java/com/ipsos/base/domain/UserKeyExample.java @@ -1,4 +1,4 @@ -package io.dataease.base.domain; +package com.ipsos.base.domain; import java.util.ArrayList; import java.util.List; diff --git a/backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.java b/backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.java similarity index 85% rename from backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.java index 0ae111c..c17ef3a 100644 --- a/backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.java @@ -1,8 +1,9 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.AreaMapping; -import io.dataease.base.domain.AreaMappingExample; +import com.ipsos.base.domain.AreaMapping; +import com.ipsos.base.domain.AreaMappingExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface AreaMappingMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.xml similarity index 91% rename from backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.xml index 762158d..4d0323f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/AreaMappingMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/AreaMappingMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ id, province_name, province_code, city_name, city_code, county_name, county_code - select distinct @@ -95,13 +95,13 @@ delete from area_mapping where id = #{id,jdbcType=BIGINT} - + delete from area_mapping - + insert into area_mapping (id, province_name, province_code, city_name, city_code, county_name, county_code) @@ -109,7 +109,7 @@ #{cityName,jdbcType=VARCHAR}, #{cityCode,jdbcType=VARCHAR}, #{countyName,jdbcType=VARCHAR}, #{countyCode,jdbcType=VARCHAR}) - + insert into area_mapping @@ -158,7 +158,7 @@ - select count(*) from area_mapping @@ -206,7 +206,7 @@ - + update area_mapping @@ -230,7 +230,7 @@ where id = #{id,jdbcType=BIGINT} - + update area_mapping set province_name = #{provinceName,jdbcType=VARCHAR}, province_code = #{provinceCode,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.java b/backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.java similarity index 89% rename from backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.java index 1d8a05b..847a190 100644 --- a/backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.AuthSource; -import io.dataease.base.domain.AuthSourceExample; +import com.ipsos.base.domain.AuthSource; +import com.ipsos.base.domain.AuthSourceExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.xml index b7a19b0..95df3b4 100644 --- a/backend/src/main/java/io/dataease/base/mapper/AuthSourceMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/AuthSourceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -10,7 +10,7 @@ - + @@ -77,7 +77,7 @@ configuration - select distinct @@ -93,7 +93,7 @@ order by ${orderByClause} - select distinct @@ -119,13 +119,13 @@ delete from auth_source where id = #{id,jdbcType=VARCHAR} - + delete from auth_source - + insert into auth_source (id, `status`, create_time, update_time, description, `name`, `type`, configuration) @@ -133,7 +133,7 @@ #{updateTime,jdbcType=BIGINT}, #{description,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{configuration,jdbcType=LONGVARCHAR}) - + insert into auth_source @@ -188,7 +188,7 @@ - select count(*) from auth_source @@ -253,7 +253,7 @@ - + update auth_source @@ -280,7 +280,7 @@ where id = #{id,jdbcType=VARCHAR} - + update auth_source set `status` = #{status,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, @@ -291,7 +291,7 @@ configuration = #{configuration,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} - + update auth_source set `status` = #{status,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java b/backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.java similarity index 85% rename from backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.java index 92e6264..090ef38 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.java @@ -1,8 +1,10 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; + +import com.ipsos.base.domain.ChartGroupExample; +import com.ipsos.base.domain.ChartGroup; -import io.dataease.base.domain.ChartGroup; -import io.dataease.base.domain.ChartGroupExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface ChartGroupMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.xml index 58f37d6..74fb74b 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartGroupMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/ChartGroupMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ id, `name`, pid, `level`, `type`, create_by, create_time - select distinct @@ -95,13 +95,13 @@ delete from chart_group where id = #{id,jdbcType=VARCHAR} - + delete from chart_group - + insert into chart_group (id, `name`, pid, `level`, `type`, create_by, create_time) @@ -109,7 +109,7 @@ #{level,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}) - + insert into chart_group @@ -158,7 +158,7 @@ - select count(*) from chart_group @@ -206,7 +206,7 @@ - + update chart_group @@ -230,7 +230,7 @@ where id = #{id,jdbcType=VARCHAR} - + update chart_group set `name` = #{name,jdbcType=VARCHAR}, pid = #{pid,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.java b/backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.java similarity index 85% rename from backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.java index 5c36634..245a3e6 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.java @@ -1,8 +1,8 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.ChartView; -import io.dataease.base.domain.ChartViewExample; -import io.dataease.base.domain.ChartViewWithBLOBs; +import com.ipsos.base.domain.ChartView; +import com.ipsos.base.domain.ChartViewExample; +import com.ipsos.base.domain.ChartViewWithBLOBs; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.xml similarity index 94% rename from backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.xml index 72b2eaa..411edd9 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/ChartViewMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,7 +13,7 @@ - + @@ -91,7 +91,7 @@ x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, drill_fields, snapshot - select distinct @@ -107,7 +107,7 @@ order by ${orderByClause} - select distinct @@ -133,13 +133,13 @@ delete from chart_view where id = #{id,jdbcType=VARCHAR} - + delete from chart_view - + insert into chart_view (id, `name`, scene_id, table_id, `type`, title, create_by, create_time, update_time, @@ -155,7 +155,7 @@ #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}) - + insert into chart_view @@ -282,7 +282,7 @@ - select count(*) from chart_view @@ -398,7 +398,7 @@ - + update chart_view @@ -461,7 +461,7 @@ where id = #{id,jdbcType=VARCHAR} - + update chart_view set `name` = #{name,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, @@ -484,7 +484,7 @@ snapshot = #{snapshot,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} - + update chart_view set `name` = #{name,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.java similarity index 85% rename from backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.java index 025628b..f5ea671 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.java @@ -1,8 +1,9 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetGroup; -import io.dataease.base.domain.DatasetGroupExample; +import com.ipsos.base.domain.DatasetGroup; +import com.ipsos.base.domain.DatasetGroupExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasetGroupMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.xml index fbbf541..b03af55 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetGroupMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetGroupMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -71,7 +71,7 @@ id, `name`, pid, `level`, `type`, create_by, create_time - select distinct @@ -95,13 +95,13 @@ delete from dataset_group where id = #{id,jdbcType=VARCHAR} - + delete from dataset_group - + insert into dataset_group (id, `name`, pid, `level`, `type`, create_by, create_time) @@ -109,7 +109,7 @@ #{level,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}) - + insert into dataset_group @@ -158,7 +158,7 @@ - select count(*) from dataset_group @@ -206,7 +206,7 @@ - + update dataset_group @@ -230,7 +230,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_group set `name` = #{name,jdbcType=VARCHAR}, pid = #{pid,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.java similarity index 86% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.java index a22f2e1..3faa2c1 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.java @@ -1,8 +1,10 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; + +import com.ipsos.base.domain.DatasetTableFieldExample; +import com.ipsos.base.domain.DatasetTableField; -import io.dataease.base.domain.DatasetTableField; -import io.dataease.base.domain.DatasetTableFieldExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasetTableFieldMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.xml similarity index 93% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.xml index 1b3a36b..5e98346 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFieldMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFieldMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -80,7 +80,7 @@ id, table_id, origin_name, `name`, dataease_name, group_type, `type`, `size`, de_type, de_type_format, de_extract_type, ext_field, `checked`, column_index, last_sync_time - select distinct @@ -104,13 +104,13 @@ delete from dataset_table_field where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table_field - + insert into dataset_table_field (id, table_id, origin_name, `name`, dataease_name, group_type, `type`, `size`, de_type, @@ -124,7 +124,7 @@ #{checked,jdbcType=BIT}, #{columnIndex,jdbcType=INTEGER}, #{lastSyncTime,jdbcType=BIGINT} ) - + insert into dataset_table_field @@ -221,7 +221,7 @@ - select count(*) from dataset_table_field @@ -301,7 +301,7 @@ - + update dataset_table_field @@ -349,7 +349,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table_field set table_id = #{tableId,jdbcType=VARCHAR}, origin_name = #{originName,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.java similarity index 89% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.java index ddd5f37..2242cd8 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetTableFunction; -import io.dataease.base.domain.DatasetTableFunctionExample; +import com.ipsos.base.domain.DatasetTableFunction; +import com.ipsos.base.domain.DatasetTableFunctionExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.xml similarity index 87% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.xml index 3f82540..3d7ac8d 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableFunctionMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableFunctionMapper.xml @@ -1,14 +1,14 @@ - - + + - + @@ -75,7 +75,7 @@ `desc` - select distinct @@ -91,7 +91,7 @@ order by ${orderByClause} - select distinct @@ -117,13 +117,13 @@ delete from dataset_table_function where id = #{id,jdbcType=BIGINT} - + delete from dataset_table_function - + insert into dataset_table_function (id, `name`, func, db_type, func_type, `desc` ) @@ -131,7 +131,7 @@ #{dbType,jdbcType=VARCHAR}, #{funcType,jdbcType=INTEGER}, #{desc,jdbcType=LONGVARCHAR} ) - + insert into dataset_table_function @@ -174,7 +174,7 @@ - select count(*) from dataset_table_function @@ -229,7 +229,7 @@ - + update dataset_table_function @@ -250,7 +250,7 @@ where id = #{id,jdbcType=BIGINT} - + update dataset_table_function set `name` = #{name,jdbcType=VARCHAR}, func = #{func,jdbcType=VARCHAR}, @@ -259,7 +259,7 @@ `desc` = #{desc,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=BIGINT} - + update dataset_table_function set `name` = #{name,jdbcType=VARCHAR}, func = #{func,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.java similarity index 86% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.java index dcb15c5..f478213 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetTableIncrementalConfig; -import io.dataease.base.domain.DatasetTableIncrementalConfigExample; +import com.ipsos.base.domain.DatasetTableIncrementalConfig; +import com.ipsos.base.domain.DatasetTableIncrementalConfigExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.xml similarity index 87% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.xml index a2e2e77..bb5a842 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableIncrementalConfigMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableIncrementalConfigMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -68,7 +68,7 @@ id, table_id, incremental_delete, incremental_add - select distinct @@ -92,19 +92,19 @@ delete from dataset_table_incremental_config where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table_incremental_config - + insert into dataset_table_incremental_config (id, table_id, incremental_delete, incremental_add) values (#{id,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{incrementalDelete,jdbcType=VARCHAR}, #{incrementalAdd,jdbcType=VARCHAR}) - + insert into dataset_table_incremental_config @@ -135,7 +135,7 @@ - select count(*) from dataset_table_incremental_config @@ -171,7 +171,7 @@ - + update dataset_table_incremental_config @@ -186,7 +186,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table_incremental_config set table_id = #{tableId,jdbcType=VARCHAR}, incremental_delete = #{incrementalDelete,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.java similarity index 88% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.java index 41e1951..0a9da30 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.java @@ -1,8 +1,9 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetTable; -import io.dataease.base.domain.DatasetTableExample; +import com.ipsos.base.domain.DatasetTable; +import com.ipsos.base.domain.DatasetTableExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasetTableMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.xml similarity index 92% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.xml index 4c72b88..55c7722 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -14,7 +14,7 @@ - + @@ -82,7 +82,7 @@ info - select distinct @@ -98,7 +98,7 @@ order by ${orderByClause} - select distinct @@ -124,13 +124,13 @@ delete from dataset_table where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table - + insert into dataset_table (id, `name`, scene_id, data_source_id, `type`, `mode`, create_by, create_time, qrtz_instance, @@ -142,7 +142,7 @@ #{syncStatus,jdbcType=VARCHAR}, #{lastUpdateTime,jdbcType=BIGINT}, #{info,jdbcType=LONGVARCHAR} ) - + insert into dataset_table @@ -221,7 +221,7 @@ - select count(*) from dataset_table @@ -306,7 +306,7 @@ - + update dataset_table @@ -345,7 +345,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table set `name` = #{name,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, @@ -360,7 +360,7 @@ info = #{info,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} - + update dataset_table set `name` = #{name,jdbcType=VARCHAR}, scene_id = #{sceneId,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.java similarity index 89% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.java index 883fd80..af1c3dc 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.java @@ -1,8 +1,10 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; + +import com.ipsos.base.domain.DatasetTableTaskLogExample; +import com.ipsos.base.domain.DatasetTableTaskLog; -import io.dataease.base.domain.DatasetTableTaskLog; -import io.dataease.base.domain.DatasetTableTaskLogExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasetTableTaskLogMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.xml index 3903dd3..e36da1b 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskLogMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskLogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + @@ -78,7 +78,7 @@ info - select distinct @@ -94,7 +94,7 @@ order by ${orderByClause} - select distinct @@ -120,13 +120,13 @@ delete from dataset_table_task_log where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table_task_log - + insert into dataset_table_task_log (id, table_id, task_id, start_time, end_time, `status`, create_time, trigger_type, info @@ -136,7 +136,7 @@ #{createTime,jdbcType=BIGINT}, #{triggerType,jdbcType=VARCHAR}, #{info,jdbcType=LONGVARCHAR} ) - + insert into dataset_table_task_log @@ -197,7 +197,7 @@ - select count(*) from dataset_table_task_log @@ -267,7 +267,7 @@ - + update dataset_table_task_log @@ -297,7 +297,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table_task_log set table_id = #{tableId,jdbcType=VARCHAR}, task_id = #{taskId,jdbcType=VARCHAR}, @@ -309,7 +309,7 @@ info = #{info,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} - + update dataset_table_task_log set table_id = #{tableId,jdbcType=VARCHAR}, task_id = #{taskId,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.java similarity index 86% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.java index 9b3527e..7cd3803 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetTableTask; -import io.dataease.base.domain.DatasetTableTaskExample; +import com.ipsos.base.domain.DatasetTableTask; +import com.ipsos.base.domain.DatasetTableTaskExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.xml similarity index 93% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.xml index b395161..80792ae 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableTaskMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableTaskMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -79,7 +79,7 @@ id, table_id, `name`, `type`, start_time, rate, cron, `end`, end_time, create_time, last_exec_time, `status`, last_exec_status, extra_data - select distinct @@ -103,13 +103,13 @@ delete from dataset_table_task where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table_task - + insert into dataset_table_task (id, table_id, `name`, `type`, start_time, rate, cron, `end`, end_time, @@ -121,7 +121,7 @@ #{createTime,jdbcType=BIGINT}, #{lastExecTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, #{lastExecStatus,jdbcType=VARCHAR}, #{extraData,jdbcType=VARCHAR}) - + insert into dataset_table_task @@ -212,7 +212,7 @@ - select count(*) from dataset_table_task @@ -288,7 +288,7 @@ - + update dataset_table_task @@ -333,7 +333,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table_task set table_id = #{tableId,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.java similarity index 86% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.java index 5a8a153..aa9b7ac 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.java @@ -1,8 +1,9 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.DatasetTableUnion; -import io.dataease.base.domain.DatasetTableUnionExample; +import com.ipsos.base.domain.DatasetTableUnion; +import com.ipsos.base.domain.DatasetTableUnionExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasetTableUnionMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.xml similarity index 92% rename from backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.xml index a049282..83f1e24 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasetTableUnionMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasetTableUnionMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -74,7 +74,7 @@ id, source_table_id, source_table_field_id, source_union_relation, target_table_id, target_table_field_id, target_union_relation, create_by, create_time - select distinct @@ -98,13 +98,13 @@ delete from dataset_table_union where id = #{id,jdbcType=VARCHAR} - + delete from dataset_table_union - + insert into dataset_table_union (id, source_table_id, source_table_field_id, source_union_relation, target_table_id, target_table_field_id, target_union_relation, create_by, create_time @@ -114,7 +114,7 @@ #{targetUnionRelation,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT} ) - + insert into dataset_table_union @@ -175,7 +175,7 @@ - select count(*) from dataset_table_union @@ -231,7 +231,7 @@ - + update dataset_table_union @@ -261,7 +261,7 @@ where id = #{id,jdbcType=VARCHAR} - + update dataset_table_union set source_table_id = #{sourceTableId,jdbcType=VARCHAR}, source_table_field_id = #{sourceTableFieldId,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.java b/backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.java similarity index 88% rename from backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.java index 131bfd5..bbd558f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.java @@ -1,8 +1,10 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; + +import com.ipsos.base.domain.Datasource; +import com.ipsos.base.domain.DatasourceExample; -import io.dataease.base.domain.Datasource; -import io.dataease.base.domain.DatasourceExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface DatasourceMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.xml index 67713c4..a3fea0f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/DatasourceMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/DatasourceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -11,7 +11,7 @@ - + @@ -78,7 +78,7 @@ configuration - select distinct @@ -94,7 +94,7 @@ order by ${orderByClause} - select distinct @@ -120,13 +120,13 @@ delete from datasource where id = #{id,jdbcType=VARCHAR} - + delete from datasource - + insert into datasource (id, `name`, `desc`, `type`, create_time, update_time, create_by, `status`, configuration @@ -136,7 +136,7 @@ #{createBy,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{configuration,jdbcType=LONGVARCHAR} ) - + insert into datasource @@ -197,7 +197,7 @@ - select count(*) from datasource @@ -267,7 +267,7 @@ - + update datasource @@ -297,7 +297,7 @@ where id = #{id,jdbcType=VARCHAR} - + update datasource set `name` = #{name,jdbcType=VARCHAR}, `desc` = #{desc,jdbcType=VARCHAR}, @@ -309,7 +309,7 @@ configuration = #{configuration,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=VARCHAR} - + update datasource set `name` = #{name,jdbcType=VARCHAR}, `desc` = #{desc,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/FileContentMapper.java b/backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.java similarity index 88% rename from backend/src/main/java/io/dataease/base/mapper/FileContentMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.java index a78261d..6f78ca1 100644 --- a/backend/src/main/java/io/dataease/base/mapper/FileContentMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.FileContent; -import io.dataease.base.domain.FileContentExample; +import com.ipsos.base.domain.FileContent; +import com.ipsos.base.domain.FileContentExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/FileContentMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.xml similarity index 85% rename from backend/src/main/java/io/dataease/base/mapper/FileContentMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.xml index 1d2ce13..2a57060 100644 --- a/backend/src/main/java/io/dataease/base/mapper/FileContentMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/FileContentMapper.xml @@ -1,10 +1,10 @@ - - + + - + @@ -71,7 +71,7 @@ file - select distinct @@ -87,7 +87,7 @@ order by ${orderByClause} - select distinct @@ -113,17 +113,17 @@ delete from file_content where file_id = #{fileId,jdbcType=VARCHAR} - + delete from file_content - + insert into file_content (file_id, file) values (#{fileId,jdbcType=VARCHAR}, #{file,jdbcType=LONGVARBINARY}) - + insert into file_content @@ -142,7 +142,7 @@ - select count(*) from file_content @@ -177,7 +177,7 @@ - + update file_content @@ -186,7 +186,7 @@ where file_id = #{fileId,jdbcType=VARCHAR} - + update file_content set file = #{file,jdbcType=LONGVARBINARY} where file_id = #{fileId,jdbcType=VARCHAR} diff --git a/backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.java b/backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.java similarity index 86% rename from backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.java index d59b057..2b859f1 100644 --- a/backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.java @@ -1,7 +1,7 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.FileMetadata; -import io.dataease.base.domain.FileMetadataExample; +import com.ipsos.base.domain.FileMetadata; +import com.ipsos.base.domain.FileMetadataExample; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.xml similarity index 90% rename from backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.xml index 09fc643..3c225f6 100644 --- a/backend/src/main/java/io/dataease/base/mapper/FileMetadataMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/FileMetadataMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -70,7 +70,7 @@ id, name, type, create_time, update_time, size - select distinct @@ -94,13 +94,13 @@ delete from file_metadata where id = #{id,jdbcType=VARCHAR} - + delete from file_metadata - + insert into file_metadata (id, name, type, create_time, update_time, size ) @@ -108,7 +108,7 @@ #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{size,jdbcType=BIGINT} ) - + insert into file_metadata @@ -151,7 +151,7 @@ - select count(*) from file_metadata @@ -195,7 +195,7 @@ - + update file_metadata @@ -216,7 +216,7 @@ where id = #{id,jdbcType=VARCHAR} - + update file_metadata set name = #{name,jdbcType=VARCHAR}, type = #{type,jdbcType=VARCHAR}, diff --git a/backend/src/main/java/io/dataease/base/mapper/LicenseMapper.java b/backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.java similarity index 95% rename from backend/src/main/java/io/dataease/base/mapper/LicenseMapper.java rename to backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.java index 4fcada9..249a714 100644 --- a/backend/src/main/java/io/dataease/base/mapper/LicenseMapper.java +++ b/backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.java @@ -1,8 +1,9 @@ -package io.dataease.base.mapper; +package com.ipsos.base.mapper; -import io.dataease.base.domain.License; -import io.dataease.base.domain.LicenseExample; +import com.ipsos.base.domain.License; +import com.ipsos.base.domain.LicenseExample; import java.util.List; + import org.apache.ibatis.annotations.Param; public interface LicenseMapper { diff --git a/backend/src/main/java/io/dataease/base/mapper/LicenseMapper.xml b/backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.xml similarity index 91% rename from backend/src/main/java/io/dataease/base/mapper/LicenseMapper.xml rename to backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.xml index 0ce7f6e..fc6876f 100644 --- a/backend/src/main/java/io/dataease/base/mapper/LicenseMapper.xml +++ b/backend/src/main/java/com/ipsos/base/mapper/LicenseMapper.xml @@ -1,7 +1,7 @@ - - + + id, update_time, license, f2c_license - - + - + - diff --git a/backend/src/main/resources/logback.xml b/backend/src/main/resources/logback.xml index aa6ef3e..e8165e7 100644 --- a/backend/src/main/resources/logback.xml +++ b/backend/src/main/resources/logback.xml @@ -146,18 +146,18 @@ - + - + - + diff --git a/dataease-server.iml1 b/dataease-server.iml1 deleted file mode 100644 index f409c0e..0000000 --- a/dataease-server.iml1 +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/frontend/pom.xml b/frontend/pom.xml index 730ee5a..523c4e1 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - dataease-server - io.dataease + ipsos-bi-server + com.ipsos 1.3.0 diff --git a/plugins/.gitignore b/plugins/.gitignore new file mode 100644 index 0000000..287b448 --- /dev/null +++ b/plugins/.gitignore @@ -0,0 +1,57 @@ +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +/.idea/ +target/ +*.iml +.DS_Store +node_modules +/dist +node/ + +# local env files +.env.demo +.env.*.local + +# Log files +npm-debug.log* +yarn-debug.log* +yarn-error.log* +pnpm-debug.log* + +# Editor directories and files +.idea +.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? +*.lock +*.classpath +*.project +.settings/ +.lh +.factorypath + +package-lock.json diff --git a/plugins/plugin-common/pom.xml b/plugins/plugin-common/pom.xml new file mode 100644 index 0000000..b0d472e --- /dev/null +++ b/plugins/plugin-common/pom.xml @@ -0,0 +1,35 @@ + + + + com.ipsos + plugins + 1.3-LOCAL + + 4.0.0 + + plugin-common + + + + + src/main/java + + **/*.properties + **/*.xml + + false + + + src/main/resources + + **/* + + false + + + + + + diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/annotation/PluginResultMap.java b/plugins/plugin-common/src/main/java/com/ipsos/common/annotation/PluginResultMap.java new file mode 100644 index 0000000..a4926b4 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/annotation/PluginResultMap.java @@ -0,0 +1,12 @@ +package com.ipsos.common.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface PluginResultMap { + String value() default ""; +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginParamConstants.java b/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginParamConstants.java new file mode 100644 index 0000000..2379657 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginParamConstants.java @@ -0,0 +1,148 @@ +package com.ipsos.common.constants; + +public interface PluginParamConstants { + + String getValue(); + + public enum Type implements PluginParamConstants { + + PASSWORD("password"), + TEXT("text"), + JSON("json"); + + private String value; + + Type(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + + public enum Classify implements PluginParamConstants { + MAIL("smtp"), + BASE("base"), + LDAP("ldap"), + REGISTRY("registry"); + + private String value; + + Classify(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + + + public enum Registry implements PluginParamConstants { + URL("registry.url"), + REPO("registry.repo"), + USERNAME("registry.username"), + PASSWORD("registry.password"); + + private String value; + + Registry(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + } + + public enum I18n implements PluginParamConstants { + + LANGUAGE("i18n.language"); + + private String value; + + I18n(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + } + + enum MAIL implements PluginParamConstants{ + SERVER("smtp.host"), + PORT("smtp.port"), + ACCOUNT("smtp.account"), + PASSWORD("smtp.password"), + SSL("smtp.ssl"), + TLS("smtp.tls"), + RECIPIENTS("smtp.recipient"); + + private String value; + + private MAIL(String value) { + this.value = value; + } + + public String getValue() { + return this.value; + } + } + + public enum BASE implements PluginParamConstants { + URL("base.url"), + CONCURRENCY("base.concurrency"), + PROMETHEUS_HOST("base.prometheus.host"); + + private String value; + + private BASE(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + } + + public enum LDAP implements PluginParamConstants { + URL("ldap.url"), + DN("ldap.dn"), + PASSWORD("ldap.password"), + OU("ldap.ou"), + FILTER("ldap.filter"), + MAPPING("ldap.mapping"), + OPEN("ldap.open"); + + private String value; + + LDAP(String value) { + this.value = value; + } + + @Override + public String getValue() { + return value; + } + } + +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginSystemConstants.java b/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginSystemConstants.java new file mode 100644 index 0000000..ad933be --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/constants/PluginSystemConstants.java @@ -0,0 +1,16 @@ +package com.ipsos.common.constants; + +public class PluginSystemConstants { + + public static final class WITH_EXTEND{ + public final static String NOW = "now"; + public final static String PARENT = "parent"; + public final static String CHILDREN = "children"; + } + + + public static final class PRIVILEGE_VALUE{ + public final static Integer ON = 1; + public final static Integer OFF = 0; + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSimpleTreeNode.java b/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSimpleTreeNode.java new file mode 100644 index 0000000..8000977 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSimpleTreeNode.java @@ -0,0 +1,14 @@ +package com.ipsos.common.dto; + +import com.ipsos.common.annotation.PluginResultMap; +import lombok.Data; +import java.io.Serializable; + +@Data +@PluginResultMap +public class PluginSimpleTreeNode implements Serializable { + + private Long id; + + private Long pid; +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSysMenu.java b/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSysMenu.java new file mode 100644 index 0000000..a978c9f --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/dto/PluginSysMenu.java @@ -0,0 +1,71 @@ +package com.ipsos.common.dto; + +import lombok.Data; + +import java.util.Objects; + +@Data +public class PluginSysMenu { + + private Long menuId; + + private Long pid; + + private Integer subCount; + + private Integer type; + + private String title; + + private String name; + + private String component; + + private Integer menuSort; + + private String icon; + + private String path; + + private Boolean iFrame; + + private Boolean cache; + + private Boolean hidden; + + private String permission; + + private String createBy; + + private String updateBy; + + private Long createTime; + + private Long updateTime; + + private boolean noLayout; + + private static final long serialVersionUID = 1L; + + /** + * 由于该类型作为HashSet key所以必须重写以下方法 + * @param o + * @return + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PluginSysMenu menu = (PluginSysMenu) o; + return Objects.equals(menuId, menu.menuId); + } + + @Override + public int hashCode() { + return Objects.hash(menuId); + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackConditionEntity.java b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackConditionEntity.java new file mode 100644 index 0000000..1f637cb --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackConditionEntity.java @@ -0,0 +1,17 @@ +package com.ipsos.common.entity; + +import com.ipsos.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; + +@Data +@PluginResultMap +public class XpackConditionEntity implements Serializable { + + private String field; + + private String operator; + + private Object value; +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridExample.java b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridExample.java new file mode 100644 index 0000000..cc1c222 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridExample.java @@ -0,0 +1,271 @@ +package com.ipsos.common.entity; + +import com.ipsos.common.annotation.PluginResultMap; +import org.springframework.util.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +@PluginResultMap +public class XpackGridExample { + + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + protected String extendCondition; + + public XpackGridExample() { + oredCriteria = new ArrayList(); + } + + public String getExtendCondition() { + return extendCondition; + } + + public void setExtendCondition(String extendCondition) { + this.extendCondition = extendCondition; + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + + + public Criteria addCondtion(XpackConditionEntity conditionEntity){ + String field = conditionEntity.getField(); + Object value = conditionEntity.getValue(); + String operator = conditionEntity.getOperator(); + if (StringUtils.isEmpty(operator)) + operator = "like"; + switch (operator){ + case "eq": + addCriterion(field+" = ", value, field); + break; + case "ne": + addCriterion(field+" <> ", value, field); + break; + case "like": + addCriterion(field+" like ", "%"+value+"%", field); + break; + case "not like": + addCriterion(field+" not like ", "%"+value+"%", field); + break; + case "in": + List invalues = (List)value; + addCriterion(field+" in", invalues, field); + break; + case "not in": + List notinvalues = (List)value; + addCriterion(field+" not in", notinvalues, field); + break; + case "between": + List values = (List)value; + Object v1 = values.get(0); + Object v2 = values.get(1); + addCriterion(field+" between", v1, v2, field); + break; + case "gt": + addCriterion(field+" > ", value, field); + break; + case "ge": + addCriterion(field+" >= ", value, field); + break; + case "lt": + addCriterion(field+" < ", value, field); + break; + case "le": + addCriterion(field+" <= ", value, field); + break; + } + return (Criteria) this; + } + + + + + + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridRequest.java b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridRequest.java new file mode 100644 index 0000000..c03d193 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackGridRequest.java @@ -0,0 +1,29 @@ +package com.ipsos.common.entity; + +import lombok.Data; +import org.springframework.util.CollectionUtils; + +import java.io.Serializable; +import java.util.List; + +@Data +public class XpackGridRequest implements Serializable { + + private List conditions; + + private List orders; + + public XpackGridExample convertExample(){ + XpackGridExample gridExample = new XpackGridExample(); + if (!CollectionUtils.isEmpty(conditions)){ + XpackGridExample.Criteria criteria = gridExample.createCriteria(); + conditions.forEach(criteria::addCondtion); + } + if (!CollectionUtils.isEmpty(orders)) { + String orderByClause = String.join(", ", orders); + gridExample.setOrderByClause(orderByClause); + } + + return gridExample; + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java new file mode 100644 index 0000000..eada3ce --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/entity/XpackLdapUserEntity.java @@ -0,0 +1,19 @@ +package com.ipsos.common.entity; + +import lombok.Data; + +@Data +public class XpackLdapUserEntity { + /* + private String userName; + + private String nickName; + */ + + private String username; + + private String nickname; + + private String email; + +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.java b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.java new file mode 100644 index 0000000..f8dad3d --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.java @@ -0,0 +1,4 @@ +package com.ipsos.common.mapper; + +public interface PluginGridSql { +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml new file mode 100644 index 0000000..5ad7e7e --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/mapper/PluginGridSql.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginComponentService.java b/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginComponentService.java new file mode 100644 index 0000000..d31d85f --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginComponentService.java @@ -0,0 +1,21 @@ +package com.ipsos.common.service; + +import java.io.InputStream; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + +public abstract class PluginComponentService { + + public abstract List components(); + + protected abstract InputStream readContent(String name); + + public InputStream vueResource(String name) { + if (StringUtils.isEmpty(name)) return null; + if (!name.endsWith(".js")) name += ".js"; + + return readContent(name); + } + +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginMenuService.java b/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginMenuService.java new file mode 100644 index 0000000..2c93e74 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/service/PluginMenuService.java @@ -0,0 +1,24 @@ +package com.ipsos.common.service; + +import com.ipsos.common.dto.PluginSysMenu; +import org.springframework.util.StringUtils; + +import java.io.InputStream; +import java.util.List; + +public abstract class PluginMenuService { + + public abstract List menus(); + + + protected abstract InputStream readContent(String name); + + public InputStream vueResource(String name) { + if (StringUtils.isEmpty(name)) return null; + if (!name.endsWith(".js")) name += ".js"; + + return readContent(name); + } + + +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/util/BeanUtils.java b/plugins/plugin-common/src/main/java/com/ipsos/common/util/BeanUtils.java new file mode 100644 index 0000000..6af984f --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/util/BeanUtils.java @@ -0,0 +1,82 @@ +package com.ipsos.common.util; + +import org.springframework.util.StringUtils; + +import java.lang.reflect.Method; +import java.util.Map; + +public class BeanUtils { + + public static T copyBean(T target, Object source) { + try { + org.springframework.beans.BeanUtils.copyProperties(source, target); + return target; + } catch (Exception e) { + throw new RuntimeException("Failed to copy object: ", e); + } + } + + public static T copyBean(T target, Object source, String... ignoreProperties) { + try { + org.springframework.beans.BeanUtils.copyProperties(source, target, ignoreProperties); + return target; + } catch (Exception e) { + throw new RuntimeException("Failed to copy object: ", e); + } + } + + public static T mapToBean(Map map, Class beanClass) { + if (map == null) return null; + + T obj = null; + try { + obj = beanClass.newInstance(); + org.apache.commons.beanutils.BeanUtils.populate(obj, map); + return obj; + } catch (Exception e) { + throw new RuntimeException("Failed to copy object: ", e); + } + } + + public static Object getFieldValueByName(String fieldName, Object bean) { + try { + if (StringUtils.isEmpty(fieldName)) { + return null; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String getter = "get" + firstLetter + fieldName.substring(1); + Method method = bean.getClass().getMethod(getter); + return method.invoke(bean); + } catch (Exception e) { + // LogUtil.error("failed to getFieldValueByName. ", e); + return null; + } + } + + public static void setFieldValueByName(Object bean, String fieldName, Object value, Class type) { + try { + if (StringUtils.isEmpty(fieldName)) { + return; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String setter = "set" + firstLetter + fieldName.substring(1); + Method method = bean.getClass().getMethod(setter, type); + method.invoke(bean, value); + } catch (Exception e) { + // LogUtil.error("failed to setFieldValueByName. ", e); + } + } + + public static Method getMethod(Object bean, String fieldName, Class type) { + try { + if (StringUtils.isEmpty(fieldName)) { + return null; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String setter = "set" + firstLetter + fieldName.substring(1); + return bean.getClass().getMethod(setter, type); + } catch (Exception e) { + return null; + } + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/util/CodingUtil.java b/plugins/plugin-common/src/main/java/com/ipsos/common/util/CodingUtil.java new file mode 100644 index 0000000..fe703e5 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/util/CodingUtil.java @@ -0,0 +1,164 @@ +package com.ipsos.common.util; + + + +import org.apache.commons.codec.binary.Base64; +import org.springframework.util.StringUtils; + +import javax.crypto.*; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.security.MessageDigest; + +public class CodingUtil { + + private static final String UTF_8 = "UTF-8"; + + private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + /** + * MD5加密 + * + * @param src 要加密的串 + * @return 加密后的字符串 + */ + public static String md5(String src) { + return md5(src, UTF_8); + } + + /** + * MD5加密 + * + * @param src 要加密的串 + * @param charset 加密字符集 + * @return 加密后的字符串 + */ + public static String md5(String src, String charset) { + try { + byte[] strTemp = StringUtils.isEmpty(charset) ? src.getBytes() : src.getBytes(charset); + MessageDigest mdTemp = MessageDigest.getInstance("MD5"); + mdTemp.update(strTemp); + + byte[] md = mdTemp.digest(); + int j = md.length; + char[] str = new char[j * 2]; + int k = 0; + + for (byte byte0 : md) { + str[k++] = HEX_DIGITS[byte0 >>> 4 & 0xf]; + str[k++] = HEX_DIGITS[byte0 & 0xf]; + } + + return new String(str); + } catch (Exception e) { + throw new RuntimeException("MD5 encrypt error:", e); + } + } + + /** + * BASE64解密 + * + * @param src 待解密的字符串 + * @return 解密后的字符串 + */ + public static String base64Decoding(String src) { + byte[] b; + String result = null; + if (src != null) { + try { + b = Base64.decodeBase64(src); + result = new String(b, UTF_8); + } catch (Exception e) { + throw new RuntimeException("BASE64 decoding error:", e); + } + } + return result; + } + + /** + * BASE64加密 + * + * @param src 待加密的字符串 + * @return 加密后的字符串 + */ + public static String base64Encoding(String src) { + String result = null; + if (src != null) { + try { + result = Base64.encodeBase64String(src.getBytes(UTF_8)); + } catch (Exception e) { + throw new RuntimeException("BASE64 encoding error:", e); + } + } + return result; + } + + /** + * AES加密 + * + * @param src 待加密字符串 + * @param secretKey 密钥 + * @param iv 向量 + * @return 加密后字符串 + */ + public static String aesEncrypt(String src, String secretKey, String iv) { + if (StringUtils.isEmpty(secretKey)) { + throw new RuntimeException("secretKey is empty"); + } + + try { + byte[] raw = secretKey.getBytes(UTF_8); + SecretKeySpec secretKeySpec = new SecretKeySpec(raw, "AES"); + // "算法/模式/补码方式" ECB + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + IvParameterSpec iv1 = new IvParameterSpec(iv.getBytes()); + cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, iv1); + byte[] encrypted = cipher.doFinal(src.getBytes(UTF_8)); + return Base64.encodeBase64String(encrypted); + } catch (Exception e) { + throw new RuntimeException("AES encrypt error:", e); + } + + } + + /** + * AES 解密 + * + * @param src 待解密字符串 + * @param secretKey 密钥 + * @param iv 向量 + * @return 解密后字符串 + */ + public static String aesDecrypt(String src, String secretKey, String iv) { + if (StringUtils.isEmpty(secretKey)) { + throw new RuntimeException("secretKey is empty"); + } + try { + byte[] raw = secretKey.getBytes(UTF_8); + SecretKeySpec secretKeySpec = new SecretKeySpec(raw, "AES"); + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + IvParameterSpec iv1 = new IvParameterSpec(iv.getBytes()); + cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, iv1); + byte[] encrypted1 = Base64.decodeBase64(src); + byte[] original = cipher.doFinal(encrypted1); + return new String(original, UTF_8); + } catch (BadPaddingException | IllegalBlockSizeException e) { + // 解密的原字符串为非加密字符串，则直接返回原字符串 + return src; + } catch (Exception e) { + throw new RuntimeException("decrypt error，please check parameters", e); + } + } + + public static String secretKey() { + try { + KeyGenerator keyGen = KeyGenerator.getInstance("AES"); + keyGen.init(128); + SecretKey secretKey = keyGen.generateKey(); + return Base64.encodeBase64String(secretKey.getEncoded()); + } catch (Exception e) { + throw new RuntimeException("generate secretKey error", e); + } + + } +} diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/util/EncryptUtils.java b/plugins/plugin-common/src/main/java/com/ipsos/common/util/EncryptUtils.java new file mode 100644 index 0000000..ad9d579 --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/util/EncryptUtils.java @@ -0,0 +1,42 @@ +package com.ipsos.common.util; + +import java.util.List; +import java.util.stream.Collectors; + +public class EncryptUtils extends CodingUtil { + + private static final String secretKey = "www.fit2cloud.co"; + private static final String iv = "1234567890123456"; + + + public static Object aesEncrypt(Object o) { + if (o == null) { + return null; + } + return aesEncrypt(o.toString(), secretKey, iv); + } + + public static Object aesDecrypt(Object o) { + if (o == null) { + return null; + } + return aesDecrypt(o.toString(), secretKey, iv); + } + + public static Object aesDecrypt(List o, String attrName) { + if (o == null) { + return null; + } + return o.stream() + .filter(element -> BeanUtils.getFieldValueByName(attrName, element) != null) + .peek(element -> BeanUtils.setFieldValueByName(element, attrName, aesDecrypt(BeanUtils.getFieldValueByName(attrName, element).toString(), secretKey, iv), String.class)) + .collect(Collectors.toList()); + } + + public static Object md5Encrypt(Object o) { + if (o == null) { + return null; + } + return md5(o.toString()); + } +} \ No newline at end of file diff --git a/plugins/plugin-common/src/main/java/com/ipsos/common/util/PluginCommonUtil.java b/plugins/plugin-common/src/main/java/com/ipsos/common/util/PluginCommonUtil.java new file mode 100644 index 0000000..483a4aa --- /dev/null +++ b/plugins/plugin-common/src/main/java/com/ipsos/common/util/PluginCommonUtil.java @@ -0,0 +1,119 @@ +package com.ipsos.common.util; + +import org.springframework.util.StringUtils; + +import java.io.*; +import java.lang.reflect.Method; + +public class PluginCommonUtil { + + public static String readFileContent(File file) { + BufferedReader reader = null; + StringBuffer sbf = new StringBuffer(); + try { + reader = new BufferedReader(new FileReader(file)); + String tempStr; + while ((tempStr = reader.readLine()) != null) { + sbf.append(tempStr); + } + reader.close(); + return sbf.toString(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + return sbf.toString(); + } + + public static String readStreamContent(InputStream in) throws Exception{ + BufferedReader reader = null; + StringBuffer sbf = new StringBuffer(); + try { + reader = new BufferedReader(new InputStreamReader(in)); + String tempStr; + while ((tempStr = reader.readLine()) != null) { + tempStr += "\n"; + sbf.append(tempStr); + } + reader.close(); + return sbf.toString(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + return sbf.toString(); + } + + public static T copyBean(T target, Object source) { + try { + org.springframework.beans.BeanUtils.copyProperties(source, target); + return target; + } catch (Exception e) { + throw new RuntimeException("Failed to copy object: ", e); + } + } + + public static T copyBean(T target, Object source, String... ignoreProperties) { + try { + org.springframework.beans.BeanUtils.copyProperties(source, target, ignoreProperties); + return target; + } catch (Exception e) { + throw new RuntimeException("Failed to copy object: ", e); + } + } + + public static Object getFieldValueByName(String fieldName, Object bean) { + try { + if (StringUtils.isEmpty(fieldName)) { + return null; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String getter = "get" + firstLetter + fieldName.substring(1); + Method method = bean.getClass().getMethod(getter); + return method.invoke(bean); + } catch (Exception e) { + return null; + } + } + + public static void setFieldValueByName(Object bean, String fieldName, Object value, Class type) { + try { + if (StringUtils.isEmpty(fieldName)) { + return; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String setter = "set" + firstLetter + fieldName.substring(1); + Method method = bean.getClass().getMethod(setter, type); + method.invoke(bean, value); + } catch (Exception e) { + } + } + + public static Method getMethod(Object bean, String fieldName, Class type) { + try { + if (StringUtils.isEmpty(fieldName)) { + return null; + } + String firstLetter = fieldName.substring(0, 1).toUpperCase(); + String setter = "set" + firstLetter + fieldName.substring(1); + return bean.getClass().getMethod(setter, type); + } catch (Exception e) { + return null; + } + } + +} diff --git a/plugins/plugin-filter/pom.xml b/plugins/plugin-filter/pom.xml new file mode 100644 index 0000000..c683531 --- /dev/null +++ b/plugins/plugin-filter/pom.xml @@ -0,0 +1,15 @@ + + + + com.ipsos + plugins + 1.3-LOCAL + + 4.0.0 + + plugin-filter + + + diff --git a/plugins/plugin-interface/pom.xml b/plugins/plugin-interface/pom.xml new file mode 100644 index 0000000..017e98a --- /dev/null +++ b/plugins/plugin-interface/pom.xml @@ -0,0 +1,24 @@ + + + + com.ipsos + plugins + 1.3-LOCAL + + 4.0.0 + jar + plugin-interface + + + + io.dataease + dataease-plugin-common + 1.3 + + + + + + diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java new file mode 100644 index 0000000..0c1faa1 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackBaseTreeRequest.java @@ -0,0 +1,35 @@ +package com.ipsos.plugins.xpack.auth.dto.request; + +import io.dataease.plugins.common.constants.PluginSystemConstants; +import lombok.Data; + +@Data +public class XpackBaseTreeRequest { + + private String id; + + private String name; + + //授权资源类型 eg：chart role + private String modelType; + + //pid 为0 时 查询的是顶级节点 SQL需要相应的处理 + private String pid; + + //now 返回当前条件查询的数据 parent 返回当前数据查询的数据同时递归父节点数据; children 返回当前数据查询的数据同时递归子节点数据 + private String withExtend= PluginSystemConstants.WITH_EXTEND.NOW; + + private String createBy; + + private String withAuth;//需要根据权限返回 + + + public XpackBaseTreeRequest() { + } + + public XpackBaseTreeRequest(String id,String modelType, String withExtend) { + this.id = id; + this.modelType = modelType; + this.withExtend = withExtend; + } +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackSysAuthRequest.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackSysAuthRequest.java new file mode 100644 index 0000000..6cb7dbf --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/request/XpackSysAuthRequest.java @@ -0,0 +1,17 @@ +package com.ipsos.plugins.xpack.auth.dto.request; + +import com.ipsos.plugins.xpack.auth.dto.response.XpackSysAuth; +import com.ipsos.plugins.xpack.auth.dto.response.XpackSysAuthDetail; +import lombok.Data; + +import java.util.List; + +@Data +public class XpackSysAuthRequest extends XpackSysAuth { + + private List authSources; + + private List authTargets; + + private XpackSysAuthDetail authDetail; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java new file mode 100644 index 0000000..66fe0ec --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuth.java @@ -0,0 +1,32 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +@PluginResultMap +public class XpackSysAuth implements Serializable { + + private String id; + + private String authSource; + + private String authSourceType; + + private String authTarget; + + private String authTargetType; + + private Long authTime; + + private String authDetails; + + private String authUser; + + private Date updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java new file mode 100644 index 0000000..14f602b --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDTO.java @@ -0,0 +1,14 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.util.List; + +@Data +@PluginResultMap +public class XpackSysAuthDTO extends XpackSysAuth{ + + private List sysAuthDetails; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java new file mode 100644 index 0000000..cdb7b67 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetail.java @@ -0,0 +1,34 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; + +@Data +@PluginResultMap +public class XpackSysAuthDetail implements Serializable { + + private String id; + + private String authId; + + private String privilegeName; + + private Integer privilegeType; + + private Integer privilegeValue; + + private String privilegeExtend; + + private String remark; + + private String createUser; + + private Long createTime; + + private Long updateTime; + + private static final long serialVersionUID = 1L; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java new file mode 100644 index 0000000..de3c9ea --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackSysAuthDetailDTO.java @@ -0,0 +1,21 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +/** + * Author: wangjiahao + * Date: 2021-06-03 + * Description: + */ +@Data +@PluginResultMap +public class XpackSysAuthDetailDTO extends XpackSysAuthDetail{ + private String authSource; + + private String authSourceType; + + private String authTarget; + + private String authTargetType; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java new file mode 100644 index 0000000..96390fa --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModel.java @@ -0,0 +1,31 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; + +@Data +@PluginResultMap +public class XpackVAuthModel implements Serializable { + + private String id; + + private String name; + + private String label; + + private String pid; + + private String nodeType; + + private String modelType; + + private String modelInnerType; + + private String authType; + + private String createBy; + + private static final long serialVersionUID = 1L; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java new file mode 100644 index 0000000..2bb6854 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/dto/response/XpackVAuthModelDTO.java @@ -0,0 +1,19 @@ +package com.ipsos.plugins.xpack.auth.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.util.List; + +@Data +@PluginResultMap +public class XpackVAuthModelDTO extends XpackVAuthModel{ + + private List children; + + private Boolean leaf; + + private Integer childrenCount; + + private Boolean hasChildren; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java new file mode 100644 index 0000000..d19a544 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/auth/service/AuthXpackService.java @@ -0,0 +1,22 @@ +package com.ipsos.plugins.xpack.auth.service; + +import com.ipsos.plugins.xpack.auth.dto.response.XpackVAuthModelDTO; +import io.dataease.plugins.common.service.PluginMenuService; +import com.ipsos.plugins.xpack.auth.dto.request.XpackBaseTreeRequest; +import com.ipsos.plugins.xpack.auth.dto.request.XpackSysAuthRequest; +import com.ipsos.plugins.xpack.auth.dto.response.XpackSysAuthDetail; +import com.ipsos.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO; + +import java.util.List; +import java.util.Map; + +public abstract class AuthXpackService extends PluginMenuService { + + public abstract List searchAuthModelTree(XpackBaseTreeRequest request, Long userId, Boolean isAdmin); + + public abstract Map> searchAuthDetails(XpackSysAuthRequest request); + + public abstract List searchAuthDetailsModel(String authType); + + public abstract void authChange(XpackSysAuthRequest request, Long userId, String userName, Boolean isAdmin); +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackCreateDept.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackCreateDept.java new file mode 100644 index 0000000..dfb2007 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackCreateDept.java @@ -0,0 +1,10 @@ +package com.ipsos.plugins.xpack.dept.dto.request; + +import com.ipsos.plugins.xpack.dept.dto.response.XpackSysDept; +import lombok.Data; + +@Data +public class XpackCreateDept extends XpackSysDept { + + private boolean top; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackDeleteDept.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackDeleteDept.java new file mode 100644 index 0000000..fe3de3e --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackDeleteDept.java @@ -0,0 +1,12 @@ +package com.ipsos.plugins.xpack.dept.dto.request; + + +import lombok.Data; + +@Data +public class XpackDeleteDept { + private Long deptId; + + private Long pid; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackMoveDept.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackMoveDept.java new file mode 100644 index 0000000..814d193 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/request/XpackMoveDept.java @@ -0,0 +1,13 @@ +package com.ipsos.plugins.xpack.dept.dto.request; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class XpackMoveDept implements Serializable { + + private Long resourceId; + + private Long targetId; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackDeptTreeNode.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackDeptTreeNode.java new file mode 100644 index 0000000..e17299a --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackDeptTreeNode.java @@ -0,0 +1,27 @@ +package com.ipsos.plugins.xpack.dept.dto.response; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class XpackDeptTreeNode implements Serializable { + + private Long id; + + private String label; + + private Boolean hasChildren; + + private List children; + + public List toList(){ + List lists = new ArrayList<>(); + lists.add(this); + return lists; + } +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java new file mode 100644 index 0000000..c4e8a31 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/dto/response/XpackSysDept.java @@ -0,0 +1,30 @@ +package com.ipsos.plugins.xpack.dept.dto.response; + + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +@Data +@PluginResultMap +public class XpackSysDept { + + private Long deptId; + + private Long pid; + + private Integer subCount; + + private String name; + + private Integer deptSort; + + private String createBy; + + private String updateBy; + + private Long createTime; + + private Long updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java new file mode 100644 index 0000000..3ce7b51 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/dept/service/DeptXpackService.java @@ -0,0 +1,28 @@ +package com.ipsos.plugins.xpack.dept.service; + +import com.ipsos.plugins.xpack.dept.dto.request.XpackCreateDept; +import com.ipsos.plugins.xpack.dept.dto.request.XpackDeleteDept; +import com.ipsos.plugins.xpack.dept.dto.request.XpackMoveDept; +import com.ipsos.plugins.xpack.dept.dto.response.XpackDeptTreeNode; +import com.ipsos.plugins.xpack.dept.dto.response.XpackSysDept; +import io.dataease.plugins.common.entity.XpackGridRequest; +import io.dataease.plugins.common.service.PluginMenuService; + +import java.util.List; + +public abstract class DeptXpackService extends PluginMenuService { + + public abstract List nodesByPid(Long pid); + + public abstract List nodesTreeByCondition(XpackGridRequest request); + + public abstract List searchTree(Long deptId); + + public abstract int add(XpackCreateDept xpackCreateDept); + + public abstract int update(XpackCreateDept xpackCreateDept); + + public abstract int batchDelete(List requests); + + public abstract void move(XpackMoveDept xpackMoveDept); +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/dto/response/SysSettingDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/dto/response/SysSettingDto.java new file mode 100644 index 0000000..6e0125e --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/dto/response/SysSettingDto.java @@ -0,0 +1,21 @@ +package com.ipsos.plugins.xpack.display.dto.response; + +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +@Data +public class SysSettingDto { + + private String paramKey; + + private String paramValue; + + private String type; + + private Integer sort; + + private MultipartFile file; + + private String fileName; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/service/DisplayXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/service/DisplayXpackService.java new file mode 100644 index 0000000..29e83f3 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/display/service/DisplayXpackService.java @@ -0,0 +1,18 @@ +package com.ipsos.plugins.xpack.display.service; + + + + +import com.ipsos.plugins.xpack.display.dto.response.SysSettingDto; +import org.springframework.web.multipart.MultipartFile; +import java.util.List; +import java.util.Map; + +/*public abstract class DisplayXpackService extends PluginMenuService {*/ +public abstract class DisplayXpackService { + + + public abstract List systemSettings(); + + public abstract Boolean save(Map> systemParameterMap, List bodyFiles); +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/request/LdapValidateRequest.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/request/LdapValidateRequest.java new file mode 100644 index 0000000..22c647f --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/request/LdapValidateRequest.java @@ -0,0 +1,23 @@ +package com.ipsos.plugins.xpack.ldap.dto.request; + +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +@Data +@Builder +public class LdapValidateRequest implements Serializable { + + private String userName; + + private String password; + + public LdapValidateRequest() { + } + + public LdapValidateRequest(String userName, String password) { + this.userName = userName; + this.password = password; + } +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/LdapInfo.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/LdapInfo.java new file mode 100644 index 0000000..f92605e --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/LdapInfo.java @@ -0,0 +1,17 @@ +package com.ipsos.plugins.xpack.ldap.dto.response; + +import java.io.Serializable; + +import lombok.Data; + +@Data +public class LdapInfo implements Serializable{ + + private String url; + private String dn; + private String password; + private String ou; + private String filter; + private String mapping; + private String open; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/ValidateResult.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/ValidateResult.java new file mode 100644 index 0000000..4c259d4 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/dto/response/ValidateResult.java @@ -0,0 +1,18 @@ +package com.ipsos.plugins.xpack.ldap.dto.response; + +import lombok.Builder; +import lombok.Data; + +import java.io.Serializable; + +@Data +@Builder +public class ValidateResult implements Serializable { + + private boolean success; + + private T data; + + private String msg; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java new file mode 100644 index 0000000..603026f --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ldap/service/LdapXpackService.java @@ -0,0 +1,28 @@ +package com.ipsos.plugins.xpack.ldap.service; + +import java.util.List; + +import com.ipsos.plugins.xpack.display.dto.response.SysSettingDto; +import com.ipsos.plugins.xpack.ldap.dto.request.LdapValidateRequest; +import com.ipsos.plugins.xpack.ldap.dto.response.LdapInfo; +import com.ipsos.plugins.xpack.ldap.dto.response.ValidateResult; +import io.dataease.plugins.common.entity.XpackLdapUserEntity; +import io.dataease.plugins.common.service.PluginMenuService; + +public abstract class LdapXpackService extends PluginMenuService{ + + public abstract LdapInfo info(); + + public abstract void save(List settings); + + public abstract void testConn(); + + public abstract void testLogin(); + + public abstract Boolean isOpen(); + + public abstract List users(); + + public abstract ValidateResult login(LdapValidateRequest request); + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOToken.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOToken.java new file mode 100644 index 0000000..3d12930 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOToken.java @@ -0,0 +1,12 @@ +package com.ipsos.plugins.xpack.oidc.dto; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SSOToken implements Serializable { + + private String accessToken; + private String idToken; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOUserInfo.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOUserInfo.java new file mode 100644 index 0000000..002afe5 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/dto/SSOUserInfo.java @@ -0,0 +1,18 @@ +package com.ipsos.plugins.xpack.oidc.dto; + + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SSOUserInfo implements Serializable { + + private String sub; + + private String username; + + private String nickName; + + private String email; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/service/OidcXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/service/OidcXpackService.java new file mode 100644 index 0000000..80d705a --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/oidc/service/OidcXpackService.java @@ -0,0 +1,26 @@ +package com.ipsos.plugins.xpack.oidc.service; + +import java.util.List; +import java.util.Map; + +import com.ipsos.plugins.xpack.display.dto.response.SysSettingDto; +import com.ipsos.plugins.xpack.oidc.dto.SSOToken; +import com.ipsos.plugins.xpack.oidc.dto.SSOUserInfo; + +public abstract class OidcXpackService { + + public abstract List oidcSettings(); + + public abstract Boolean save(List parameters); + + public Boolean isSuuportOIDC() { + return false; + } + + public abstract SSOToken requestSsoToken(Map config, String code, String state); + + public abstract SSOUserInfo requestUserInfo(Map config, String accessToken); + + public abstract void logout(String idToken); + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleDto.java new file mode 100644 index 0000000..ef7859c --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleDto.java @@ -0,0 +1,25 @@ +package com.ipsos.plugins.xpack.role.dto.response; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class XpackRoleDto implements Serializable { + + private Long roleId; + + private String name; + + private String description; + + private String createBy; + + private String updateBy; + + private Long createTime; + + private Long updateTime; + + private static final long serialVersionUID = 1L; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java new file mode 100644 index 0000000..d0848fc --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/dto/response/XpackRoleItemDto.java @@ -0,0 +1,15 @@ +package com.ipsos.plugins.xpack.role.dto.response; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; + +@PluginResultMap +@Data +public class XpackRoleItemDto implements Serializable { + + private Long id; + + private String name; +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java new file mode 100644 index 0000000..d20f9c1 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/role/service/RoleXpackService.java @@ -0,0 +1,25 @@ +package com.ipsos.plugins.xpack.role.service; + +import com.ipsos.plugins.xpack.role.dto.response.XpackRoleDto; +import com.ipsos.plugins.xpack.role.dto.response.XpackRoleItemDto; +import io.dataease.plugins.common.entity.XpackGridRequest; +import io.dataease.plugins.common.service.PluginMenuService; + +import java.util.List; + + +public abstract class RoleXpackService extends PluginMenuService { + + + + public abstract void save(XpackRoleDto dto); + + public abstract void delete(Long roleId); + + public abstract void update(XpackRoleDto dto); + + public abstract List query(XpackGridRequest request); + + public abstract List allRoles(); + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java new file mode 100644 index 0000000..97cb4f0 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/dto/request/XpackUkeyDto.java @@ -0,0 +1,24 @@ +package com.ipsos.plugins.xpack.ukey.dto.request; + +import io.dataease.plugins.common.annotation.PluginResultMap; +import lombok.Data; + +import java.io.Serializable; +@PluginResultMap +@Data +public class XpackUkeyDto implements Serializable { + + private static final long serialVersionUID = 447309072990546277L; + private Long id; + + private Long userId; + + private String accessKey; + + private String secretKey; + + private Long createTime; + + private String status; + +} diff --git a/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java new file mode 100644 index 0000000..6c3dbd4 --- /dev/null +++ b/plugins/plugin-interface/src/main/java/com/ipsos/plugins/xpack/ukey/service/UkeyXpackService.java @@ -0,0 +1,25 @@ +package com.ipsos.plugins.xpack.ukey.service; + +import com.ipsos.plugins.xpack.ukey.dto.request.XpackUkeyDto; +import io.dataease.plugins.common.service.PluginMenuService; + +import java.util.List; + +public abstract class UkeyXpackService extends PluginMenuService { + + public abstract List getUserKeysInfo(Long userId); + + public abstract XpackUkeyDto generateUserKey(Long userId); + + public abstract void deleteUserKey(Long id); + + /*public abstract void activeUserKey(Long id); + + public abstract void disableUserKey(Long id);*/ + + public abstract void switchStatus(Long id); + + public abstract XpackUkeyDto getUserKey(String accessKey); + + +} diff --git a/plugins/pom.xml b/plugins/pom.xml new file mode 100644 index 0000000..4d44568 --- /dev/null +++ b/plugins/pom.xml @@ -0,0 +1,97 @@ + + + 4.0.0 + + com.ipsos + plugins + pom + 1.3-LOCAL + + plugin-common + plugin-interface + plugin-filter + + + + spring-boot-parent + org.springframework.boot + 2.3.4.RELEASE + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + org.projectlombok + lombok + + + + org.apache.commons + commons-lang3 + + + org.apache.commons + commons-collections4 + 4.4 + + + org.apache.commons + commons-text + 1.8 + + + commons-codec + commons-codec + + + + commons-beanutils + commons-beanutils-core + 1.8.0 + + + + org.springframework.boot + spring-boot-starter-data-ldap + + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + + + + + src/main/resources + + **/*.js + **/*.xml + + false + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + diff --git a/pom.xml b/pom.xml index 1e91529..ab7f046 100644 --- a/pom.xml +++ b/pom.xml @@ -2,8 +2,8 @@ 4.0.0 - io.dataease - dataease-server + com.ipsos + ipsos-bi-server 1.3.0 pom @@ -14,9 +14,11 @@ - dataease + ipsos-bi frontend + quartz-spring-boot-starter + plugins backend diff --git a/quartz-spring-boot-starter/.gitignore b/quartz-spring-boot-starter/.gitignore new file mode 100644 index 0000000..2af7cef --- /dev/null +++ b/quartz-spring-boot-starter/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/quartz-spring-boot-starter/pom.xml b/quartz-spring-boot-starter/pom.xml new file mode 100644 index 0000000..e9a22d6 --- /dev/null +++ b/quartz-spring-boot-starter/pom.xml @@ -0,0 +1,124 @@ + + + 4.0.0 + + com.ipsos + quartz-spring-boot-starter + 0.0.7-LOCAL + jar + + quartz-spring-boot-starter + quartz spring boot starter + + + 2.3.2 + 1.8 + UTF-8 + UTF-8 + + + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework + spring-context-support + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.quartz-scheduler + quartz + ${quartz.version} + + + c3p0 + com.mchange + + + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + verify + + sign + + + + + + + --pinentry-mode + loopback + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + + org.springframework.boot + spring-boot-dependencies + 1.5.8.RELEASE + pom + import + + + + + + oss-sonatype + OSS sonatype Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + \ No newline at end of file diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzAutoConfiguration.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzAutoConfiguration.java new file mode 100644 index 0000000..702bb2a --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzAutoConfiguration.java @@ -0,0 +1,100 @@ +package com.ipsos.autoconfigure; + +import com.ipsos.quartz.QuartzInstanceIdGenerator; +import com.ipsos.quartz.SchedulerStarter; +import com.ipsos.quartz.anno.QuartzDataSource; +import com.ipsos.quartz.service.QuartzManageService; +import com.ipsos.quartz.util.QuartzBeanFactory; +import org.springframework.beans.factory.ObjectProvider; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; +import org.springframework.util.StringUtils; + +import javax.sql.DataSource; +import java.util.Properties; +import java.util.TimeZone; + +@Configuration +@EnableConfigurationProperties(QuartzProperties.class) +@AutoConfigureAfter(DataSourceAutoConfiguration.class) +public class QuartzAutoConfiguration { + private DataSource dataSource; + + private QuartzProperties properties; + + public QuartzAutoConfiguration(DataSource dataSource, @QuartzDataSource ObjectProvider quartzDataSource, QuartzProperties properties) { + this.dataSource = getDataSource(dataSource, quartzDataSource); + this.properties = properties; + } + + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(prefix = "quartz", value = "enabled", havingValue = "true") + public SchedulerStarter schedulerStarter() { + return new SchedulerStarter(); + } + + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(prefix = "quartz", value = "enabled", havingValue = "true") + public QuartzBeanFactory quartzBeanFactory() { + return new QuartzBeanFactory(); + } + + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(prefix = "quartz", value = "enabled", havingValue = "true") + public QuartzManageService quartzManageService() { + return new QuartzManageService(); + } + + @Bean + @ConditionalOnProperty(prefix = "quartz", value = "enabled", havingValue = "true") + public TimeZone quartzTimeZone() { + return TimeZone.getTimeZone(properties.getTimeZone()); + } + + private DataSource getDataSource(DataSource dataSource, + ObjectProvider quartzDataSource) { + DataSource dataSourceIfAvailable = quartzDataSource.getIfAvailable(); + return (dataSourceIfAvailable != null) ? dataSourceIfAvailable : dataSource; + } + + @Bean + @ConditionalOnClass(DataSource.class) + @ConditionalOnProperty(prefix = "quartz", value = "enabled", havingValue = "true") + public SchedulerFactoryBean clusterSchedulerFactoryBean() { + SchedulerFactoryBean schedulerFactoryBean = new SchedulerFactoryBean(); + schedulerFactoryBean.setDataSource(this.dataSource); + schedulerFactoryBean.setApplicationContextSchedulerContextKey("applicationContextKey"); + schedulerFactoryBean.setOverwriteExistingJobs(true); + schedulerFactoryBean.setStartupDelay(60);// 60 秒之后开始执行定时任务 + Properties props = new Properties(); + props.put("org.quartz.scheduler.instanceName", "clusterScheduler"); + props.put("org.quartz.scheduler.instanceId", "AUTO"); // 集群下的instanceId 必须唯一 + props.put("org.quartz.scheduler.instanceIdGenerator.class", QuartzInstanceIdGenerator.class.getName());// instanceId 生成的方式 + props.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX"); + props.put("org.quartz.jobStore.driverDelegateClass", "org.quartz.impl.jdbcjobstore.StdJDBCDelegate"); + props.put("org.quartz.jobStore.tablePrefix", "QRTZ_"); + props.put("org.quartz.jobStore.isClustered", "true"); + props.put("org.quartz.jobStore.clusterCheckinInterval", "20000"); + props.put("org.quartz.threadPool.class", "org.quartz.simpl.SimpleThreadPool"); + // thread count + String threadCount = this.properties.getThreadCount().toString(); + props.put("org.quartz.threadPool.threadCount", threadCount); + props.put("org.quartz.threadPool.threadPriority", "5"); + props.put("org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread", "true"); + schedulerFactoryBean.setQuartzProperties(props); + if (!StringUtils.isEmpty(this.properties.getSchedulerName())) { + schedulerFactoryBean.setBeanName(this.properties.getSchedulerName()); + } + return schedulerFactoryBean; + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzProperties.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzProperties.java new file mode 100644 index 0000000..10a5fe1 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/autoconfigure/QuartzProperties.java @@ -0,0 +1,58 @@ +package com.ipsos.autoconfigure; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.EnvironmentAware; +import org.springframework.core.env.Environment; + + +@ConfigurationProperties(prefix = "quartz", ignoreUnknownFields = true) +public class QuartzProperties implements EnvironmentAware, InitializingBean { + + private boolean enabled = false; + private String schedulerName; + private String timeZone = "Asia/Shanghai"; + private Integer threadCount = 10; + + public String getSchedulerName() { + return schedulerName; + } + + public void setSchedulerName(String schedulerName) { + this.schedulerName = schedulerName; + } + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public String getTimeZone() { + return timeZone; + } + + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } + + public Integer getThreadCount() { + return threadCount; + } + + public void setThreadCount(Integer threadCount) { + this.threadCount = threadCount; + } + + @Override + public void setEnvironment(Environment environment) { + + } + + @Override + public void afterPropertiesSet() throws Exception { + + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/QuartzInstanceIdGenerator.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/QuartzInstanceIdGenerator.java new file mode 100644 index 0000000..f264a8a --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/QuartzInstanceIdGenerator.java @@ -0,0 +1,17 @@ +package com.ipsos.quartz; + +import org.quartz.spi.InstanceIdGenerator; + +import java.net.InetAddress; +import java.net.UnknownHostException; + +public class QuartzInstanceIdGenerator implements InstanceIdGenerator { + @Override + public String generateInstanceId() { + try { + return InetAddress.getLocalHost().getHostName() + System.currentTimeMillis(); + } catch (UnknownHostException e) { + return "unknown-" + System.currentTimeMillis(); + } + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/SchedulerStarter.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/SchedulerStarter.java new file mode 100644 index 0000000..3e59d75 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/SchedulerStarter.java @@ -0,0 +1,192 @@ +package com.ipsos.quartz; + + +import com.ipsos.quartz.anno.QuartzScheduled; +import com.ipsos.quartz.config.ClusterQuartzFixedDelayJobBean; +import com.ipsos.quartz.config.ClusterQuartzJobBean; +import com.ipsos.quartz.config.FixedDelayJobData; +import com.ipsos.quartz.config.FixedDelayJobListener; +import org.quartz.*; +import org.quartz.impl.matchers.GroupMatcher; +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.EventListener; +import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.util.ReflectionUtils; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; +import java.lang.reflect.Method; +import java.time.Instant; +import java.util.*; + +/** + * 这里必须用 ApplicationContextAware, + * `@EventListener ContextRefreshedEvent` 的顺序在 ApplicationContextAware 之后， + * 
+ * Spring 实例化过程
+ * 1. 实例化;
+ * 2. 设置属性值;
+ * 3. 如果实现了BeanNameAware接口,调用setBeanName设置Bean的ID或者Name;
+ * 4. 如果实现BeanFactoryAware接口,调用setBeanFactory 设置BeanFactory;
+ * 5. 如果实现ApplicationContextAware,调用setApplicationContext设置ApplicationContext
+ * 6. 调用BeanPostProcessor的预先初始化方法;
+ * 7. 调用InitializingBean的afterPropertiesSet()方法;
+ * 8. 调用定制init-method方法；
+ * 9. 调用BeanPostProcessor的后初始化方法;
+ * 10. @EventListener ContextRefreshedEvent
+ *
+ */ +public class SchedulerStarter implements BeanPostProcessor, ApplicationContextAware { + private Instant now; + @Resource + private Scheduler scheduler; + @Resource + private TimeZone quartzTimeZone; + private Map jobDetailTriggerMap = new HashMap<>(); + + private ConfigurableApplicationContext applicationContext; + + @Override + public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { + return bean; + } + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + Method[] methods = ReflectionUtils.getAllDeclaredMethods(bean.getClass()); + if (methods != null) { + for (Method method : methods) { + QuartzScheduled annotation = AnnotationUtils.findAnnotation(method, QuartzScheduled.class); + if (annotation != null) { + JobDataMap jobDataMap = new JobDataMap(); + jobDataMap.put("targetObject", beanName); + jobDataMap.put("targetMethod", method.getName()); + String cron = annotation.cron(); + long fixedDelay = annotation.fixedDelay(); + long fixedRate = annotation.fixedRate(); + int initialDelay = (int) annotation.initialDelay(); + final JobDetail jobDetail; + final Trigger trigger; + String jobDetailIdentity = beanName + "." + method.getName(); + if (!StringUtils.isEmpty(cron)) { + cron = getCronExpression(cron); + jobDetail = JobBuilder.newJob(ClusterQuartzJobBean.class) + .storeDurably(true).usingJobData(jobDataMap).build(); + trigger = TriggerBuilder.newTrigger().withIdentity(jobDetailIdentity) + .startAt(new Date(now.plusMillis(initialDelay).toEpochMilli())) + .withSchedule(CronScheduleBuilder.cronSchedule(cron).inTimeZone(quartzTimeZone)) + .build(); + } else if (fixedDelay > 0) { + jobDataMap.put(FixedDelayJobListener.FIXED_DELAY_JOB_DATA, new FixedDelayJobData(fixedDelay)); + jobDetail = JobBuilder.newJob(ClusterQuartzFixedDelayJobBean.class) + .storeDurably(true).usingJobData(jobDataMap).build(); + trigger = TriggerBuilder.newTrigger().withIdentity(jobDetailIdentity) + .startAt(new Date(now.plusMillis(initialDelay).toEpochMilli())) + .withSchedule(SimpleScheduleBuilder.simpleSchedule().withIntervalInMilliseconds(fixedDelay).repeatForever()) + .build(); + } else { + jobDetail = JobBuilder.newJob(ClusterQuartzJobBean.class) + .storeDurably(true).usingJobData(jobDataMap).build(); + trigger = TriggerBuilder.newTrigger().withIdentity(jobDetailIdentity) + .startAt(new Date(now.plusMillis(initialDelay).toEpochMilli())) + .withSchedule(SimpleScheduleBuilder.simpleSchedule() + .withIntervalInMilliseconds(fixedRate).repeatForever()) + .build(); + } + jobDetailTriggerMap.put(jobDetailIdentity, new JobDetailTrigger(jobDetail, trigger)); + } + } + } + return bean; + } + + private String getCronExpression(String cron) { + cron = cron.trim(); + if (cron.startsWith("${") && cron.endsWith("}")) { + return applicationContext.getBeanFactory().resolveEmbeddedValue(cron); + } + return cron; + } + + /** + * spring 完全刷新之后执行 + * + * @param event + * @throws BeansException + */ + @EventListener + public void startScheduler(ContextRefreshedEvent event) throws BeansException { + try { + scheduler.deleteJobs(getJobKeys()); + scheduler.unscheduleJobs(getTriggerKeys()); + scheduler.getListenerManager().addJobListener(new FixedDelayJobListener()); + for (String jobDetailIdentity : jobDetailTriggerMap.keySet()) { + JobDetailTrigger jobDetailTrigger = this.jobDetailTriggerMap.get(jobDetailIdentity); + scheduler.scheduleJob(jobDetailTrigger.jobDetail, jobDetailTrigger.trigger); + } + if (!scheduler.isShutdown()) { + scheduler.startDelayed(60); + } + } catch (SchedulerException e) { + e.printStackTrace(); + } + } + + + /** + * 获取数据库中的所有JobKey + * + * @return JobKey列表 + * @throws SchedulerException + */ + private List getJobKeys() throws SchedulerException { + List jobGroupNames = scheduler.getJobGroupNames(); + List jobKeys = new ArrayList<>(); + for (String jobGroupName : jobGroupNames) { + jobKeys.addAll(scheduler.getJobKeys(GroupMatcher.jobGroupEquals(jobGroupName))); + } + return jobKeys; + } + + /** + * 获取数据库中的所有TriggerKey + * + * @return TriggerKey列表 + * @throws SchedulerException + */ + private List getTriggerKeys() throws SchedulerException { + List triggerGroupNames = scheduler.getJobGroupNames(); + List triggerKeys = new ArrayList<>(); + for (String triggerGroupName : triggerGroupNames) { + triggerKeys.addAll(scheduler.getTriggerKeys(GroupMatcher.triggerGroupEquals(triggerGroupName))); + } + return triggerKeys; + } + + /** + * 容器初始化好之后执行 + * + * @param applicationContext + * @throws BeansException + */ + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + now = Instant.now(); + this.applicationContext = (ConfigurableApplicationContext) applicationContext; + } + + private static class JobDetailTrigger { + JobDetail jobDetail; + Trigger trigger; + + JobDetailTrigger(JobDetail jobDetail, Trigger trigger) { + this.jobDetail = jobDetail; + this.trigger = trigger; + } + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzDataSource.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzDataSource.java new file mode 100644 index 0000000..ac77f54 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzDataSource.java @@ -0,0 +1,20 @@ +package com.ipsos.quartz.anno; + +import org.springframework.beans.factory.annotation.Qualifier; + +import java.lang.annotation.*; + +/** + * Qualifier annotation for a DataSource to be injected into Quartz auto-configuration. + * Can be used on a secondary data source, if there is another one marked as + * {@code @Primary}. + * Same as org.springframework.boot.autoconfigure.quartz.QuartzDataSource + */ +@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE, + ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Qualifier +public @interface QuartzDataSource { + +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzScheduled.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzScheduled.java new file mode 100644 index 0000000..2615516 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/anno/QuartzScheduled.java @@ -0,0 +1,43 @@ +package com.ipsos.quartz.anno; + +import java.lang.annotation.*; + +@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface QuartzScheduled { + + /** + * A cron-like expression, extending the usual UN*X definition to include + * triggers on the second as well as minute, hour, day of month, month + * and day of week. e.g. "0 * * * * MON-FRI" means once + * per minute on weekdays (at the top of the minute - the 0th second). + * + * @return an expression that can be parsed to a cron schedule + */ + String cron() default ""; + + /** + * Execute the annotated method with a fixed period between the end + * of the last invocation and the start of the next. + * + * @return the delay in milliseconds + */ + long fixedDelay() default -1; + + /** + * Execute the annotated method with a fixed period in milliseconds between + * invocations. + * + * @return the period in milliseconds + */ + long fixedRate() default -1; + + /** + * Number of milliseconds to delay before the first execution of a + * {@link #fixedRate()} or {@link #fixedDelay()} task. + * + * @return the initial delay in milliseconds + */ + long initialDelay() default 0; +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzFixedDelayJobBean.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzFixedDelayJobBean.java new file mode 100644 index 0000000..b76b8cc --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzFixedDelayJobBean.java @@ -0,0 +1,14 @@ +package com.ipsos.quartz.config; + + +import org.quartz.DisallowConcurrentExecution; +import org.quartz.PersistJobDataAfterExecution; + +/** + * CustomQuartzJobBean代替org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean，解决序列化的问题 + */ +@PersistJobDataAfterExecution +@DisallowConcurrentExecution +public class ClusterQuartzFixedDelayJobBean extends ClusterQuartzJobBean { + +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzJobBean.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzJobBean.java new file mode 100644 index 0000000..dd824d6 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/ClusterQuartzJobBean.java @@ -0,0 +1,53 @@ +package com.ipsos.quartz.config; + + +import com.ipsos.quartz.util.ClassUtils; +import com.ipsos.quartz.util.QuartzBeanFactory; +import org.quartz.JobExecutionContext; +import org.quartz.PersistJobDataAfterExecution; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.quartz.QuartzJobBean; + +import java.lang.reflect.Method; + +/** + * CustomQuartzJobBean代替org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean，解决序列化的问题 + * + * @author mokun + */ +@PersistJobDataAfterExecution +public class ClusterQuartzJobBean extends QuartzJobBean { + private Logger logger = LoggerFactory.getLogger(ClusterQuartzFixedDelayJobBean.class); + + private String targetObject; + + private String targetMethod; + + private Object[] params; + + @Override + protected void executeInternal(JobExecutionContext context) { + try { + logger.debug("The scheduled task starts：targetObject={}, targetMethod={}", targetObject, targetMethod); + Object targetObject = QuartzBeanFactory.getBean(this.targetObject); + Method m = targetObject.getClass().getMethod(targetMethod, ClassUtils.toClass(params)); + m.invoke(targetObject, params); + logger.debug("The scheduled task ends normally：targetObject={}, targetMethod={}", this.targetObject, targetMethod); + } catch (final Exception e) { + logger.error("The scheduled task execution failed：targetObject=" + targetObject + ", targetMethod=" + targetMethod, e); + } + } + + public void setTargetObject(String targetObject) { + this.targetObject = targetObject; + } + + public void setTargetMethod(String targetMethod) { + this.targetMethod = targetMethod; + } + + public void setParams(Object... params) { + this.params = params; + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobData.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobData.java new file mode 100644 index 0000000..3a5ae13 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobData.java @@ -0,0 +1,37 @@ +package com.ipsos.quartz.config; + +import java.io.Serializable; +import java.util.Date; +import java.util.concurrent.TimeUnit; + +public final class FixedDelayJobData implements Serializable { + + private static final long serialVersionUID = 1L; + + private long delay; + private TimeUnit delayUnit; + + public FixedDelayJobData(long delay) { + this(delay, TimeUnit.MILLISECONDS); + } + + public FixedDelayJobData(long delay, final TimeUnit delayUnit) { + if (delay == 0) { + throw new IllegalArgumentException("Delay cannot be zero"); + } + if (delayUnit == null) { + throw new IllegalArgumentException("Delay Unit should be provided"); + } + this.delay = delay; + this.delayUnit = delayUnit; + } + + public Date getNextScheduleDate() { + return new Date(System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(delay, delayUnit)); + } + + @Override + public String toString() { + return "FixedDelayJobData [delay=" + delay + ", delayUnit=" + delayUnit + "]"; + } +} \ No newline at end of file diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobListener.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobListener.java new file mode 100644 index 0000000..d4dc2d2 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/config/FixedDelayJobListener.java @@ -0,0 +1,116 @@ +package com.ipsos.quartz.config; + +import org.quartz.*; +import org.quartz.listeners.JobListenerSupport; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.quartz.TriggerBuilder.newTrigger; + +/** + *Add the following in the JobDataMap + *
+ *public class SimpleJob implements Job {
+ *
+ * public void execute(JobExecutionContext context) throws JobExecutionException {
+ *
+ *		JobDataMap map = context.getJobDetail().getJobDataMap();
+ *
+ *		map.put(FixedDelayJobListener.FIXED_DELAY_JOB_DATA, new FixedDelayJobData(2L));
+ *                // Perform the job operation
+ *		:
+ *		:
+ *	}
+ * }
+ *
+ * + * Add the listener + * 
+ * {@code scheduler.getListenerManager().addJobListener(new FixedDelayJobListener());}
+ *
+ * Schedule the job as follows + * 
+ * JobDetail job = newJob(SimpleJob.class).withIdentity("statefulJob", "group1").build();
+ *
+ * Trigger trigger = newTrigger()
+ *   .withIdentity("trigger1", "group1")
+ *   .startAt(startTime)
+ *   .build();
+ *
+ * scheduler.scheduleJob(job, trigger);
+ *
+ * + */ +public final class FixedDelayJobListener extends JobListenerSupport { + + private static final String FIXED_JOB_LISTENER_NAME = "FixedDelayJobListener"; + + public static final String FIXED_DELAY_JOB_DATA = "FIXED_DELAY_JOB_DATA"; + + @Override + public String getName() { + return FIXED_JOB_LISTENER_NAME; + } + + @Override + public void jobWasExecuted(final JobExecutionContext context, final JobExecutionException exception) { + JobDetail jobdetail = context.getJobDetail(); + JobDataMap data = jobdetail.getJobDataMap(); + + if (!data.containsKey(FIXED_DELAY_JOB_DATA)) { + getLog().debug("Not a fixed delay job : {}", context.getJobDetail().getKey()); + return; + } + if (shouldNotSchedule(context)) { + getLog().debug("Not scheduling {} again as there is still an unfired trigger.", context.getJobDetail().getKey()); + return; + } else { + getLog().debug("Rescheduling {} as there is no unfired trigger.", context.getJobDetail().getKey()); + } + + TriggerKey oldTriggerKey = context.getTrigger().getKey(); + FixedDelayJobData jobData = (FixedDelayJobData) data.getWrappedMap().get(FIXED_DELAY_JOB_DATA); + Trigger newTrigger = buildNewTrigger(jobData, oldTriggerKey); + + rescheduleJob(context.getScheduler(), oldTriggerKey, newTrigger); + } + + private boolean shouldNotSchedule(final JobExecutionContext context) { + List triggersOfJob = getTriggersOfJob(context); + for (Trigger trigger : triggersOfJob) { + if (trigger instanceof SimpleTrigger && ((SimpleTrigger) trigger).getTimesTriggered() == 0) { + return true; + } + } + return false; + } + + private List getTriggersOfJob(final JobExecutionContext context) { + List triggersOfJob = new ArrayList(); + + try { + triggersOfJob = context.getScheduler().getTriggersOfJob(context.getJobDetail().getKey()); + } catch (SchedulerException e) { + getLog().error(e.getMessage()); + } + return triggersOfJob; + } + + private Trigger buildNewTrigger(final FixedDelayJobData jobData, final TriggerKey oldTriggerKey) { + Date runTime = jobData.getNextScheduleDate(); + Trigger newTrigger = newTrigger().withIdentity(oldTriggerKey).startAt(runTime).build(); + return newTrigger; + } + + public void rescheduleJob(final Scheduler scheduler, final TriggerKey oldTriggerKey, final Trigger newTrigger) { + try { + if (!scheduler.isShutdown()) { + scheduler.rescheduleJob(oldTriggerKey, newTrigger); + } + } catch (SchedulerException se) { + getLog().error("failed to reschedule the job with triger : {}", oldTriggerKey, se); + } + } +} \ No newline at end of file diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/service/QuartzManageService.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/service/QuartzManageService.java new file mode 100644 index 0000000..aa07a28 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/service/QuartzManageService.java @@ -0,0 +1,77 @@ +package com.ipsos.quartz.service; + +import com.ipsos.quartz.config.ClusterQuartzJobBean; +import org.quartz.*; + +import javax.annotation.Resource; +import java.util.List; + +public class QuartzManageService { + @Resource + private Scheduler scheduler; + + public List getCurrentlyExecutingJobs() throws Exception { + return scheduler.getCurrentlyExecutingJobs(); + } + + public void deleteJob(JobKey jobKey) throws Exception { + scheduler.deleteJob(jobKey); + } + + public void pauseJob(JobKey jobKey) throws Exception { + scheduler.pauseJob(jobKey); + } + + public void resumeJob(JobKey jobKey) throws Exception { + scheduler.resumeJob(jobKey); + } + + public void rescheduleJob(TriggerKey triggerKey, Trigger newTrigger) throws Exception { + scheduler.rescheduleJob(triggerKey, newTrigger); + } + + public boolean checkExists(TriggerKey triggerKey) throws Exception { + return scheduler.checkExists(triggerKey); + } + + public boolean checkExists(JobKey jobKey) throws Exception { + return scheduler.checkExists(jobKey); + } + + public JobKey getJobKey(TriggerKey triggerKey) throws Exception { + return scheduler.getTrigger(triggerKey).getJobKey(); + } + + public void addJob(JobDetail jobDetail, Trigger trigger) throws Exception { + scheduler.scheduleJob(jobDetail, trigger); + } + + public void addJob(JobDataMap jobDataMap, Trigger trigger) throws Exception { + JobDetail jobDetail = JobBuilder.newJob(ClusterQuartzJobBean.class) + .storeDurably(true).usingJobData(jobDataMap).build(); + addJob(jobDetail, trigger); + } + + public void addJob(String beanName, String methodName, Trigger trigger, Object... params) throws Exception { + JobDataMap jobDataMap = new JobDataMap(); + jobDataMap.put("targetObject", beanName); + jobDataMap.put("targetMethod", methodName); + jobDataMap.put("params", params); + addJob(jobDataMap, trigger); + } + + public void addJob(String beanName, String methodName, String cron, Object... params) throws Exception { + Trigger trigger = TriggerBuilder.newTrigger().withIdentity(beanName + "." + methodName) + .withSchedule(CronScheduleBuilder.cronSchedule(cron)) + .build(); + addJob(beanName, methodName, trigger, params); + } + + public List getTriggersOfJob(JobKey jobKey) throws Exception { + return scheduler.getTriggersOfJob(jobKey); + } + + public Trigger getTrigger(TriggerKey triggerKey) throws Exception { + return scheduler.getTrigger(triggerKey); + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/ClassUtils.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/ClassUtils.java new file mode 100644 index 0000000..0934ba7 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/ClassUtils.java @@ -0,0 +1,16 @@ +package com.ipsos.quartz.util; + +public class ClassUtils { + public static Class[] toClass(final Object... array) { + if (array == null) { + return null; + } else if (array.length == 0) { + return new Class[0]; + } + final Class[] classes = new Class[array.length]; + for (int i = 0; i < array.length; i++) { + classes[i] = array[i] == null ? null : array[i].getClass(); + } + return classes; + } +} diff --git a/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/QuartzBeanFactory.java b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/QuartzBeanFactory.java new file mode 100644 index 0000000..f90d3c1 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/java/com/ipsos/quartz/util/QuartzBeanFactory.java @@ -0,0 +1,27 @@ +package com.ipsos.quartz.util; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; + +public class QuartzBeanFactory implements ApplicationContextAware { + private static ApplicationContext applicationContext; + + public static T getBean(Class tClass) { + return applicationContext.getBean(tClass); + } + + public static T getBean(String beanName) { + return (T) applicationContext.getBean(beanName); + } + + public static T getBean(String beanName, Class tClass) { + return applicationContext.getBean(beanName, tClass); + } + + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + QuartzBeanFactory.applicationContext = applicationContext; + } +} diff --git a/quartz-spring-boot-starter/src/main/resources/META-INF/spring.factories b/quartz-spring-boot-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000..47b8318 --- /dev/null +++ b/quartz-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=com.ipsos.autoconfigure.QuartzAutoConfiguration \ No newline at end of file