Compare commits

...

2 Commits

Author SHA1 Message Date
李佳航
6f42d41344 Merge pull request #65 from dromara/dev
merge
2024-11-01 10:41:52 +08:00
lijiahang
8db677684d 修改包名. 2024-10-29 09:59:50 +08:00
986 changed files with 4516 additions and 4522 deletions

View File

@@ -53,7 +53,8 @@
* 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/) * 🔗 演示地址: [https://dv.orionsec.cn/](https://dv.orionsec.cn/)
* 🔏 演示账号: admin/admin * 🔏 演示账号: admin/admin
* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview) * ⭐ 体验后可以点一下 `star`
这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor) [gitcode](https://gitcode.com/dromara/orion-visor/overview)
* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目! * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
* 🎭 演示环境部分功能不可用, 完整功能请本地部署! * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
* 📛 演示环境请不要随便删除数据! * 📛 演示环境请不要随便删除数据!
@@ -80,7 +81,7 @@ docker compose up -d
## 技术栈 ## 技术栈
* SpringBoot 2.7.17 * SpringBoot 2.7.+
* Mysql 8.0.+ * Mysql 8.0.+
* Redis 6.0.+ * Redis 6.0.+
* Vue3 3.2.+ * Vue3 3.2.+
@@ -122,7 +123,7 @@ docker compose up -d
微信: ljh1553488 微信: ljh1553488
QQ群: 755242157 QQ群: 755242157
📧 咨询问题微信备注: vis 📧 问题/加群微信备注: ops
📧 合作/功能定制备注: 合作 📧 合作/功能定制备注: 合作
## 支持一下 ## 支持一下
@@ -137,4 +138,8 @@ QQ群: 755242157
## License ## License
本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。 本项目遵循 [Apache-2.0](https://github.com/dromara/orion-visor/blob/main/LICENSE) 开源许可证。
## Gite 最有价值开源项目 GVP
![GVP](https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/10/24/8dd98b8d-9de5-44e6-86d3-04e27ec66123.jpg "GVP")

View File

@@ -1,7 +1,7 @@
version: '3.3' version: '3.3'
services: services:
service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
privileged: true privileged: true
ports: ports:
- 1081:80 - 1081:80
@@ -32,7 +32,7 @@ services:
- mysql - mysql
- redis - redis
mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
privileged: true privileged: true
ports: ports:
- 3307:3306 - 3307:3306
@@ -52,7 +52,7 @@ services:
retries: 10 retries: 10
start_period: 3s start_period: 3s
redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
privileged: true privileged: true
ports: ports:
- 6380:6379 - 6380:6379

View File

@@ -1,7 +1,7 @@
version: '3.3' version: '3.3'
services: services:
service: service:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.2.0
privileged: true privileged: true
ports: ports:
- ${SERVICE_PORT:-1081}:80 - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
- mysql - mysql
- redis - redis
mysql: mysql:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.2.0
privileged: true privileged: true
ports: ports:
- 3307:3306 - 3307:3306
@@ -52,7 +52,7 @@ services:
retries: 15 retries: 15
start_period: 3s start_period: 3s
redis: redis:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.2.0
privileged: true privileged: true
ports: ports:
- 6380:6379 - 6380:6379
@@ -68,7 +68,7 @@ services:
retries: 15 retries: 15
start_period: 3s start_period: 3s
adminer: adminer:
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.8 image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.2.0
ports: ports:
- 8081:8080 - 8081:8080
depends_on: depends_on:

View File

@@ -1,4 +1,4 @@
#/bin/bash #/bin/bash
version=2.1.8 version=2.2.0
docker build -t orion-visor-adminer:${version} . docker build -t orion-visor-adminer:${version} .
docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}

View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.8 version=2.2.0
cp -r ../../sql ./sql cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} . docker build -t orion-visor-mysql:${version} .
rm -rf ./sql rm -rf ./sql

View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.8 version=2.2.0
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

View File

@@ -1,4 +1,4 @@
#/bin/bash #/bin/bash
version=2.1.8 version=2.2.0
docker build -t orion-visor-redis:${version} . docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version} docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}

View File

@@ -1,5 +1,5 @@
#/bin/bash #/bin/bash
version=2.1.8 version=2.2.0
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist mv ../../orion-visor-ui/dist ./dist
docker build -t orion-visor-service:${version} . docker build -t orion-visor-service:${version} .

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-dependencies</artifactId> <artifactId>orion-visor-dependencies</artifactId>
<version>${revision}</version> <version>${revision}</version>
<packaging>pom</packaging> <packaging>pom</packaging>
@@ -14,11 +14,11 @@
<url>https://github.com/dromara/orion-visor</url> <url>https://github.com/dromara/orion-visor</url>
<properties> <properties>
<revision>2.1.8</revision> <revision>2.2.0</revision>
<spring.boot.version>2.7.17</spring.boot.version> <spring.boot.version>2.7.17</spring.boot.version>
<spring.boot.admin.version>2.7.15</spring.boot.admin.version> <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version> <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
<orion.kit.version>1.0.9</orion.kit.version> <orion.kit.version>2.0.0</orion.kit.version>
<aspectj.version>1.9.7</aspectj.version> <aspectj.version>1.9.7</aspectj.version>
<lombok.version>1.18.26</lombok.version> <lombok.version>1.18.26</lombok.version>
<springdoc.version>1.6.15</springdoc.version> <springdoc.version>1.6.15</springdoc.version>
@@ -48,95 +48,95 @@
<!-- orion-kit --> <!-- orion-kit -->
<dependency> <dependency>
<groupId>io.github.lijiahangmax</groupId> <groupId>cn.orionsec.kit</groupId>
<artifactId>orion-all</artifactId> <artifactId>orion-all</artifactId>
<version>${orion.kit.version}</version> <version>${orion.kit.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>orion-log</artifactId> <artifactId>orion-log</artifactId>
<groupId>io.github.lijiahangmax</groupId> <groupId>cn.orionsec.kit</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- orion-visor-starter --> <!-- orion-visor-starter -->
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId> <artifactId>orion-visor-framework-common</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-banner</artifactId> <artifactId>orion-visor-spring-boot-starter-banner</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-web</artifactId> <artifactId>orion-visor-spring-boot-starter-web</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-swagger</artifactId> <artifactId>orion-visor-spring-boot-starter-swagger</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-datasource</artifactId> <artifactId>orion-visor-spring-boot-starter-datasource</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-mybatis</artifactId> <artifactId>orion-visor-spring-boot-starter-mybatis</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-job</artifactId> <artifactId>orion-visor-spring-boot-starter-job</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-websocket</artifactId> <artifactId>orion-visor-spring-boot-starter-websocket</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-redis</artifactId> <artifactId>orion-visor-spring-boot-starter-redis</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-desensitize</artifactId> <artifactId>orion-visor-spring-boot-starter-desensitize</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-log</artifactId> <artifactId>orion-visor-spring-boot-starter-log</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-storage</artifactId> <artifactId>orion-visor-spring-boot-starter-storage</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-security</artifactId> <artifactId>orion-visor-spring-boot-starter-security</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-monitor</artifactId> <artifactId>orion-visor-spring-boot-starter-monitor</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-test</artifactId> <artifactId>orion-visor-spring-boot-starter-test</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId> <artifactId>orion-visor-spring-boot-starter-biz-operator-log</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework</artifactId> <artifactId>orion-visor-framework</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@@ -18,7 +18,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.github.lijiahangmax</groupId> <groupId>cn.orionsec.kit</groupId>
<artifactId>orion-all</artifactId> <artifactId>orion-all</artifactId>
</dependency> </dependency>

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.configuration; package org.dromara.visor.framework.common.configuration;
import com.orion.spring.SpringHolder; import cn.orionsec.kit.spring.SpringHolder;
import com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig; import org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig;
import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import com.orion.visor.framework.common.thread.ThreadPoolMdcTaskExecutor; import org.dromara.visor.framework.common.thread.ThreadPoolMdcTaskExecutor;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.configuration.config; package org.dromara.visor.framework.common.configuration.config;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
import com.orion.lang.constant.OrionConst; import cn.orionsec.kit.lang.constant.OrionConst;
/** /**
* 项目常量 * 项目常量
@@ -29,7 +29,7 @@ public interface AppConst extends OrionConst {
/** /**
* ${orion.version} 迭代时候需要手动更改 * ${orion.version} 迭代时候需要手动更改
*/ */
String VERSION = "2.1.8"; String VERSION = "2.2.0";
/** /**
* ${spring.application.name} * ${spring.application.name}

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 自动装配排序常量 * 自动装配排序常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* bean 排序常量 * bean 排序常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 常量 - 中文 * 常量 - 中文

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 常量 * 常量
@@ -22,7 +22,7 @@ package com.orion.visor.framework.common.constant;
* @version 1.0.0 * @version 1.0.0
* @since 2023/6/23 18:49 * @since 2023/6/23 18:49
*/ */
public interface Const extends com.orion.lang.constant.Const, FieldConst, CnConst { public interface Const extends cn.orionsec.kit.lang.constant.Const, FieldConst, CnConst {
Integer NOT_DELETE = 0; Integer NOT_DELETE = 0;

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
import com.orion.lang.define.wrapper.CodeInfo; import cn.orionsec.kit.lang.define.wrapper.CodeInfo;
import com.orion.lang.define.wrapper.HttpWrapper; import cn.orionsec.kit.lang.define.wrapper.HttpWrapper;
import com.orion.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Exceptions;
import com.orion.lang.utils.Strings; import cn.orionsec.kit.lang.utils.Strings;
/** /**
* 用于定义错误码 * 用于定义错误码

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
import com.orion.lang.exception.ApplicationException; import cn.orionsec.kit.lang.exception.ApplicationException;
import com.orion.lang.exception.argument.InvalidArgumentException; import cn.orionsec.kit.lang.exception.argument.InvalidArgumentException;
/** /**
* 错误信息 * 错误信息

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 额外字段常量 * 额外字段常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 字段常量 * 字段常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 文件常量 * 文件常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 过滤器排序常量 * 过滤器排序常量

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.constant; package org.dromara.visor.framework.common.constant;
/** /**
* 验证常量 * 验证常量

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.crypto; package org.dromara.visor.framework.common.crypto;
import com.orion.lang.utils.codec.Base62s; import cn.orionsec.kit.lang.utils.codec.Base62s;
import com.orion.lang.utils.crypto.symmetric.SymmetricCrypto; import cn.orionsec.kit.lang.utils.crypto.symmetric.SymmetricCrypto;
/** /**
* 数据加密器 * 数据加密器

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
import lombok.Data; import lombok.Data;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
/** /**
* 数据清理请求 定义 * 数据清理请求 定义

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
import com.orion.visor.framework.common.validator.group.Page;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.dromara.visor.framework.common.validator.group.Page;
import javax.validation.constraints.Max; import javax.validation.constraints.Max;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
import java.io.Serializable; import java.io.Serializable;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
import lombok.Data; import lombok.Data;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.entity; package org.dromara.visor.framework.common.entity;
import java.util.List; import java.util.List;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.enums; package org.dromara.visor.framework.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.enums; package org.dromara.visor.framework.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.enums; package org.dromara.visor.framework.common.enums;
import com.orion.lang.utils.Strings; import cn.orionsec.kit.lang.utils.Strings;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.enums; package org.dromara.visor.framework.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.file; package org.dromara.visor.framework.common.file;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.handler.data; package org.dromara.visor.framework.common.handler.data;
import com.orion.spring.SpringHolder; import cn.orionsec.kit.spring.SpringHolder;
import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
import com.orion.visor.framework.common.handler.data.strategy.GenericsDataStrategy; import org.dromara.visor.framework.common.handler.data.strategy.GenericsDataStrategy;
/** /**
* 标准数据定义 * 标准数据定义

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.handler.data.model; package org.dromara.visor.framework.common.handler.data.model;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.handler.data.strategy; package org.dromara.visor.framework.common.handler.data.strategy;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
/** /**
* 标准数据处理策略 基类 * 标准数据处理策略 基类

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.handler.data.strategy; package org.dromara.visor.framework.common.handler.data.strategy;
import com.orion.visor.framework.common.handler.data.model.GenericsDataModel; import org.dromara.visor.framework.common.handler.data.model.GenericsDataModel;
/** /**
* 标准数据处理策略 * 标准数据处理策略

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.json.filter; package org.dromara.visor.framework.common.json.filter;
import cn.orionsec.kit.lang.utils.Desensitizes;
import cn.orionsec.kit.lang.utils.Objects1;
import cn.orionsec.kit.lang.utils.collect.Lists;
import com.alibaba.fastjson.serializer.ValueFilter; import com.alibaba.fastjson.serializer.ValueFilter;
import com.orion.lang.utils.Desensitizes;
import com.orion.lang.utils.Objects1;
import com.orion.lang.utils.collect.Lists;
import java.util.List; import java.util.List;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.json.filter; package org.dromara.visor.framework.common.json.filter;
import cn.orionsec.kit.lang.utils.collect.Lists;
import com.alibaba.fastjson.serializer.PropertyFilter; import com.alibaba.fastjson.serializer.PropertyFilter;
import com.orion.lang.utils.collect.Lists;
import java.util.List; import java.util.List;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.lock; package org.dromara.visor.framework.common.lock;
import java.util.function.Supplier; import java.util.function.Supplier;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.meta; package org.dromara.visor.framework.common.meta;
import cn.orionsec.kit.lang.id.UUIds;
import com.alibaba.ttl.TransmittableThreadLocal; import com.alibaba.ttl.TransmittableThreadLocal;
import com.orion.lang.id.UUIds;
import org.slf4j.MDC; import org.slf4j.MDC;
/** /**

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.security; package org.dromara.visor.framework.common.security;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.security; package org.dromara.visor.framework.common.security;
import com.orion.lang.utils.Booleans; import cn.orionsec.kit.lang.utils.Booleans;
import com.orion.lang.utils.Strings; import cn.orionsec.kit.lang.utils.Strings;
import com.orion.visor.framework.common.constant.Const; import org.dromara.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.utils.CryptoUtils; import org.dromara.visor.framework.common.utils.CryptoUtils;
/** /**
* 密码修改器 * 密码修改器

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.security; package org.dromara.visor.framework.common.security;
/** /**
* SecurityUtils bean 对象 * SecurityUtils bean 对象

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.security; package org.dromara.visor.framework.common.security;
import java.io.Serializable; import java.io.Serializable;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.security; package org.dromara.visor.framework.common.security;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.thread; package org.dromara.visor.framework.common.thread;
import com.orion.visor.framework.common.utils.ThreadMdcUtils; import org.dromara.visor.framework.common.utils.ThreadMdcUtils;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.constant.Const; import cn.orionsec.kit.lang.constant.Const;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Exceptions;
import com.orion.visor.framework.common.crypto.ValueCrypto; import org.dromara.visor.framework.common.crypto.ValueCrypto;
/** /**
* 加密工具类 * 加密工具类

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Exceptions;
import com.orion.visor.framework.common.file.FileClient; import org.dromara.visor.framework.common.file.FileClient;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.time.Dates; import cn.orionsec.kit.lang.utils.time.Dates;
import com.orion.visor.framework.common.constant.Const; import org.dromara.visor.framework.common.constant.Const;
/** /**
* 文件名称 * 文件名称

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.ext.location.Region; import cn.orionsec.kit.ext.location.Region;
import com.orion.ext.location.region.LocationRegions; import cn.orionsec.kit.ext.location.region.LocationRegions;
import com.orion.visor.framework.common.constant.Const; import cn.orionsec.kit.web.servlet.web.Servlets;
import com.orion.web.servlet.web.Servlets; import org.dromara.visor.framework.common.constant.Const;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.HashMap; import java.util.HashMap;

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.Exceptions; import cn.orionsec.kit.lang.utils.Exceptions;
import com.orion.visor.framework.common.lock.Locker;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.visor.framework.common.lock.Locker;
import java.util.function.Supplier; import java.util.function.Supplier;

View File

@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.Objects1; import cn.orionsec.kit.lang.utils.Objects1;
import com.orion.lang.utils.Systems; import cn.orionsec.kit.lang.utils.Systems;
import com.orion.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.io.Files1;
import com.orion.visor.framework.common.constant.AppConst; import org.dromara.visor.framework.common.constant.AppConst;
import com.orion.visor.framework.common.constant.Const; import org.dromara.visor.framework.common.constant.Const;
/** /**
* 路径工具类 * 路径工具类

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.visor.framework.common.entity.RequestIdentity; import cn.orionsec.kit.web.servlet.web.Servlets;
import com.orion.visor.framework.common.entity.RequestIdentityModel; import org.dromara.visor.framework.common.entity.RequestIdentity;
import com.orion.web.servlet.web.Servlets; import org.dromara.visor.framework.common.entity.RequestIdentityModel;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.visor.framework.common.constant.Const; import org.dromara.visor.framework.common.constant.Const;
/** /**
* sql 工具类 * sql 工具类

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.collect.Maps; import cn.orionsec.kit.lang.utils.collect.Maps;
import com.orion.lang.utils.reflect.Annotations; import cn.orionsec.kit.lang.utils.reflect.Annotations;
import com.orion.visor.framework.common.constant.Const;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import org.dromara.visor.framework.common.constant.Const;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.visor.framework.common.meta.TraceIdHolder; import org.dromara.visor.framework.common.meta.TraceIdHolder;
import org.slf4j.MDC; import org.slf4j.MDC;
import java.util.Map; import java.util.Map;

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.collect.Lists; import cn.orionsec.kit.lang.utils.collect.Lists;
import com.orion.visor.framework.common.constant.Const; import org.dromara.visor.framework.common.constant.Const;
import com.orion.visor.framework.common.entity.TreeNode; import org.dromara.visor.framework.common.entity.TreeNode;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;

View File

@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.utils; package org.dromara.visor.framework.common.utils;
import com.orion.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.Arrays1;
import com.orion.lang.utils.io.Files1; import cn.orionsec.kit.lang.utils.io.Files1;
import com.orion.spring.SpringHolder; import cn.orionsec.kit.spring.SpringHolder;
import com.orion.visor.framework.common.constant.ErrorMessage; import org.dromara.visor.framework.common.constant.ErrorMessage;
import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException; import javax.validation.ConstraintViolationException;
@@ -35,7 +35,7 @@ import java.util.function.Function;
* @version 1.0.0 * @version 1.0.0
* @since 2023/7/18 11:23 * @since 2023/7/18 11:23
*/ */
public class Valid extends com.orion.lang.utils.Valid { public class Valid extends cn.orionsec.kit.lang.utils.Valid {
private static final Validator VALIDATOR = SpringHolder.getBean(Validator.class); private static final Validator VALIDATOR = SpringHolder.getBean(Validator.class);

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 批量验证分组 * 批量验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 清理验证分组 * 清理验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 导出验证分组 * 导出验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 分页验证分组 * 分页验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 导出验证分组 * 导出验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.validator.group; package org.dromara.visor.framework.common.validator.group;
/** /**
* 分页验证分组 * 分页验证分组

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.common.web.filter; package org.dromara.visor.framework.common.web.filter;
import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean;

View File

@@ -2,8 +2,8 @@
"groups": [ "groups": [
{ {
"name": "orion.async.executor", "name": "orion.async.executor",
"type": "com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig", "type": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig",
"sourceType": "com.orion.visor.framework.common.configuration.config.AsyncExecutorConfig" "sourceType": "org.dromara.visor.framework.common.configuration.config.AsyncExecutorConfig"
} }
], ],
"properties": [ "properties": [

View File

@@ -1 +1 @@
com.orion.visor.framework.common.configuration.OrionCommonAutoConfiguration org.dromara.visor.framework.common.configuration.OrionCommonAutoConfiguration

View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework</artifactId> <artifactId>orion-visor-framework</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@@ -18,7 +18,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId> <artifactId>orion-visor-framework-common</artifactId>
</dependency> </dependency>

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.banner.configuration; package org.dromara.visor.framework.banner.configuration;
import com.orion.visor.framework.banner.core.runner.BannerApplicationRunner; import org.dromara.visor.framework.banner.core.runner.BannerApplicationRunner;
import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.banner.core.runner; package org.dromara.visor.framework.banner.core.runner;
import com.orion.lang.utils.Threads; import cn.orionsec.kit.lang.utils.Threads;
import com.orion.lang.utils.ansi.AnsiAppender; import cn.orionsec.kit.lang.utils.ansi.AnsiAppender;
import com.orion.lang.utils.ansi.style.color.AnsiForeground; import cn.orionsec.kit.lang.utils.ansi.style.color.AnsiForeground;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;

View File

@@ -1 +1 @@
com.orion.visor.framework.banner.configuration.OrionBannerAutoConfiguration org.dromara.visor.framework.banner.configuration.OrionBannerAutoConfiguration

View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework</artifactId> <artifactId>orion-visor-framework</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@@ -18,7 +18,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId> <artifactId>orion-visor-framework-common</artifactId>
</dependency> </dependency>

View File

@@ -13,19 +13,19 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.configuration; package org.dromara.visor.framework.biz.operator.log.configuration;
import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.SerializeFilter;
import com.alibaba.fastjson.serializer.ValueFilter; import com.alibaba.fastjson.serializer.ValueFilter;
import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
import com.orion.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect; import org.dromara.visor.framework.biz.operator.log.core.aspect.OperatorLogAspect;
import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate; import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkServiceDelegate;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs; import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import com.orion.visor.framework.common.json.filter.FieldDesensitizeFilter; import org.dromara.visor.framework.common.json.filter.FieldDesensitizeFilter;
import com.orion.visor.framework.common.json.filter.FieldIgnoreFilter; import org.dromara.visor.framework.common.json.filter.FieldIgnoreFilter;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.configuration.config; package org.dromara.visor.framework.biz.operator.log.configuration.config;
import com.orion.visor.framework.common.utils.ConfigUtils;
import lombok.Data; import lombok.Data;
import org.dromara.visor.framework.common.utils.ConfigUtils;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.List; import java.util.List;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.annotation; package org.dromara.visor.framework.biz.operator.log.core.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.annotation; package org.dromara.visor.framework.biz.operator.log.core.annotation;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.annotation; package org.dromara.visor.framework.biz.operator.log.core.annotation;
import com.orion.visor.framework.biz.operator.log.core.enums.ReturnType; import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType;
import java.lang.annotation.*; import java.lang.annotation.*;

View File

@@ -13,27 +13,27 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.aspect; package org.dromara.visor.framework.biz.operator.log.core.aspect;
import com.orion.lang.define.thread.ExecutorBuilder; import cn.orionsec.kit.lang.define.thread.ExecutorBuilder;
import com.orion.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.Arrays1;
import com.orion.lang.utils.Strings; import cn.orionsec.kit.lang.utils.Strings;
import com.orion.visor.framework.biz.operator.log.core.annotation.IgnoreParameter;
import com.orion.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorType;
import com.orion.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import com.orion.visor.framework.common.constant.BeanOrderConst;
import com.orion.visor.framework.common.security.LoginUser;
import com.orion.visor.framework.common.security.SecurityHolder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import org.dromara.visor.framework.biz.operator.log.core.annotation.IgnoreParameter;
import org.dromara.visor.framework.biz.operator.log.core.annotation.OperatorLog;
import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import org.dromara.visor.framework.biz.operator.log.core.service.OperatorLogFrameworkService;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogFiller;
import org.dromara.visor.framework.biz.operator.log.core.utils.OperatorLogs;
import org.dromara.visor.framework.common.constant.BeanOrderConst;
import org.dromara.visor.framework.common.security.LoginUser;
import org.dromara.visor.framework.common.security.SecurityHolder;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.enums; package org.dromara.visor.framework.biz.operator.log.core.enums;
import lombok.Getter; import lombok.Getter;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.enums; package org.dromara.visor.framework.biz.operator.log.core.enums;
/** /**
* 返回值类型 * 返回值类型

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.factory; package org.dromara.visor.framework.biz.operator.log.core.factory;
import com.orion.lang.utils.Arrays1; import cn.orionsec.kit.lang.utils.Arrays1;
import com.orion.visor.framework.biz.operator.log.core.annotation.Module; import org.dromara.visor.framework.biz.operator.log.core.annotation.Module;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.factory; package org.dromara.visor.framework.biz.operator.log.core.factory;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
/** /**
* 操作类型定义 * 操作类型定义

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.factory; package org.dromara.visor.framework.biz.operator.log.core.factory;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.model; package org.dromara.visor.framework.biz.operator.log.core.model;
import com.orion.visor.framework.common.entity.RequestIdentity;
import lombok.Data; import lombok.Data;
import org.dromara.visor.framework.common.entity.RequestIdentity;
import java.util.Date; import java.util.Date;

View File

@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.model; package org.dromara.visor.framework.biz.operator.log.core.model;
import com.orion.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel;
import lombok.Getter; import lombok.Getter;
import org.dromara.visor.framework.biz.operator.log.core.enums.OperatorRiskLevel;
/** /**
* 操作类型定义 * 操作类型定义

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.service; package org.dromara.visor.framework.biz.operator.log.core.service;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
/** /**
* 操作日志框架服务 * 操作日志框架服务

View File

@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.service; package org.dromara.visor.framework.biz.operator.log.core.service;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
/** /**
* 操作日志框架服务 委托类 * 操作日志框架服务 委托类

View File

@@ -13,25 +13,25 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.utils; package org.dromara.visor.framework.biz.operator.log.core.utils;
import cn.orionsec.kit.lang.able.Gettable;
import cn.orionsec.kit.lang.utils.Exceptions;
import cn.orionsec.kit.lang.utils.Refs;
import cn.orionsec.kit.lang.utils.Strings;
import cn.orionsec.kit.lang.utils.json.matcher.ReplacementFormatters;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.SerializeFilter;
import com.orion.lang.able.Gettable; import org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig;
import com.orion.lang.utils.Exceptions; import org.dromara.visor.framework.biz.operator.log.core.enums.ReturnType;
import com.orion.lang.utils.Refs; import org.dromara.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder;
import com.orion.lang.utils.Strings; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorLogModel;
import com.orion.lang.utils.json.matcher.ReplacementFormatters; import org.dromara.visor.framework.biz.operator.log.core.model.OperatorType;
import com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig; import org.dromara.visor.framework.common.entity.RequestIdentity;
import com.orion.visor.framework.biz.operator.log.core.enums.ReturnType; import org.dromara.visor.framework.common.enums.BooleanBit;
import com.orion.visor.framework.biz.operator.log.core.factory.OperatorTypeHolder; import org.dromara.visor.framework.common.meta.TraceIdHolder;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel; import org.dromara.visor.framework.common.security.LoginUser;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorType; import org.dromara.visor.framework.common.utils.Requests;
import com.orion.visor.framework.common.entity.RequestIdentity;
import com.orion.visor.framework.common.enums.BooleanBit;
import com.orion.visor.framework.common.meta.TraceIdHolder;
import com.orion.visor.framework.common.security.LoginUser;
import com.orion.visor.framework.common.utils.Requests;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;

View File

@@ -13,14 +13,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.biz.operator.log.core.utils; package org.dromara.visor.framework.biz.operator.log.core.utils;
import cn.orionsec.kit.lang.utils.Exceptions;
import cn.orionsec.kit.lang.utils.collect.Maps;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializeFilter; import com.alibaba.fastjson.serializer.SerializeFilter;
import com.orion.lang.utils.Exceptions; import org.dromara.visor.framework.common.constant.ExtraFieldConst;
import com.orion.lang.utils.collect.Maps; import org.dromara.visor.framework.common.security.LoginUser;
import com.orion.visor.framework.common.constant.ExtraFieldConst;
import com.orion.visor.framework.common.security.LoginUser;
import java.util.Map; import java.util.Map;

View File

@@ -2,8 +2,8 @@
"groups": [ "groups": [
{ {
"name": "orion.operator-log", "name": "orion.operator-log",
"type": "com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig", "type": "org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig",
"sourceType": "com.orion.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig" "sourceType": "org.dromara.visor.framework.biz.operator.log.configuration.config.OperatorLogConfig"
} }
], ],
"properties": [ "properties": [

View File

@@ -1 +1 @@
com.orion.visor.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration org.dromara.visor.framework.biz.operator.log.configuration.OrionOperatorLogAutoConfiguration

View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework</artifactId> <artifactId>orion-visor-framework</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
@@ -18,7 +18,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.orion.visor</groupId> <groupId>org.dromara.visor</groupId>
<artifactId>orion-visor-framework-common</artifactId> <artifactId>orion-visor-framework-common</artifactId>
</dependency> </dependency>

View File

@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.datasource.configuration; package org.dromara.visor.framework.datasource.configuration;
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
import com.orion.visor.framework.common.constant.AutoConfigureOrderConst; import org.dromara.visor.framework.common.constant.AutoConfigureOrderConst;
import com.orion.visor.framework.datasource.core.filter.DruidAdRemoveFilter; import org.dromara.visor.framework.datasource.core.filter.DruidAdRemoveFilter;
import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.orion.visor.framework.datasource.core.filter; package org.dromara.visor.framework.datasource.core.filter;
import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.Utils;
import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.filter.OncePerRequestFilter;

View File

@@ -1 +1 @@
com.orion.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration org.dromara.visor.framework.datasource.configuration.OrionDataSourceAutoConfiguration

Some files were not shown because too many files have changed in this diff Show More