diff --git a/pom.xml b/pom.xml index c74a8b9b..407524fe 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} - RuoYi-Cloud-Plus - https://gitee.com/dromara/RuoYi-Cloud-Plus - RuoYi-Cloud-Plus微服务系统 + Stwzhj-Cloud-Plus + https://gitee.com/dromara/stwzhj-Cloud-Plus + Stwzhj-Cloud-Plus微服务系统 2.2.2 @@ -115,7 +115,7 @@ org.dromara - ruoyi-common-alibaba-bom + stwzhj-common-alibaba-bom ${revision} pom import @@ -149,7 +149,7 @@ org.dromara - ruoyi-common-bom + stwzhj-common-bom ${revision} pom import @@ -158,7 +158,7 @@ org.dromara - ruoyi-api-bom + stwzhj-api-bom ${revision} pom import @@ -375,13 +375,13 @@ - ruoyi-auth - ruoyi-gateway - ruoyi-visual - ruoyi-modules - ruoyi-api - ruoyi-common - ruoyi-example + stwzhj-auth + stwzhj-gateway + stwzhj-visual + stwzhj-modules + stwzhj-api + stwzhj-common + stwzhj-example pom diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml deleted file mode 100644 index 48e00955..00000000 --- a/ruoyi-common/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - org.dromara - ruoyi-cloud-plus - ${revision} - - 4.0.0 - - - ruoyi-common-bom - ruoyi-common-alibaba-bom - ruoyi-common-log - ruoyi-common-dict - ruoyi-common-excel - ruoyi-common-core - ruoyi-common-redis - ruoyi-common-doc - ruoyi-common-security - ruoyi-common-satoken - ruoyi-common-web - ruoyi-common-mybatis - ruoyi-common-job - ruoyi-common-dubbo - ruoyi-common-seata - ruoyi-common-loadbalancer - ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-idempotent - ruoyi-common-mail - ruoyi-common-sms - ruoyi-common-logstash - ruoyi-common-elasticsearch - ruoyi-common-sentinel - ruoyi-common-skylog - ruoyi-common-prometheus - ruoyi-common-translation - ruoyi-common-sensitive - ruoyi-common-json - ruoyi-common-encrypt - ruoyi-common-tenant - ruoyi-common-websocket - ruoyi-common-social - ruoyi-common-nacos - ruoyi-common-bus - ruoyi-common-sse - - - ruoyi-common - pom - - - ruoyi-common通用模块 - - - diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml deleted file mode 100644 index 6ad866f2..00000000 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/ActuatorAuthFilter.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/ActuatorAuthFilter.java deleted file mode 100644 index 1b857c39..00000000 --- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/ActuatorAuthFilter.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.alibaba.nacos.config; - -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - -public class ActuatorAuthFilter implements Filter { - - private final String username; - private final String password; - - public ActuatorAuthFilter(String username, String password) { - this.username = username; - this.password = password; - } - - @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { - HttpServletRequest request = (HttpServletRequest) servletRequest; - HttpServletResponse response = (HttpServletResponse) servletResponse; - - // 获取 Authorization 头 - String authHeader = request.getHeader("Authorization"); - - if (authHeader == null || !authHeader.startsWith("Basic ")) { - // 如果没有提供 Authorization 或者格式不对，则返回 401 - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - - // 解码 Base64 编码的用户名和密码 - String base64Credentials = authHeader.substring("Basic ".length()); - byte[] credDecoded = Base64.getDecoder().decode(base64Credentials); - String credentials = new String(credDecoded, StandardCharsets.UTF_8); - String[] split = credentials.split(":"); - if (split.length != 2) { - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - // 验证用户名和密码 - if (!username.equals(split[0]) && password.equals(split[1])) { - response.setHeader("WWW-Authenticate", "Basic realm=\"realm\""); - response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized"); - return; - } - // 如果认证成功，继续处理请求 - filterChain.doFilter(request, response); - } - - @Override - public void init(FilterConfig filterConfig) { - } - - @Override - public void destroy() { - } - -} diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/SecurityConfig.java b/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/SecurityConfig.java deleted file mode 100644 index e38ae3f6..00000000 --- a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/SecurityConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.alibaba.nacos.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.web.servlet.FilterRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 权限安全配置 - * - * @author Lion Li - */ -@Configuration -public class SecurityConfig { - - @Value("${spring.boot.admin.client.username}") - private String username; - @Value("${spring.boot.admin.client.password}") - private String password; - - @Bean - public FilterRegistrationBean actuatorFilterRegistrationBean() { - FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new ActuatorAuthFilter(username, password)); - registrationBean.addUrlPatterns("/actuator", "/actuator/**"); - return registrationBean; - } - -} diff --git a/ruoyi-api/pom.xml b/stwzhj-api/pom.xml similarity index 60% rename from ruoyi-api/pom.xml rename to stwzhj-api/pom.xml index 8b5f0b9e..38a3e4a9 100644 --- a/ruoyi-api/pom.xml +++ b/stwzhj-api/pom.xml @@ -3,23 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-api-bom - ruoyi-api-system - ruoyi-api-resource - ruoyi-api-workflow + stwzhj-api-bom + stwzhj-api-system + stwzhj-api-resource + stwzhj-api-workflow + stwzhj-api-data2es - ruoyi-api + stwzhj-api pom - ruoyi-api系统接口 + stwzhj-api系统接口 diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/stwzhj-api/stwzhj-api-bom/pom.xml similarity index 71% rename from ruoyi-api/ruoyi-api-bom/pom.xml rename to stwzhj-api/stwzhj-api-bom/pom.xml index c2926347..f1e1c317 100644 --- a/ruoyi-api/ruoyi-api-bom/pom.xml +++ b/stwzhj-api/stwzhj-api-bom/pom.xml @@ -6,12 +6,12 @@ 4.0.0 org.dromara - ruoyi-api-bom + stwzhj-api-bom pom ${revision} - ruoyi-api-bom api依赖项 + stwzhj-api-bom api依赖项 @@ -23,21 +23,27 @@ org.dromara - ruoyi-api-system + stwzhj-api-system ${revision} org.dromara - ruoyi-api-resource + stwzhj-api-resource ${revision} org.dromara - ruoyi-api-workflow + stwzhj-api-workflow + ${revision} + + + + org.dromara + stwzhj-api-data2es ${revision} diff --git a/stwzhj-api/stwzhj-api-data2es/pom.xml b/stwzhj-api/stwzhj-api-data2es/pom.xml new file mode 100644 index 00000000..dfd4cc1c --- /dev/null +++ b/stwzhj-api/stwzhj-api-data2es/pom.xml @@ -0,0 +1,33 @@ + + + + org.dromara + stwzhj-api + ${revision} + + 4.0.0 + + stwzhj-api-data2es + + + stwzhj-api-data2es数据处理接口模块 + + + + + + + org.dromara + stwzhj-common-core + + + + org.dromara + stwzhj-common-excel + + + + + diff --git a/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/RemoteDataToEsService.java b/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/RemoteDataToEsService.java new file mode 100644 index 00000000..92fa899f --- /dev/null +++ b/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/RemoteDataToEsService.java @@ -0,0 +1,11 @@ +package org.dromara.data2es.api; + +import org.dromara.common.core.domain.R; +import org.dromara.data2es.api.domain.RemoteGpsInfo; + +import java.util.List; + +public interface RemoteDataToEsService { + + R saveDataBatch(List gpsInfoList); +} diff --git a/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/domain/RemoteGpsInfo.java b/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/domain/RemoteGpsInfo.java new file mode 100644 index 00000000..598c0a2f --- /dev/null +++ b/stwzhj-api/stwzhj-api-data2es/src/main/java/org/dromara/data2es/api/domain/RemoteGpsInfo.java @@ -0,0 +1,48 @@ +package org.dromara.data2es.api.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

description:

+ * + * @author chenle + * @date 2022-04-16 14:59 + */ +@Data +public class RemoteGpsInfo implements Serializable { + /** + * 设备串号，设备唯一值 + */ + private String deviceCode; + /** + * 类型 + */ + private String deviceType; + private String lat; + private String lng; + //方向 + private String orientation; + //高程 + private String height; + //精度 + private String deltaH; + private String speed; + + private String zzjgdm; + private String zzjgmc; + private String policeNo; + private String policeName; + private String phoneNum; + private String carNum; + + private Integer online; + + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date gpsTime; + //3401,3402等地市代码 + private String infoSource; +} diff --git a/ruoyi-api/ruoyi-api-resource/pom.xml b/stwzhj-api/stwzhj-api-resource/pom.xml similarity index 71% rename from ruoyi-api/ruoyi-api-resource/pom.xml rename to stwzhj-api/stwzhj-api-resource/pom.xml index 4a4f7289..ab6d5307 100644 --- a/ruoyi-api/ruoyi-api-resource/pom.xml +++ b/stwzhj-api/stwzhj-api-resource/pom.xml @@ -4,23 +4,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-api + stwzhj-api ${revision} 4.0.0 - ruoyi-api-resource + stwzhj-api-resource - ruoyi-api-resource 资源服务接口模块 + stwzhj-api-resource 资源服务接口模块 - + org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteFileService.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteFileServiceMock.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMailService.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageService.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageService.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageService.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageService.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/RemoteSmsService.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteFile.java diff --git a/ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java b/stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java similarity index 100% rename from ruoyi-api/ruoyi-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java rename to stwzhj-api/stwzhj-api-resource/src/main/java/org/dromara/resource/api/domain/RemoteSms.java diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/stwzhj-api/stwzhj-api-system/pom.xml similarity index 70% rename from ruoyi-api/ruoyi-api-system/pom.xml rename to stwzhj-api/stwzhj-api-system/pom.xml index 02958f35..13c4b5be 100644 --- a/ruoyi-api/ruoyi-api-system/pom.xml +++ b/stwzhj-api/stwzhj-api-system/pom.xml @@ -4,28 +4,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-api + stwzhj-api ${revision} 4.0.0 - ruoyi-api-system + stwzhj-api-system - ruoyi-api-system系统接口模块 + stwzhj-api-system系统接口模块 - + org.dromara - ruoyi-common-core + stwzhj-common-core org.dromara - ruoyi-common-excel + stwzhj-common-excel diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteClientService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteClientService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteClientService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteClientService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteConfigService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java similarity index 92% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java index d6a40056..ad246a58 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDataScopeService.java @@ -21,6 +21,6 @@ public interface RemoteDataScopeService { * @param deptId 部门ID * @return 返回部门及其下级的权限语句，如果没有找到则返回 null */ - String getDeptAndChild(Long deptId); + String getDeptAndChild(String deptId); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDeptService.java diff --git a/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDeviceService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDeviceService.java new file mode 100644 index 00000000..13ae3840 --- /dev/null +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDeviceService.java @@ -0,0 +1,20 @@ +package org.dromara.system.api; + +import org.dromara.common.core.domain.R; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.dromara.system.api.domain.bo.RemoteDeviceToStBo; +import org.dromara.system.api.domain.vo.RemoteDeviceVo; + +import java.util.List; + +public interface RemoteDeviceService { + + boolean batchSaveDevice(List boList); + + R pageDeviceList(RemoteDeviceBo bo); + + List deviceList(RemoteDeviceBo bo); + + R saveDeviceToSt(String infoSource, List list); + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteDictService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteLogService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteSocialService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteTenantService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/SysUserOnline.java diff --git a/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceBo.java new file mode 100644 index 00000000..ccabe023 --- /dev/null +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceBo.java @@ -0,0 +1,93 @@ +package org.dromara.system.api.domain.bo; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; + +import java.io.Serial; +import java.io.Serializable; + +@Data +@NoArgsConstructor +public class RemoteDeviceBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + private Long id; + + /** + * 外部系统设备编号建议21位 + */ + @NotBlank(message = "设备编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceCode; + + /** + * 设备类型 + */ + @NotBlank(message = "设备类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceType; + + private String infoSource; + + /** + * 组织机构代码 + */ + @NotBlank(message = "组织机构代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zzjgdm; + + /** + * 组织机构名称 + */ + @NotBlank(message = "组织机构名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zzjgmc; + + /** + * 警号（若有） + */ + private String policeNo; + + /** + * 姓名（若有） + */ + private String policeName; + + /** + * 联系电话（若有） + */ + private String phoneNum; + + /** + * 车牌号（若有） + */ + private String carNum; + + /** + * 0无效，1有效 + */ + private Integer valid; + + /** + * 备注字段1 + */ + private String remark1; + + /** + * 备注字段2 + */ + private String remark2; + + private String beginTime; + + private String endTime; + + private Integer pageNum; + + private Integer pageSize; + +} diff --git a/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceToStBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceToStBo.java new file mode 100644 index 00000000..bda3580c --- /dev/null +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteDeviceToStBo.java @@ -0,0 +1,19 @@ +package org.dromara.system.api.domain.bo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +@Data +public class RemoteDeviceToStBo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String infoSource; + + private List deviceBoList; + +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java diff --git a/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDeviceVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDeviceVo.java new file mode 100644 index 00000000..ee8e6deb --- /dev/null +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDeviceVo.java @@ -0,0 +1,85 @@ +package org.dromara.system.api.domain.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class RemoteDeviceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + private Long id; + + /** + * 外部系统设备编号建议21位 + */ + private String deviceCode; + + /** + * 设备类型 + */ + private String deviceType; + + private String infoSource; + + /** + * 组织机构代码 + */ + private String zzjgdm; + + /** + * 组织机构名称 + */ + private String zzjgmc; + + /** + * 警号（若有） + */ + private String policeNo; + + /** + * 姓名（若有） + */ + private String policeName; + + /** + * 联系电话（若有） + */ + private String phoneNum; + + /** + * 车牌号（若有） + */ + private String carNum; + + /** + * 0无效，1有效 + */ + private Integer valid; + + /** + * 备注字段1 + */ + private String remark1; + + /** + * 备注字段2 + */ + private String remark2; + + private String createTime; + + private String updateTime; +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java similarity index 98% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java index 405a87f0..b6c1fce0 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java +++ b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/LoginUser.java @@ -33,7 +33,7 @@ public class LoginUser implements Serializable { /** * 部门ID */ - private Long deptId; + private String deptId; /** * 部门类别编码 diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/RoleDTO.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java b/stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java similarity index 100% rename from ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java rename to stwzhj-api/stwzhj-api-system/src/main/java/org/dromara/system/api/model/XcxLoginUser.java diff --git a/ruoyi-api/ruoyi-api-workflow/pom.xml b/stwzhj-api/stwzhj-api-workflow/pom.xml similarity index 69% rename from ruoyi-api/ruoyi-api-workflow/pom.xml rename to stwzhj-api/stwzhj-api-workflow/pom.xml index 45c32d06..c9909612 100644 --- a/ruoyi-api/ruoyi-api-workflow/pom.xml +++ b/stwzhj-api/stwzhj-api-workflow/pom.xml @@ -4,27 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-api + stwzhj-api ${revision} 4.0.0 - ruoyi-api-workflow + stwzhj-api-workflow - ruoyi-api-workflow 工作流接口模块 + stwzhj-api-workflow 工作流接口模块 - + org.dromara - ruoyi-common-core + stwzhj-common-core org.dromara - ruoyi-common-bus + stwzhj-common-bus diff --git a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/RemoteWorkflowService.java b/stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/RemoteWorkflowService.java similarity index 100% rename from ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/RemoteWorkflowService.java rename to stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/RemoteWorkflowService.java diff --git a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessEvent.java b/stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessEvent.java similarity index 100% rename from ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessEvent.java rename to stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessEvent.java diff --git a/ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessTaskEvent.java b/stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessTaskEvent.java similarity index 100% rename from ruoyi-api/ruoyi-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessTaskEvent.java rename to stwzhj-api/stwzhj-api-workflow/src/main/java/org/dromara/workflow/api/domain/event/ProcessTaskEvent.java diff --git a/ruoyi-auth/Dockerfile b/stwzhj-auth/Dockerfile similarity index 100% rename from ruoyi-auth/Dockerfile rename to stwzhj-auth/Dockerfile diff --git a/ruoyi-auth/pom.xml b/stwzhj-auth/pom.xml similarity index 70% rename from ruoyi-auth/pom.xml rename to stwzhj-auth/pom.xml index 980d27e5..775d6a95 100644 --- a/ruoyi-auth/pom.xml +++ b/stwzhj-auth/pom.xml @@ -3,22 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-auth + stwzhj-auth - ruoyi-auth 认证授权中心 + stwzhj-auth 认证授权中心 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos @@ -28,86 +28,86 @@ org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel - + org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-common-social + stwzhj-common-social - + org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-ratelimiter + stwzhj-common-ratelimiter org.dromara - ruoyi-common-encrypt + stwzhj-common-encrypt org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-seata + stwzhj-common-seata org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-api-resource + stwzhj-api-resource - + - + - + - + diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java b/stwzhj-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java rename to stwzhj-auth/src/main/java/org/dromara/auth/RuoYiAuthApplication.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java b/stwzhj-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java rename to stwzhj-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java b/stwzhj-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java rename to stwzhj-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java b/stwzhj-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java rename to stwzhj-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/stwzhj-auth/src/main/java/org/dromara/auth/controller/TokenController.java similarity index 92% rename from ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java rename to stwzhj-auth/src/main/java/org/dromara/auth/controller/TokenController.java index 8de19740..5efbffbc 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java +++ b/stwzhj-auth/src/main/java/org/dromara/auth/controller/TokenController.java @@ -107,6 +107,30 @@ public class TokenController { return R.ok(loginVo); } + /** + * 第三方获取Token + * + * @param body 登录信息 + * @return 结果 + */ + @ApiEncrypt + @PostMapping("/getToken") + public R getToken(@RequestBody String body) { + LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class); + ValidatorUtils.validate(loginBody); + // 授权类型和客户端id + String clientId = "e5cd7e4891bf95d1d19206ce24a7b32e"; + String grantType = "password"; + RemoteClientVo clientVo = remoteClientService.queryByClientId(clientId); + + // 登录 + LoginVo loginVo = IAuthStrategy.login(body, clientVo, grantType); + + return R.ok(loginVo); + } + + + /** * 第三方登录请求 * diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java b/stwzhj-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java rename to stwzhj-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java b/stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java rename to stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java b/stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java rename to stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java b/stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java rename to stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java b/stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java rename to stwzhj-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java b/stwzhj-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java rename to stwzhj-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java b/stwzhj-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java rename to stwzhj-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/RegisterBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/RegisterBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/RegisterBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java b/stwzhj-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java rename to stwzhj-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java b/stwzhj-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java rename to stwzhj-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java b/stwzhj-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java rename to stwzhj-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java b/stwzhj-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java rename to stwzhj-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/SysLoginService.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/SysLoginService.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java b/stwzhj-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java similarity index 100% rename from ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java rename to stwzhj-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java diff --git a/ruoyi-auth/src/main/resources/application.yml b/stwzhj-auth/src/main/resources/application.yml similarity index 96% rename from ruoyi-auth/src/main/resources/application.yml rename to stwzhj-auth/src/main/resources/application.yml index 90c05356..bb4d0cf1 100644 --- a/ruoyi-auth/src/main/resources/application.yml +++ b/stwzhj-auth/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-auth + name: stwzhj-auth profiles: # 环境配置 active: @profiles.active@ diff --git a/ruoyi-auth/src/main/resources/banner.txt b/stwzhj-auth/src/main/resources/banner.txt similarity index 98% rename from ruoyi-auth/src/main/resources/banner.txt rename to stwzhj-auth/src/main/resources/banner.txt index d4fe7e10..97c5c27c 100644 --- a/ruoyi-auth/src/main/resources/banner.txt +++ b/stwzhj-auth/src/main/resources/banner.txt @@ -1,10 +1,10 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ _ - (_) | | | | - _ __ _ _ ___ _ _ _ ______ __ _ _ _ | |_ | |__ -| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ -| | | |_| || (_) || |_| || | | (_| || |_| || |_ | | | | -|_| \__,_| \___/ \__, ||_| \__,_| \__,_| \__||_| |_| - __/ | +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) | | | | + _ __ _ _ ___ _ _ _ ______ __ _ _ _ | |_ | |__ +| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ +| | | |_| || (_) || |_| || | | (_| || |_| || |_ | | | | +|_| \__,_| \___/ \__, ||_| \__,_| \__,_| \__||_| |_| + __/ | |___/ \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/logback-plus.xml b/stwzhj-auth/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-auth/src/main/resources/logback-plus.xml rename to stwzhj-auth/src/main/resources/logback-plus.xml diff --git a/stwzhj-common/pom.xml b/stwzhj-common/pom.xml new file mode 100644 index 00000000..ef10130a --- /dev/null +++ b/stwzhj-common/pom.xml @@ -0,0 +1,57 @@ + + + + org.dromara + stwzhj-cloud-plus + ${revision} + + 4.0.0 + + + stwzhj-common-bom + stwzhj-common-alibaba-bom + stwzhj-common-log + stwzhj-common-dict + stwzhj-common-excel + stwzhj-common-core + stwzhj-common-redis + stwzhj-common-doc + stwzhj-common-security + stwzhj-common-satoken + stwzhj-common-web + stwzhj-common-mybatis + stwzhj-common-job + stwzhj-common-dubbo + stwzhj-common-seata + stwzhj-common-loadbalancer + stwzhj-common-oss + stwzhj-common-ratelimiter + stwzhj-common-idempotent + stwzhj-common-mail + stwzhj-common-sms + stwzhj-common-logstash + stwzhj-common-elasticsearch + stwzhj-common-sentinel + stwzhj-common-skylog + stwzhj-common-prometheus + stwzhj-common-translation + stwzhj-common-sensitive + stwzhj-common-json + stwzhj-common-encrypt + stwzhj-common-tenant + stwzhj-common-websocket + stwzhj-common-social + stwzhj-common-nacos + stwzhj-common-bus + stwzhj-common-sse + + + stwzhj-common + pom + + + stwzhj-common通用模块 + + + diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/stwzhj-common/stwzhj-common-alibaba-bom/pom.xml similarity index 98% rename from ruoyi-common/ruoyi-common-alibaba-bom/pom.xml rename to stwzhj-common/stwzhj-common-alibaba-bom/pom.xml index 94956fd9..37a48baf 100644 --- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml +++ b/stwzhj-common/stwzhj-common-alibaba-bom/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-common-alibaba-bom + stwzhj-common-alibaba-bom ${revision} pom - ruoyi-common-alibaba-bom alibaba依赖项 + stwzhj-common-alibaba-bom alibaba依赖项 diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/stwzhj-common/stwzhj-common-bom/pom.xml similarity index 75% rename from ruoyi-common/ruoyi-common-bom/pom.xml rename to stwzhj-common/stwzhj-common-bom/pom.xml index 91d30f05..5c19a88a 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/stwzhj-common/stwzhj-common-bom/pom.xml @@ -5,12 +5,12 @@ 4.0.0 org.dromara - ruoyi-common-bom + stwzhj-common-bom ${revision} pom - ruoyi-common-bom common依赖项 + stwzhj-common-bom common依赖项 @@ -22,238 +22,238 @@ org.dromara - ruoyi-common-core + stwzhj-common-core ${revision} org.dromara - ruoyi-common-doc + stwzhj-common-doc ${revision} org.dromara - ruoyi-common-security + stwzhj-common-security ${revision} org.dromara - ruoyi-common-satoken + stwzhj-common-satoken ${revision} org.dromara - ruoyi-common-log + stwzhj-common-log ${revision} org.dromara - ruoyi-common-dict + stwzhj-common-dict ${revision} org.dromara - ruoyi-common-excel + stwzhj-common-excel ${revision} org.dromara - ruoyi-common-redis + stwzhj-common-redis ${revision} org.dromara - ruoyi-common-web + stwzhj-common-web ${revision} org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis ${revision} org.dromara - ruoyi-common-job + stwzhj-common-job ${revision} org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo ${revision} org.dromara - ruoyi-common-seata + stwzhj-common-seata ${revision} org.dromara - ruoyi-common-loadbalancer + stwzhj-common-loadbalancer ${revision} org.dromara - ruoyi-common-oss + stwzhj-common-oss ${revision} org.dromara - ruoyi-common-ratelimiter + stwzhj-common-ratelimiter ${revision} org.dromara - ruoyi-common-idempotent + stwzhj-common-idempotent ${revision} org.dromara - ruoyi-common-mail + stwzhj-common-mail ${revision} org.dromara - ruoyi-common-sms + stwzhj-common-sms ${revision} org.dromara - ruoyi-common-logstash + stwzhj-common-logstash ${revision} org.dromara - ruoyi-common-elasticsearch + stwzhj-common-elasticsearch ${revision} org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel ${revision} org.dromara - ruoyi-common-skylog + stwzhj-common-skylog ${revision} org.dromara - ruoyi-common-prometheus + stwzhj-common-prometheus ${revision} org.dromara - ruoyi-common-translation + stwzhj-common-translation ${revision} org.dromara - ruoyi-common-sensitive + stwzhj-common-sensitive ${revision} org.dromara - ruoyi-common-json + stwzhj-common-json ${revision} org.dromara - ruoyi-common-encrypt + stwzhj-common-encrypt ${revision} org.dromara - ruoyi-common-tenant + stwzhj-common-tenant ${revision} org.dromara - ruoyi-common-websocket + stwzhj-common-websocket ${revision} org.dromara - ruoyi-common-social + stwzhj-common-social ${revision} org.dromara - ruoyi-common-nacos + stwzhj-common-nacos ${revision} org.dromara - ruoyi-common-bus + stwzhj-common-bus ${revision} org.dromara - ruoyi-common-sse + stwzhj-common-sse ${revision} diff --git a/ruoyi-common/ruoyi-common-bus/pom.xml b/stwzhj-common/stwzhj-common-bus/pom.xml similarity index 89% rename from ruoyi-common/ruoyi-common-bus/pom.xml rename to stwzhj-common/stwzhj-common-bus/pom.xml index e0256f86..2d2cbeed 100644 --- a/ruoyi-common/ruoyi-common-bus/pom.xml +++ b/stwzhj-common/stwzhj-common-bus/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-bus + stwzhj-common-bus - ruoyi-common-bus 消息总线模块 + stwzhj-common-bus 消息总线模块 diff --git a/ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/BusCustomConfiguration.java b/stwzhj-common/stwzhj-common-bus/src/main/java/org/dromara/common/bus/config/BusCustomConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-bus/src/main/java/org/dromara/common/bus/config/BusCustomConfiguration.java rename to stwzhj-common/stwzhj-common-bus/src/main/java/org/dromara/common/bus/config/BusCustomConfiguration.java diff --git a/ruoyi-common/ruoyi-common-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-bus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/stwzhj-common/stwzhj-common-core/pom.xml similarity index 95% rename from ruoyi-common/ruoyi-common-core/pom.xml rename to stwzhj-common/stwzhj-common-core/pom.xml index 01d876e7..59381064 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/stwzhj-common/stwzhj-common-core/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-core + stwzhj-common-core - ruoyi-common-core 核心模块 + stwzhj-common-core 核心模块 diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/Constants.java similarity index 97% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/Constants.java index cdbda89f..d41d0b4e 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java +++ b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/Constants.java @@ -75,7 +75,7 @@ public interface Constants { /** * 顶级部门id */ - Long TOP_PARENT_ID = 0L; + String TOP_PARENT_ID = "0"; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/TenantConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/domain/R.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/domain/R.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/TenantStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/UserType.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/enums/UserType.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/SseException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/SseException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/service/DictService.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/service/DictService.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java diff --git a/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/RedisConstants.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/RedisConstants.java new file mode 100644 index 00000000..828ca4c5 --- /dev/null +++ b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/RedisConstants.java @@ -0,0 +1,32 @@ +package org.dromara.common.core.utils; + +public class RedisConstants { + // 用户 + public static final String CCL_CODING_SSO_TOKEN = "com.ruansee:sso:token:"; + // 单位 s + public static final int CCL_CODING_SSO_TOKEN_TIME = 60 * 60 * 24 * 3; + + public static final String APP_CLIENT_REQUEST = "app_client_request_list:"; + + public static final String ONLINE_USERS = "online_users:"; + + public static final String REAL_ONLINE_USERS = "real_online_users:"; + + public static final String ORG_CODE_ONLINE_DEVICES = "orgcode_online_device:"; + public static final String ORG_CODE_PRE = "org_code:"; + + public static final String ONLINE_USERS_GEO = "geo_hash"; + + public static final long REDIS_ONLINE_USER_EXPIRE_TIME = 60 * 60 * 24; + + public static final long REDIS_ONLINE_USER_NEVER_EXPIRE = -1; + + public static final long FIVE_MINUTES_REDIS_ONLINE_USER_EXPIRE_TIME = 60 * 5; + + + public static String getUserTokenKey(String token) { + return CCL_CODING_SSO_TOKEN + token; + } + + +} diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/Threads.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/Threads.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/xss/Xss.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/xss/Xss.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java rename to stwzhj-common/stwzhj-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages.properties b/stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages.properties rename to stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages.properties diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages_en_US.properties b/stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages_en_US.properties rename to stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages_zh_CN.properties b/stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-common/ruoyi-common-core/src/main/resources/i18n/messages_zh_CN.properties rename to stwzhj-common/stwzhj-common-core/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/stwzhj-common/stwzhj-common-dict/pom.xml similarity index 75% rename from ruoyi-common/ruoyi-common-dict/pom.xml rename to stwzhj-common/stwzhj-common-dict/pom.xml index e7dcf05f..ec0e995e 100644 --- a/ruoyi-common/ruoyi-common-dict/pom.xml +++ b/stwzhj-common/stwzhj-common-dict/pom.xml @@ -4,28 +4,28 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-dict + stwzhj-common-dict - ruoyi-common-dict 字典 + stwzhj-common-dict 字典 - + org.dromara - ruoyi-common-redis + stwzhj-common-redis org.dromara - ruoyi-api-system + stwzhj-api-system diff --git a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java b/stwzhj-common/stwzhj-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java rename to stwzhj-common/stwzhj-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java diff --git a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java b/stwzhj-common/stwzhj-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java rename to stwzhj-common/stwzhj-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java diff --git a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/stwzhj-common/stwzhj-common-doc/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-doc/pom.xml rename to stwzhj-common/stwzhj-common-doc/pom.xml index 26a35fc8..3c96eab3 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/stwzhj-common/stwzhj-common-doc/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-doc + stwzhj-common-doc - ruoyi-common-doc 系统接口 + stwzhj-common-doc 系统接口 org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/PlusPaths.java b/stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/PlusPaths.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/PlusPaths.java rename to stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/PlusPaths.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java b/stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java rename to stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java rename to stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java rename to stwzhj-common/stwzhj-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-dubbo/pom.xml b/stwzhj-common/stwzhj-common-dubbo/pom.xml similarity index 92% rename from ruoyi-common/ruoyi-common-dubbo/pom.xml rename to stwzhj-common/stwzhj-common-dubbo/pom.xml index 5f0088c3..e515b05f 100644 --- a/ruoyi-common/ruoyi-common-dubbo/pom.xml +++ b/stwzhj-common/stwzhj-common-dubbo/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-dubbo + stwzhj-common-dubbo - ruoyi-common-dubbo RPC服务 + stwzhj-common-dubbo RPC服务 org.dromara - ruoyi-common-json + stwzhj-common-json diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/apache/dubbo/metadata/store/redis/RedisMetadataReport.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/CustomBeanFactoryPostProcessor.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/config/CustomBeanFactoryPostProcessor.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/CustomBeanFactoryPostProcessor.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/config/CustomBeanFactoryPostProcessor.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/config/DubboConfiguration.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/enumd/RequestLogEnum.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/enumd/RequestLogEnum.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/enumd/RequestLogEnum.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/enumd/RequestLogEnum.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/filter/DubboRequestFilter.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/filter/DubboRequestFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/filter/DubboRequestFilter.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/filter/DubboRequestFilter.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/properties/DubboCustomProperties.java b/stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/properties/DubboCustomProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/java/org/dromara/common/dubbo/properties/DubboCustomProperties.java rename to stwzhj-common/stwzhj-common-dubbo/src/main/java/org/dromara/common/dubbo/properties/DubboCustomProperties.java diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter rename to stwzhj-common/stwzhj-common-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml b/stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml similarity index 100% rename from ruoyi-common/ruoyi-common-dubbo/src/main/resources/common-dubbo.yml rename to stwzhj-common/stwzhj-common-dubbo/src/main/resources/common-dubbo.yml diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/stwzhj-common/stwzhj-common-elasticsearch/pom.xml similarity index 80% rename from ruoyi-common/ruoyi-common-elasticsearch/pom.xml rename to stwzhj-common/stwzhj-common-elasticsearch/pom.xml index 401320dc..43ad1d80 100644 --- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml +++ b/stwzhj-common/stwzhj-common-elasticsearch/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-elasticsearch + stwzhj-common-elasticsearch - ruoyi-common-elasticsearch ES搜索引擎服务 + stwzhj-common-elasticsearch ES搜索引擎服务 diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java b/stwzhj-common/stwzhj-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java similarity index 100% rename from ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java rename to stwzhj-common/stwzhj-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/ActuatorEnvironmentPostProcessor.java diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java b/stwzhj-common/stwzhj-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java rename to stwzhj-common/stwzhj-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring.factories b/stwzhj-common/stwzhj-common-elasticsearch/src/main/resources/META-INF/spring.factories similarity index 100% rename from ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring.factories rename to stwzhj-common/stwzhj-common-elasticsearch/src/main/resources/META-INF/spring.factories diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/stwzhj-common/stwzhj-common-encrypt/pom.xml similarity index 87% rename from ruoyi-common/ruoyi-common-encrypt/pom.xml rename to stwzhj-common/stwzhj-common-encrypt/pom.xml index ed4910ef..62e913c7 100644 --- a/ruoyi-common/ruoyi-common-encrypt/pom.xml +++ b/stwzhj-common/stwzhj-common-encrypt/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-encrypt + stwzhj-common-encrypt - ruoyi-common-encrypt 数据加解密模块 + stwzhj-common-encrypt 数据加解密模块 org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java rename to stwzhj-common/stwzhj-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/stwzhj-common/stwzhj-common-excel/pom.xml similarity index 79% rename from ruoyi-common/ruoyi-common-excel/pom.xml rename to stwzhj-common/stwzhj-common-excel/pom.xml index dd4a5eeb..3f946e19 100644 --- a/ruoyi-common/ruoyi-common-excel/pom.xml +++ b/stwzhj-common/stwzhj-common-excel/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-excel + stwzhj-common-excel - ruoyi-common-excel + stwzhj-common-excel org.dromara - ruoyi-common-json + stwzhj-common-json diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java similarity index 100% rename from ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java rename to stwzhj-common/stwzhj-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/stwzhj-common/stwzhj-common-idempotent/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-idempotent/pom.xml rename to stwzhj-common/stwzhj-common-idempotent/pom.xml index 64418b42..706015ce 100644 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ b/stwzhj-common/stwzhj-common-idempotent/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-idempotent + stwzhj-common-idempotent - ruoyi-common-idempotent 幂等功能 + stwzhj-common-idempotent 幂等功能 org.dromara - ruoyi-common-json + stwzhj-common-json org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java b/stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java rename to stwzhj-common/stwzhj-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/stwzhj-common/stwzhj-common-job/pom.xml similarity index 88% rename from ruoyi-common/ruoyi-common-job/pom.xml rename to stwzhj-common/stwzhj-common-job/pom.xml index 2a08c7da..194d8b6f 100644 --- a/ruoyi-common/ruoyi-common-job/pom.xml +++ b/stwzhj-common/stwzhj-common-job/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-job + stwzhj-common-job - ruoyi-common-job 定时任务 + stwzhj-common-job 定时任务 @@ -47,7 +47,7 @@ org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/stwzhj-common/stwzhj-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java rename to stwzhj-common/stwzhj-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/properties/SnailJobServerProperties.java b/stwzhj-common/stwzhj-common-job/src/main/java/org/dromara/common/job/config/properties/SnailJobServerProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/properties/SnailJobServerProperties.java rename to stwzhj-common/stwzhj-common-job/src/main/java/org/dromara/common/job/config/properties/SnailJobServerProperties.java diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/stwzhj-common/stwzhj-common-json/pom.xml similarity index 82% rename from ruoyi-common/ruoyi-common-json/pom.xml rename to stwzhj-common/stwzhj-common-json/pom.xml index 870df5cd..228b0fdd 100644 --- a/ruoyi-common/ruoyi-common-json/pom.xml +++ b/stwzhj-common/stwzhj-common-json/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-json + stwzhj-common-json - ruoyi-common-json 序列化模块 + stwzhj-common-json 序列化模块 org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java rename to stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java rename to stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java rename to stwzhj-common/stwzhj-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml b/stwzhj-common/stwzhj-common-loadbalancer/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-loadbalancer/pom.xml rename to stwzhj-common/stwzhj-common-loadbalancer/pom.xml index 1509a44f..dc437e56 100644 --- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml +++ b/stwzhj-common/stwzhj-common-loadbalancer/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-loadbalancer + stwzhj-common-loadbalancer - ruoyi-common-loadbalancer 自定义负载均衡(多团队开发使用) + stwzhj-common-loadbalancer 自定义负载均衡(多团队开发使用) @@ -33,7 +33,7 @@ org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java b/stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomEnvironmentPostProcessor.java diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceAutoConfiguration.java b/stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceAutoConfiguration.java rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceClientConfiguration.java b/stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceClientConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceClientConfiguration.java rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/config/CustomLoadBalanceClientConfiguration.java diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomDubboLoadBalancer.java b/stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomDubboLoadBalancer.java similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomDubboLoadBalancer.java rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomDubboLoadBalancer.java diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomSpringCloudLoadBalancer.java b/stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomSpringCloudLoadBalancer.java similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomSpringCloudLoadBalancer.java rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/java/org/dromara/common/loadbalance/core/CustomSpringCloudLoadBalancer.java diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.LoadBalance b/stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.LoadBalance similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.LoadBalance rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.LoadBalance diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories b/stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/spring.factories similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring.factories rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/spring.factories diff --git a/ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-loadbalancer/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/stwzhj-common/stwzhj-common-log/pom.xml similarity index 77% rename from ruoyi-common/ruoyi-common-log/pom.xml rename to stwzhj-common/stwzhj-common-log/pom.xml index 2614957f..23134984 100644 --- a/ruoyi-common/ruoyi-common-log/pom.xml +++ b/stwzhj-common/stwzhj-common-log/pom.xml @@ -4,27 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-log + stwzhj-common-log - ruoyi-common-log 日志记录 + stwzhj-common-log 日志记录 org.dromara - ruoyi-common-satoken + stwzhj-common-satoken org.dromara - ruoyi-common-json + stwzhj-common-json diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/annotation/Log.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/annotation/Log.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/LogEventListener.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java rename to stwzhj-common/stwzhj-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-logstash/pom.xml b/stwzhj-common/stwzhj-common-logstash/pom.xml similarity index 80% rename from ruoyi-common/ruoyi-common-logstash/pom.xml rename to stwzhj-common/stwzhj-common-logstash/pom.xml index 36ad275d..28b4f65a 100644 --- a/ruoyi-common/ruoyi-common-logstash/pom.xml +++ b/stwzhj-common/stwzhj-common-logstash/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-logstash + stwzhj-common-logstash - ruoyi-common-logstash logstash日志推送模块 + stwzhj-common-logstash logstash日志推送模块 diff --git a/ruoyi-common/ruoyi-common-logstash/src/main/resources/logback-logstash.xml b/stwzhj-common/stwzhj-common-logstash/src/main/resources/logback-logstash.xml similarity index 100% rename from ruoyi-common/ruoyi-common-logstash/src/main/resources/logback-logstash.xml rename to stwzhj-common/stwzhj-common-logstash/src/main/resources/logback-logstash.xml diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/stwzhj-common/stwzhj-common-mail/pom.xml similarity index 81% rename from ruoyi-common/ruoyi-common-mail/pom.xml rename to stwzhj-common/stwzhj-common-mail/pom.xml index c0e1b2e4..449e4f9e 100644 --- a/ruoyi-common/ruoyi-common-mail/pom.xml +++ b/stwzhj-common/stwzhj-common-mail/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-mail + stwzhj-common-mail - ruoyi-common-mail 邮件模块 + stwzhj-common-mail 邮件模块 org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfiguration.java b/stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/config/MailConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfiguration.java rename to stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/config/MailConfiguration.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java rename to stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java rename to stwzhj-common/stwzhj-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/stwzhj-common/stwzhj-common-mybatis/pom.xml similarity index 55% rename from ruoyi-common/ruoyi-common-mybatis/pom.xml rename to stwzhj-common/stwzhj-common-mybatis/pom.xml index 7fe7e3bb..9491d4a1 100644 --- a/ruoyi-common/ruoyi-common-mybatis/pom.xml +++ b/stwzhj-common/stwzhj-common-mybatis/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-mybatis + stwzhj-common-mybatis - ruoyi-common-mybatis 数据库服务 + stwzhj-common-mybatis 数据库服务 org.dromara - ruoyi-common-satoken + stwzhj-common-satoken org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo true @@ -50,26 +50,26 @@ com.mysql mysql-connector-j - - - - - - - - - - - - - - - - - - - - + + + com.oracle.database.jdbc + ojdbc8 + + + + com.oracle.database.nls + orai18n + + + + org.postgresql + postgresql + + + + com.microsoft.sqlserver + mssql-jdbc + diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfiguration.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java similarity index 89% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java index 13a79416..d621dad0 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java +++ b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java @@ -34,7 +34,7 @@ public class BaseEntity implements Serializable { * 创建部门 */ @TableField(fill = FieldFill.INSERT) - private Long createDept; + private String createDept; /** * 创建者 @@ -60,6 +60,12 @@ public class BaseEntity implements Serializable { @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; + @TableField(exist = false) + private String beginTime; + + @TableField(exist = false) + private String endTime; + /** * 请求参数 */ diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/filter/DubboDataPermissionFilter.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java similarity index 95% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java rename to stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java index 4543579c..08e8c83e 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java +++ b/stwzhj-common/stwzhj-common-mybatis/src/main/java/org/dromara/common/mybatis/service/SysDataScopeService.java @@ -34,7 +34,7 @@ public class SysDataScopeService { * @param deptId 部门ID * @return 返回部门及其下级的权限语句，如果没有找到则返回 null */ - public String getDeptAndChild(Long deptId) { + public String getDeptAndChild(String deptId) { return remoteDataScopeService.getDeptAndChild(deptId); } diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/stwzhj-common/stwzhj-common-mybatis/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter rename to stwzhj-common/stwzhj-common-mybatis/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/stwzhj-common/stwzhj-common-mybatis/src/main/resources/common-mybatis.yml similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml rename to stwzhj-common/stwzhj-common-mybatis/src/main/resources/common-mybatis.yml diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/stwzhj-common/stwzhj-common-mybatis/src/main/resources/spy.properties similarity index 100% rename from ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties rename to stwzhj-common/stwzhj-common-mybatis/src/main/resources/spy.properties diff --git a/ruoyi-common/ruoyi-common-nacos/pom.xml b/stwzhj-common/stwzhj-common-nacos/pom.xml similarity index 90% rename from ruoyi-common/ruoyi-common-nacos/pom.xml rename to stwzhj-common/stwzhj-common-nacos/pom.xml index 9a87e45b..43905af7 100644 --- a/ruoyi-common/ruoyi-common-nacos/pom.xml +++ b/stwzhj-common/stwzhj-common-nacos/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-nacos + stwzhj-common-nacos - ruoyi-common-nacos 配置中心 + stwzhj-common-nacos 配置中心 diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/stwzhj-common/stwzhj-common-oss/pom.xml similarity index 90% rename from ruoyi-common/ruoyi-common-oss/pom.xml rename to stwzhj-common/stwzhj-common-oss/pom.xml index 18d004f5..53ef2c5b 100644 --- a/ruoyi-common/ruoyi-common-oss/pom.xml +++ b/stwzhj-common/stwzhj-common-oss/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-oss + stwzhj-common-oss - ruoyi-common-oss oss服务 + stwzhj-common-oss oss服务 org.dromara - ruoyi-common-json + stwzhj-common-json org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/enumd/AccessPolicyType.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/enumd/PolicyType.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java rename to stwzhj-common/stwzhj-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java diff --git a/ruoyi-common/ruoyi-common-prometheus/pom.xml b/stwzhj-common/stwzhj-common-prometheus/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-prometheus/pom.xml rename to stwzhj-common/stwzhj-common-prometheus/pom.xml index 319bed40..1ffe6b0c 100644 --- a/ruoyi-common/ruoyi-common-prometheus/pom.xml +++ b/stwzhj-common/stwzhj-common-prometheus/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-prometheus + stwzhj-common-prometheus - ruoyi-common-prometheus prometheus监控 + stwzhj-common-prometheus prometheus监控 diff --git a/ruoyi-common/ruoyi-common-prometheus/src/main/java/org/dromara/common/prometheus/config/PrometheusConfiguration.java b/stwzhj-common/stwzhj-common-prometheus/src/main/java/org/dromara/common/prometheus/config/PrometheusConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-prometheus/src/main/java/org/dromara/common/prometheus/config/PrometheusConfiguration.java rename to stwzhj-common/stwzhj-common-prometheus/src/main/java/org/dromara/common/prometheus/config/PrometheusConfiguration.java diff --git a/ruoyi-common/ruoyi-common-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-prometheus/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/stwzhj-common/stwzhj-common-ratelimiter/pom.xml similarity index 71% rename from ruoyi-common/ruoyi-common-ratelimiter/pom.xml rename to stwzhj-common/stwzhj-common-ratelimiter/pom.xml index bbde9409..c490d3a4 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ b/stwzhj-common/stwzhj-common-ratelimiter/pom.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-ratelimiter + stwzhj-common-ratelimiter - ruoyi-common-ratelimiter 限流功能 + stwzhj-common-ratelimiter 限流功能 org.dromara - ruoyi-common-core + stwzhj-common-core org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/stwzhj-common/stwzhj-common-ratelimiter/src/main/resources/spel-extension.json similarity index 100% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json rename to stwzhj-common/stwzhj-common-ratelimiter/src/main/resources/spel-extension.json diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/stwzhj-common/stwzhj-common-redis/pom.xml similarity index 77% rename from ruoyi-common/ruoyi-common-redis/pom.xml rename to stwzhj-common/stwzhj-common-redis/pom.xml index f56f8aad..92503af8 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/stwzhj-common/stwzhj-common-redis/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-redis + stwzhj-common-redis - ruoyi-common-redis 缓存服务 + stwzhj-common-redis 缓存服务 - + org.dromara - ruoyi-common-core + stwzhj-common-core @@ -42,6 +42,10 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 + + cn.hutool + hutool-json + diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfiguration.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfiguration.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfiguration.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfiguration.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java similarity index 82% rename from ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java rename to stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java index 6fa3b748..bff861b8 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java +++ b/stwzhj-common/stwzhj-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java @@ -1,15 +1,23 @@ package org.dromara.common.redis.utils; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.dromara.common.core.utils.SpringUtils; import org.redisson.api.*; +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.connection.RedisStringCommands; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.types.Expiration; +import org.springframework.data.redis.serializer.RedisSerializer; import java.time.Duration; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.time.Instant; +import java.util.*; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -545,4 +553,82 @@ public class RedisUtils { RKeys rKeys = CLIENT.getKeys(); return rKeys.countExists(key) > 0; } + + public static void batchInsert(Map map, long seconds){ + // 创建批量操作对象 + RBatch asyncBatch = CLIENT.createBatch(); + for (Map.Entry entry : map.entrySet()) { + RBucketAsync bucket = asyncBatch.getBucket(entry.getKey()); + if(-1 == seconds){ + bucket.setAsync(entry.getValue()); + }else { + bucket.setAsync(entry.getValue(),seconds,TimeUnit.SECONDS); + } +// testMap.fastPutAsync(entry.getKey(), entry.getValue()); +// testMap.expireAtAsync(seconds); + } + + BatchResult result = asyncBatch.execute(); + List list = result.getResponses(); + System.out.println("redis:"+list); + } + + /* + * 模糊查询 + * */ + public static List searchAndGetKeysValues(String pattern) { + RKeys keys = CLIENT.getKeys(); + // 模糊查询获取匹配的key + Iterable keysIterable = keys.getKeysByPattern(pattern); + List list = new ArrayList<>(); +// RBatch batch = CLIENT.createBatch(); + // 批量获取这些key的值 + for (String key : keysIterable) { + RBucket bucket = CLIENT.getBucket(key); + Object value = bucket.get(); + JSONObject jsonObject = JSONUtil.parseObj(value.toString()); + list.add(jsonObject); + } + + // 执行批量获取 +// BatchResult result = batch.execute(); + // 输出结果 + return list; + } + + /* + * 根据key获取RBucket值 + * */ + public static JSONObject getBucket(String key){ + RBucket bucket = CLIENT.getBucket(key); + Object value = bucket.get(); + return JSONUtil.parseObj(value.toString()); + } + + + /* + * 模糊匹配key 返回keys集合 + * */ + public static int searchKeys(String pattern) { + RKeys keys = CLIENT.getKeys(); + // 模糊查询获取匹配的key + Iterable keysIterable = keys.getKeysByPattern(pattern); + int count = 0; + for (String obj : keysIterable) { + count++; + } + return count; + } + + /* + * 批量插入GEO数据 + * */ + /*public static void batchGeoAdd(Map entryMap){ + RGeo> geo = CLIENT.getGeo("myGeo"); + Map entries = new HashMap<>(); + entries.put("place1", new GeoEntry(13.361389, 38.115556, "Palermo")); + entries.put("place2", new GeoEntry(15.087269, 37.502669, "Catania")); + geo.p(entries); + }*/ + } diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/stwzhj-common/stwzhj-common-satoken/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-satoken/pom.xml rename to stwzhj-common/stwzhj-common-satoken/pom.xml index 5643acb8..2702e7cb 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/stwzhj-common/stwzhj-common-satoken/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-satoken + stwzhj-common-satoken - ruoyi-common-satoken 权限认证服务 + stwzhj-common-satoken 权限认证服务 @@ -29,16 +29,16 @@ ${satoken.version} - + org.dromara - ruoyi-api-system + stwzhj-api-system - + org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfiguration.java b/stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfiguration.java rename to stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfiguration.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java rename to stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java rename to stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java rename to stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java rename to stwzhj-common/stwzhj-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/stwzhj-common/stwzhj-common-satoken/src/main/resources/common-satoken.yml similarity index 100% rename from ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml rename to stwzhj-common/stwzhj-common-satoken/src/main/resources/common-satoken.yml diff --git a/ruoyi-common/ruoyi-common-seata/pom.xml b/stwzhj-common/stwzhj-common-seata/pom.xml similarity index 89% rename from ruoyi-common/ruoyi-common-seata/pom.xml rename to stwzhj-common/stwzhj-common-seata/pom.xml index b2b51f87..5863f2c9 100644 --- a/ruoyi-common/ruoyi-common-seata/pom.xml +++ b/stwzhj-common/stwzhj-common-seata/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-seata + stwzhj-common-seata - ruoyi-common-seata 分布式事务 + stwzhj-common-seata 分布式事务 org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-seata/src/main/java/org/dromara/common/seata/config/SeataConfiguration.java b/stwzhj-common/stwzhj-common-seata/src/main/java/org/dromara/common/seata/config/SeataConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-seata/src/main/java/org/dromara/common/seata/config/SeataConfiguration.java rename to stwzhj-common/stwzhj-common-seata/src/main/java/org/dromara/common/seata/config/SeataConfiguration.java diff --git a/ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-seata/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-seata/src/main/resources/common-seata.yml b/stwzhj-common/stwzhj-common-seata/src/main/resources/common-seata.yml similarity index 100% rename from ruoyi-common/ruoyi-common-seata/src/main/resources/common-seata.yml rename to stwzhj-common/stwzhj-common-seata/src/main/resources/common-seata.yml diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/stwzhj-common/stwzhj-common-security/pom.xml similarity index 80% rename from ruoyi-common/ruoyi-common-security/pom.xml rename to stwzhj-common/stwzhj-common-security/pom.xml index ee499f12..907b7084 100644 --- a/ruoyi-common/ruoyi-common-security/pom.xml +++ b/stwzhj-common/stwzhj-common-security/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-security + stwzhj-common-security - ruoyi-common-security 安全模块 + stwzhj-common-security 安全模块 org.dromara - ruoyi-common-satoken + stwzhj-common-satoken diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java b/stwzhj-common/stwzhj-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java rename to stwzhj-common/stwzhj-common-security/src/main/java/org/dromara/common/security/config/SecurityConfiguration.java diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/stwzhj-common/stwzhj-common-sensitive/pom.xml similarity index 74% rename from ruoyi-common/ruoyi-common-sensitive/pom.xml rename to stwzhj-common/stwzhj-common-sensitive/pom.xml index fecdf091..32e38189 100644 --- a/ruoyi-common/ruoyi-common-sensitive/pom.xml +++ b/stwzhj-common/stwzhj-common-sensitive/pom.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-sensitive + stwzhj-common-sensitive - ruoyi-common-sensitive 脱敏模块 + stwzhj-common-sensitive 脱敏模块 org.dromara - ruoyi-common-json + stwzhj-common-json diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java rename to stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java rename to stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java rename to stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java rename to stwzhj-common/stwzhj-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java diff --git a/ruoyi-common/ruoyi-common-sentinel/pom.xml b/stwzhj-common/stwzhj-common-sentinel/pom.xml similarity index 88% rename from ruoyi-common/ruoyi-common-sentinel/pom.xml rename to stwzhj-common/stwzhj-common-sentinel/pom.xml index 3185baf7..52ba2136 100644 --- a/ruoyi-common/ruoyi-common-sentinel/pom.xml +++ b/stwzhj-common/stwzhj-common-sentinel/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-sentinel + stwzhj-common-sentinel - ruoyi-common-sentinel 限流模块 + stwzhj-common-sentinel 限流模块 @@ -39,7 +39,7 @@ org.dromara - ruoyi-common-core + stwzhj-common-core diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java b/stwzhj-common/stwzhj-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java rename to stwzhj-common/stwzhj-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java b/stwzhj-common/stwzhj-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java rename to stwzhj-common/stwzhj-common-sentinel/src/main/java/org/dromara/common/sentinel/config/SentinelCustomProperties.java diff --git a/ruoyi-common/ruoyi-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-sentinel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-skylog/pom.xml b/stwzhj-common/stwzhj-common-skylog/pom.xml similarity index 84% rename from ruoyi-common/ruoyi-common-skylog/pom.xml rename to stwzhj-common/stwzhj-common-skylog/pom.xml index 212bcf05..3bfc67c0 100644 --- a/ruoyi-common/ruoyi-common-skylog/pom.xml +++ b/stwzhj-common/stwzhj-common-skylog/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-skylog + stwzhj-common-skylog - ruoyi-common-skylog skywalking日志收集模块 + stwzhj-common-skylog skywalking日志收集模块 diff --git a/ruoyi-common/ruoyi-common-skylog/src/main/resources/logback-skylog.xml b/stwzhj-common/stwzhj-common-skylog/src/main/resources/logback-skylog.xml similarity index 100% rename from ruoyi-common/ruoyi-common-skylog/src/main/resources/logback-skylog.xml rename to stwzhj-common/stwzhj-common-skylog/src/main/resources/logback-skylog.xml diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/stwzhj-common/stwzhj-common-sms/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-sms/pom.xml rename to stwzhj-common/stwzhj-common-sms/pom.xml index 292edb6e..1a2bfaec 100644 --- a/ruoyi-common/ruoyi-common-sms/pom.xml +++ b/stwzhj-common/stwzhj-common-sms/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-sms + stwzhj-common-sms - ruoyi-common-sms 短信模块 + stwzhj-common-sms 短信模块 @@ -22,10 +22,10 @@ sms4j-spring-boot-starter - + org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java rename to stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java rename to stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java rename to stwzhj-common/stwzhj-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/stwzhj-common/stwzhj-common-social/pom.xml similarity index 76% rename from ruoyi-common/ruoyi-common-social/pom.xml rename to stwzhj-common/stwzhj-common-social/pom.xml index 887a8e06..56e38773 100644 --- a/ruoyi-common/ruoyi-common-social/pom.xml +++ b/stwzhj-common/stwzhj-common-social/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-social + stwzhj-common-social - ruoyi-common-social 授权认证 + stwzhj-common-social 授权认证 @@ -23,12 +23,12 @@ org.dromara - ruoyi-common-json + stwzhj-common-json org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopiamSource.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java rename to stwzhj-common/stwzhj-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java diff --git a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/stwzhj-common/stwzhj-common-sse/pom.xml similarity index 73% rename from ruoyi-common/ruoyi-common-sse/pom.xml rename to stwzhj-common/stwzhj-common-sse/pom.xml index 88f89a14..6e0688c8 100644 --- a/ruoyi-common/ruoyi-common-sse/pom.xml +++ b/stwzhj-common/stwzhj-common-sse/pom.xml @@ -4,33 +4,33 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-sse + stwzhj-common-sse - ruoyi-common-sse 模块 + stwzhj-common-sse 模块 org.dromara - ruoyi-common-core + stwzhj-common-core org.dromara - ruoyi-common-redis + stwzhj-common-redis org.dromara - ruoyi-common-satoken + stwzhj-common-satoken org.dromara - ruoyi-common-json + stwzhj-common-json org.springframework diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java b/stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java rename to stwzhj-common/stwzhj-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java diff --git a/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-tenant/pom.xml b/stwzhj-common/stwzhj-common-tenant/pom.xml similarity index 78% rename from ruoyi-common/ruoyi-common-tenant/pom.xml rename to stwzhj-common/stwzhj-common-tenant/pom.xml index 970d10f2..e3cbe6bf 100644 --- a/ruoyi-common/ruoyi-common-tenant/pom.xml +++ b/stwzhj-common/stwzhj-common-tenant/pom.xml @@ -4,27 +4,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-tenant + stwzhj-common-tenant - ruoyi-common-tenant 租户模块 + stwzhj-common-tenant 租户模块 org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis true org.dromara - ruoyi-common-redis + stwzhj-common-redis diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfiguration.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfiguration.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfiguration.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfiguration.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantEntity.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/core/TenantSaTokenDao.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/exception/TenantException.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/manager/TenantSpringCacheManager.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java b/stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java rename to stwzhj-common/stwzhj-common-tenant/src/main/java/org/dromara/common/tenant/properties/TenantProperties.java diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-tenant/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/stwzhj-common/stwzhj-common-translation/pom.xml similarity index 68% rename from ruoyi-common/ruoyi-common-translation/pom.xml rename to stwzhj-common/stwzhj-common-translation/pom.xml index 030dd7d3..8f505684 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/stwzhj-common/stwzhj-common-translation/pom.xml @@ -4,37 +4,37 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-translation + stwzhj-common-translation - ruoyi-common-translation 通用翻译功能 + stwzhj-common-translation 通用翻译功能 org.dromara - ruoyi-common-json + stwzhj-common-json org.dromara - ruoyi-common-dict + stwzhj-common-dict org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-api-resource + stwzhj-api-resource diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java rename to stwzhj-common/stwzhj-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/stwzhj-common/stwzhj-common-web/pom.xml similarity index 92% rename from ruoyi-common/ruoyi-common-web/pom.xml rename to stwzhj-common/stwzhj-common-web/pom.xml index 6bb30063..0068771b 100644 --- a/ruoyi-common/ruoyi-common-web/pom.xml +++ b/stwzhj-common/stwzhj-common-web/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-web + stwzhj-common-web - ruoyi-common-web web服务 + stwzhj-common-web web服务 org.dromara - ruoyi-common-json + stwzhj-common-json diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/core/BaseController.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/core/BaseController.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java rename to stwzhj-common/stwzhj-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/ip2region.xdb b/stwzhj-common/stwzhj-common-web/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/resources/ip2region.xdb rename to stwzhj-common/stwzhj-common-web/src/main/resources/ip2region.xdb diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/logback-common.xml b/stwzhj-common/stwzhj-common-web/src/main/resources/logback-common.xml similarity index 100% rename from ruoyi-common/ruoyi-common-web/src/main/resources/logback-common.xml rename to stwzhj-common/stwzhj-common-web/src/main/resources/logback-common.xml diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/stwzhj-common/stwzhj-common-websocket/pom.xml similarity index 73% rename from ruoyi-common/ruoyi-common-websocket/pom.xml rename to stwzhj-common/stwzhj-common-websocket/pom.xml index db86dcbe..ac41e5ba 100644 --- a/ruoyi-common/ruoyi-common-websocket/pom.xml +++ b/stwzhj-common/stwzhj-common-websocket/pom.xml @@ -4,33 +4,33 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-common + stwzhj-common ${revision} 4.0.0 - ruoyi-common-websocket + stwzhj-common-websocket - ruoyi-common-websocket 模块 + stwzhj-common-websocket 模块 org.dromara - ruoyi-common-core + stwzhj-common-core org.dromara - ruoyi-common-redis + stwzhj-common-redis org.dromara - ruoyi-common-satoken + stwzhj-common-satoken org.dromara - ruoyi-common-json + stwzhj-common-json org.springframework.boot diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java rename to stwzhj-common/stwzhj-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/stwzhj-common/stwzhj-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to stwzhj-common/stwzhj-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-example/pom.xml b/stwzhj-example/pom.xml similarity index 85% rename from ruoyi-example/pom.xml rename to stwzhj-example/pom.xml index 1670137e..65e56cca 100644 --- a/ruoyi-example/pom.xml +++ b/stwzhj-example/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-demo - ruoyi-test-mq + stwzhj-demo + stwzhj-test-mq - ruoyi-example + stwzhj-example pom - ruoyi-example 例子模块 + stwzhj-example 例子模块 diff --git a/ruoyi-example/ruoyi-demo/README.md b/stwzhj-example/stwzhj-demo/README.md similarity index 100% rename from ruoyi-example/ruoyi-demo/README.md rename to stwzhj-example/stwzhj-demo/README.md diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/stwzhj-example/stwzhj-demo/pom.xml similarity index 73% rename from ruoyi-example/ruoyi-demo/pom.xml rename to stwzhj-example/stwzhj-demo/pom.xml index 5238e6ef..d1b1e80c 100644 --- a/ruoyi-example/ruoyi-demo/pom.xml +++ b/stwzhj-example/stwzhj-demo/pom.xml @@ -4,92 +4,92 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-example + stwzhj-example ${revision} 4.0.0 - ruoyi-demo + stwzhj-demo - ruoyi-demo 演示模块 + stwzhj-demo 演示模块 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-idempotent + stwzhj-common-idempotent org.dromara - ruoyi-common-mail + stwzhj-common-mail org.dromara - ruoyi-common-sms + stwzhj-common-sms org.dromara - ruoyi-common-encrypt + stwzhj-common-encrypt org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-elasticsearch + stwzhj-common-elasticsearch org.dromara - ruoyi-common-sensitive + stwzhj-common-sensitive diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/RuoYiDemoApplication.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/RuoYiDemoApplication.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/RuoYiDemoApplication.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/RuoYiDemoApplication.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/MailController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/MailController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisCacheController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisLockController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/SmsController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/SmsController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/SmsController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/Swagger3DemoController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestBatchController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBusController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestBusController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestBusController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestBusController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestEncryptController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestI18nController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestSensitiveController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestShardingController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestShardingController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestShardingController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestShardingController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/package-info.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/package-info.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/controller/package-info.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/Document.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/Document.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/Document.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/Document.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/ShardingOrder.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/ShardingOrder.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/ShardingOrder.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/ShardingOrder.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/ShardingOrderItem.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/ShardingOrderItem.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/ShardingOrderItem.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/ShardingOrderItem.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestDemo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestDemo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestDemoEncrypt.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestTree.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/TestTree.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/TestTree.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoBo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestDemoImportVo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/bo/TestTreeBo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/package-info.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/package-info.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/package-info.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/ExportDemoVo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/TestDemoVo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/domain/vo/TestTreeVo.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/listener/ExportDemoListener.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderItemMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/ShardingOrderMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestDemoEncryptMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestDemoMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/TestTreeMapper.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/package-info.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/mapper/package-info.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/mapper/package-info.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/IExportExcelService.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/ITestTreeService.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/ExportExcelServiceImpl.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/SensitiveServiceImpl.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/TestTreeServiceImpl.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/package-info.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/package-info.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/impl/package-info.java diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java b/stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/package-info.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/service/package-info.java rename to stwzhj-example/stwzhj-demo/src/main/java/org/dromara/demo/service/package-info.java diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/stwzhj-example/stwzhj-demo/src/main/resources/application.yml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/application.yml rename to stwzhj-example/stwzhj-demo/src/main/resources/application.yml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/banner.txt b/stwzhj-example/stwzhj-demo/src/main/resources/banner.txt similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/banner.txt rename to stwzhj-example/stwzhj-demo/src/main/resources/banner.txt diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/stwzhj-example/stwzhj-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to stwzhj-example/stwzhj-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/stwzhj-example/stwzhj-demo/src/main/resources/excel/多sheet列表.xlsx similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx rename to stwzhj-example/stwzhj-demo/src/main/resources/excel/多sheet列表.xlsx diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/stwzhj-example/stwzhj-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to stwzhj-example/stwzhj-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/logback-plus.xml b/stwzhj-example/stwzhj-demo/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/logback-plus.xml rename to stwzhj-example/stwzhj-demo/src/main/resources/logback-plus.xml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/ShardingOrderItemMapper.xml b/stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/ShardingOrderItemMapper.xml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/ShardingOrderItemMapper.xml rename to stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/ShardingOrderItemMapper.xml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/ShardingOrderMapper.xml b/stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/ShardingOrderMapper.xml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/ShardingOrderMapper.xml rename to stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/ShardingOrderMapper.xml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/TestDemoMapper.xml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to stwzhj-example/stwzhj-demo/src/main/resources/mapper/demo/TestTreeMapper.xml diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/mapper/package-info.md b/stwzhj-example/stwzhj-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-example/ruoyi-demo/src/main/resources/mapper/package-info.md rename to stwzhj-example/stwzhj-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/AssertUnitTest.java b/stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/AssertUnitTest.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/AssertUnitTest.java rename to stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/AssertUnitTest.java diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java b/stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/DemoUnitTest.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/DemoUnitTest.java rename to stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/DemoUnitTest.java diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java b/stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/ParamUnitTest.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/ParamUnitTest.java rename to stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/ParamUnitTest.java diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java b/stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/TOrderTest.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TOrderTest.java rename to stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/TOrderTest.java diff --git a/ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TagUnitTest.java b/stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/TagUnitTest.java similarity index 100% rename from ruoyi-example/ruoyi-demo/src/test/java/org/dromara/demo/TagUnitTest.java rename to stwzhj-example/stwzhj-demo/src/test/java/org/dromara/demo/TagUnitTest.java diff --git a/ruoyi-example/ruoyi-test-mq/README.md b/stwzhj-example/stwzhj-test-mq/README.md similarity index 100% rename from ruoyi-example/ruoyi-test-mq/README.md rename to stwzhj-example/stwzhj-test-mq/README.md diff --git a/ruoyi-example/ruoyi-test-mq/pom.xml b/stwzhj-example/stwzhj-test-mq/pom.xml similarity index 80% rename from ruoyi-example/ruoyi-test-mq/pom.xml rename to stwzhj-example/stwzhj-test-mq/pom.xml index dc29d327..94a354b5 100644 --- a/ruoyi-example/ruoyi-test-mq/pom.xml +++ b/stwzhj-example/stwzhj-test-mq/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-example + stwzhj-example ${revision} 4.0.0 - ruoyi-test-mq + stwzhj-test-mq - ruoyi-test-mq 案例项目 + stwzhj-test-mq 案例项目 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos org.springframework.boot @@ -36,31 +36,31 @@ org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/RuoYiTestMqApplication.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/config/RabbitConfig.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitTtlQueueConfig.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/config/RabbitTtlQueueConfig.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/config/RabbitTtlQueueConfig.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/config/RabbitTtlQueueConfig.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/KafkaNormalConsumer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/KafkaNormalConsumer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/KafkaNormalConsumer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/KafkaNormalConsumer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/NormalRocketConsumer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/NormalRocketConsumer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/NormalRocketConsumer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/NormalRocketConsumer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/RabbitConsumer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/consumer/TransactionRocketConsumer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/controller/PushMessageController.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/listener/TranscationRocketListener.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/listener/TranscationRocketListener.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/listener/TranscationRocketListener.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/listener/TranscationRocketListener.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/DelayRabbitProducer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/DelayRabbitProducer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/DelayRabbitProducer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/DelayRabbitProducer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/KafkaNormalProducer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/KafkaNormalProducer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/KafkaNormalProducer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/KafkaNormalProducer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/NormalRabbitProducer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/NormalRabbitProducer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/NormalRabbitProducer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/NormalRabbitProducer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/NormalRocketProducer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/NormalRocketProducer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/NormalRocketProducer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/NormalRocketProducer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/TransactionRocketProducer.java b/stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/TransactionRocketProducer.java similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/java/org/dromara/stream/producer/TransactionRocketProducer.java rename to stwzhj-example/stwzhj-test-mq/src/main/java/org/dromara/stream/producer/TransactionRocketProducer.java diff --git a/ruoyi-example/ruoyi-test-mq/src/main/resources/application.yml b/stwzhj-example/stwzhj-test-mq/src/main/resources/application.yml similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/resources/application.yml rename to stwzhj-example/stwzhj-test-mq/src/main/resources/application.yml diff --git a/ruoyi-example/ruoyi-test-mq/src/main/resources/logback-plus.xml b/stwzhj-example/stwzhj-test-mq/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-example/ruoyi-test-mq/src/main/resources/logback-plus.xml rename to stwzhj-example/stwzhj-test-mq/src/main/resources/logback-plus.xml diff --git a/ruoyi-gateway/Dockerfile b/stwzhj-gateway/Dockerfile similarity index 100% rename from ruoyi-gateway/Dockerfile rename to stwzhj-gateway/Dockerfile diff --git a/ruoyi-gateway/pom.xml b/stwzhj-gateway/pom.xml similarity index 90% rename from ruoyi-gateway/pom.xml rename to stwzhj-gateway/pom.xml index 41f9bd53..727b15e6 100644 --- a/ruoyi-gateway/pom.xml +++ b/stwzhj-gateway/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-gateway + stwzhj-gateway - ruoyi-gateway网关模块 + stwzhj-gateway网关模块 @@ -34,7 +34,7 @@ org.dromara - ruoyi-common-nacos + stwzhj-common-nacos @@ -69,7 +69,7 @@ org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel com.alibaba.csp @@ -80,22 +80,22 @@ org.dromara - ruoyi-common-satoken + stwzhj-common-satoken org.dromara - ruoyi-common-redis + stwzhj-common-redis org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis diff --git a/ruoyi-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java b/stwzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java similarity index 100% rename from ruoyi-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java rename to stwzhj-gateway/src/main/java/com/alibaba/csp/sentinel/adapter/gateway/sc/callback/DefaultBlockRequestHandler.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/config/GatewayConfig.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/ApiDecryptProperties.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/CustomGatewayProperties.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/config/properties/IgnoreWhiteProperties.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/AuthFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/BlackListUrlFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/ForwardAuthFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCacheRequestFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalCorsFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalI18nFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/filter/GlobalLogFilter.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/handler/GatewayExceptionHandler.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/handler/SentinelFallbackHandler.java diff --git a/ruoyi-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java b/stwzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java similarity index 100% rename from ruoyi-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java rename to stwzhj-gateway/src/main/java/org/dromara/gateway/utils/WebFluxUtils.java diff --git a/ruoyi-gateway/src/main/resources/application.yml b/stwzhj-gateway/src/main/resources/application.yml similarity index 96% rename from ruoyi-gateway/src/main/resources/application.yml rename to stwzhj-gateway/src/main/resources/application.yml index 98c9dd04..229dc16a 100644 --- a/ruoyi-gateway/src/main/resources/application.yml +++ b/stwzhj-gateway/src/main/resources/application.yml @@ -8,7 +8,7 @@ server: spring: application: # 应用名称 - name: ruoyi-gateway + name: stwzhj-gateway profiles: # 环境配置 active: @profiles.active@ diff --git a/ruoyi-gateway/src/main/resources/banner.txt b/stwzhj-gateway/src/main/resources/banner.txt similarity index 96% rename from ruoyi-gateway/src/main/resources/banner.txt rename to stwzhj-gateway/src/main/resources/banner.txt index fc8e1184..ceced29f 100644 --- a/ruoyi-gateway/src/main/resources/banner.txt +++ b/stwzhj-gateway/src/main/resources/banner.txt @@ -1,10 +1,10 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ - (_) | | - _ __ _ _ ___ _ _ _ ______ __ _ __ _ | |_ ___ __ __ __ _ _ _ -| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | | -| | | |_| || (_) || |_| || | | (_| || (_| || |_ | __/ \ V V / | (_| || |_| | -|_| \__,_| \___/ \__, ||_| \__, | \__,_| \__| \___| \_/\_/ \__,_| \__, | - __/ | __/ | __/ | +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ __ _ __ _ | |_ ___ __ __ __ _ _ _ +| '__|| | | | / _ \ | | | || ||______| / _` | / _` || __| / _ \\ \ /\ / / / _` || | | | +| | | |_| || (_) || |_| || | | (_| || (_| || |_ | __/ \ V V / | (_| || |_| | +|_| \__,_| \___/ \__, ||_| \__, | \__,_| \__| \___| \_/\_/ \__,_| \__, | + __/ | __/ | __/ | |___/ |___/ |___/ \ No newline at end of file diff --git a/ruoyi-gateway/src/main/resources/logback-plus.xml b/stwzhj-gateway/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-gateway/src/main/resources/logback-plus.xml rename to stwzhj-gateway/src/main/resources/logback-plus.xml diff --git a/ruoyi-modules/pom.xml b/stwzhj-modules/pom.xml similarity index 77% rename from ruoyi-modules/pom.xml rename to stwzhj-modules/pom.xml index c9063627..c3b249e9 100644 --- a/ruoyi-modules/pom.xml +++ b/stwzhj-modules/pom.xml @@ -3,24 +3,26 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-system - ruoyi-gen - ruoyi-job - ruoyi-resource - ruoyi-workflow + stwzhj-system + stwzhj-gen + stwzhj-job + stwzhj-resource + stwzhj-workflow + stwzhj-data2es + stwzhj-baseToSt - ruoyi-modules + stwzhj-modules pom - ruoyi-modules业务模块 + stwzhj-modules业务模块 diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/stwzhj-modules/stwzhj-baseToSt/pom.xml similarity index 67% rename from ruoyi-modules/ruoyi-system/pom.xml rename to stwzhj-modules/stwzhj-baseToSt/pom.xml index d8816011..9f8016c1 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/stwzhj-modules/stwzhj-baseToSt/pom.xml @@ -4,104 +4,104 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + stwzhj-modules ${revision} 4.0.0 - ruoyi-system + stwzhj-basetost - ruoyi-system系统模块 + stwzhj-basetost位置汇聚基础数据到省厅 - org.dromara - ruoyi-common-nacos + stwzhj-common-nacos org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-dict + stwzhj-common-dict org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-web + stwzhj-common-web + + + + com.mysql + mysql-connector-j org.dromara - ruoyi-common-mybatis + stwzhj-common-dubbo org.dromara - ruoyi-common-dubbo + stwzhj-common-seata org.dromara - ruoyi-common-seata + stwzhj-common-idempotent org.dromara - ruoyi-common-idempotent + stwzhj-common-tenant org.dromara - ruoyi-common-tenant + stwzhj-common-security org.dromara - ruoyi-common-security + stwzhj-common-translation org.dromara - ruoyi-common-translation + stwzhj-common-sensitive org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt + stwzhj-common-encrypt org.dromara - ruoyi-api-system + stwzhj-api-system + - org.dromara - ruoyi-api-resource + org.springframework.boot + spring-boot-starter-data-jpa diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/BaseToSTApplication.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/BaseToSTApplication.java new file mode 100644 index 00000000..0379070f --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/BaseToSTApplication.java @@ -0,0 +1,24 @@ +package org.dromara.basetost; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; + +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.scheduling.annotation.EnableScheduling; + +/** + *

description:

+ * + * @author chenle + * @date 2023-05-20 12:01 + */ +@SpringBootApplication +@EnableJpaAuditing +@EnableDiscoveryClient +@EnableScheduling +public class BaseToSTApplication { + public static void main(String[] args) { + SpringApplication.run(BaseToSTApplication.class, args); + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/config/AsyncConfig.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/config/AsyncConfig.java new file mode 100644 index 00000000..5fbd31ec --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/config/AsyncConfig.java @@ -0,0 +1,41 @@ +package org.dromara.basetost.config; + +import cn.hutool.core.thread.ThreadFactoryBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.*; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-29 9:20 + */ +@Configuration +@EnableAsync +public class AsyncConfig { + + @Bean("taskExecutor") + public Executor taskExecutor(){ + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(8); + taskExecutor.setMaxPoolSize(20); + taskExecutor.setQueueCapacity(Integer.MAX_VALUE); + taskExecutor.setKeepAliveSeconds(60); + taskExecutor.setThreadNamePrefix("appmTaskExecutor--"); + taskExecutor.setWaitForTasksToCompleteOnShutdown(true); + taskExecutor.setAwaitTerminationSeconds(60); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + return taskExecutor; + } + @Bean("myCacheExecutor") + public ExecutorService executorService(){ + ThreadFactory threadFactory = new ThreadFactoryBuilder().setNamePrefix("basetost-").build(); + return new ThreadPoolExecutor(0, Integer.MAX_VALUE, + 20L, TimeUnit.SECONDS, + new SynchronousQueue(),threadFactory); + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/AbstractGpsEntity.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/AbstractGpsEntity.java new file mode 100644 index 00000000..bb3f74fc --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/AbstractGpsEntity.java @@ -0,0 +1,10 @@ +package org.dromara.basetost.entity; + +/** + *

description:

+ * + * @author chenle + * @date 2022-08-05 17:42 + */ +public interface AbstractGpsEntity { +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/Device.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/Device.java new file mode 100644 index 00000000..bec24982 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/Device.java @@ -0,0 +1,108 @@ +package org.dromara.basetost.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.persistence.*; +import lombok.Data; + + +import java.io.Serializable; +import java.util.Date; + +@Data +@Entity +@Table(name = "t_device") +public class Device implements AbstractGpsEntity, Serializable { + + private static final long serialVersionUID = 1L; + + @Id + @Column(name = "id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + /** + * 外部系统设备编号建议21位 + */ + @Column(name = "device_code") + private String deviceCode; + + /** + * + * + * + * + * + * + */ + @Column(name = "device_type") + private String deviceType; + + /** + * 组织机构代码 + */ + @Column(name = "zzjgdm") + private String zzjgdm; + + /** + * 组织机构名称 + */ + @Column(name = "zzjgmc") + private String zzjgmc; + + /** + * 警号（若有） + */ + @Column(name = "policeNo") + private String policeNo; + + /** + * 姓名（若有） + */ + @Column(name = "policeName") + private String policeName; + + /** + * 联系电话（若有） + */ + @Column(name = "phoneNum") + private String phoneNum; + + /** + * 车牌号（若有） + */ + @Column(name = "car_num") + private String carNum; + + /** + * 0无效，1有效 + */ + @Column(name = "valid") + private Integer valid; + + /** + * 备注字段1 + */ + @Column(name = "remark1") + private String remark1; + + /** + * 备注字段2 + */ + @Column(name = "remark2") + private String remark2; + + /** + * 创建时间 + */ + @Column(name = "create_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime; + + /** + * 最后更新时间 + */ + @Column(name = "update_time") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date updateTime; + +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/DictData.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/DictData.java new file mode 100644 index 00000000..c3f1236d --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/entity/DictData.java @@ -0,0 +1,102 @@ +package org.dromara.basetost.entity; + +import jakarta.persistence.*; +import lombok.Data; + + +import java.io.Serializable; +import java.util.Date; + +/** + * 字典数据表 + */ +@Data +@Entity +@Table(name = "sys_dict_data") +public class DictData implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 字典编码 + */ + @Id + @Column(name = "dict_code", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long dictCode; + + /** + * 字典排序 + */ + @Column(name = "dict_sort") + private Integer dictSort; + + /** + * 字典标签 + */ + @Column(name = "dict_label") + private String dictLabel; + + /** + * 字典键值 + */ + @Column(name = "dict_value") + private String dictValue; + + /** + * 字典类型 + */ + @Column(name = "dict_type") + private String dictType; + + /** + * 样式属性（其他样式扩展） + */ + @Column(name = "css_class") + private String cssClass; + + /** + * 表格回显样式 + */ + @Column(name = "list_class") + private String listClass; + + + + /** + * 状态（0正常 1停用） + */ + @Column(name = "status") + private String status; + + /** + * 创建者 + */ + @Column(name = "create_by") + private String createBy; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新者 + */ + @Column(name = "update_by") + private String updateBy; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 备注 + */ + @Column(name = "remark") + private String remark; + +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AbstractAsyncHandler.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AbstractAsyncHandler.java new file mode 100644 index 00000000..3f845bb1 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AbstractAsyncHandler.java @@ -0,0 +1,129 @@ +package org.dromara.basetost.handler; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import org.dromara.basetost.entity.AbstractGpsEntity; +import org.dromara.basetost.entity.Device; +import org.dromara.basetost.entity.DictData; +import org.dromara.basetost.repository.DictDataRepository; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.dromara.system.api.domain.bo.RemoteDeviceToStBo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.*; + +/** + *

description:

+ * + * @author chenle + * @date 2022-08-05 16:48 + */ +@Component +public abstract class AbstractAsyncHandler { + + private Logger logger = LoggerFactory.getLogger(AsyncHandler.class); + @Autowired + AsyncHandler asyncHandler; + + @Autowired + DictDataRepository dictDataRepository; + + + + private String lastUpdateTime; + + + public boolean saveBaseToST(){ + + + try { +// lastUpdateTime = PathUtil.getValueFromProperties("lastUpdateTime"); + lastUpdateTime = "2024-11-23 11:20:32"; + }catch (Exception e){ + logger.info("lastUpdateTime={},lastUpdateTimeError={}",lastUpdateTime,e.getMessage()); + return false; + } + + List data = getGpsInfoByTime(lastUpdateTime); + logger.info("dataSize={}",data.size()); + if(CollectionUtils.isEmpty(data)){ + logger.info("此时无数据={}",lastUpdateTime); + return true; + } + requestToData2es(data); + return true; + } + + private void requestToData2es(List data){ + String infoSource = "3418"; +// bo.setInfoSource(PathUtil.getValueFromProperties("infoSource")); + boolean b = true; + int size = data.size(); + for (AbstractGpsEntity datum : data) { + Device device = (Device) datum; + DictData dictData = dictDataRepository.findDictDataByDictTypeAndDictLabel("device_type_tost", String.valueOf(device.getDeviceType())); + String dictValue = null; + if(!Objects.isNull(dictData)){ + dictValue = dictData.getDictValue(); + } + if(StringUtils.isEmpty(dictValue)){ + dictValue = "99"; + } + + device.setDeviceType(dictValue); + } + int forCount = size / 50; + for (int i = 0; i <= forCount; i++) { + List singleList = new ArrayList<>(); + + int fromIndex = i * 50; + int endIndex = (i == forCount ? size: (i+1)*50); + singleList = data.subList(fromIndex,endIndex); +// BeanUtil.copyToList(singleList, RemoteDeviceBo.class) + List list = new ArrayList<>(); + +// bo.setDeviceBoList(); + boolean singleB = asyncHandler.saveGpsAsync(infoSource,BeanUtil.copyToList(singleList, RemoteDeviceBo.class)); + if(!singleB){ + b = false; + } + } + if(b){ + AbstractGpsEntity abstractGpsEntity = data.get(size - 1); + Device lastDevice = (Device) abstractGpsEntity; + resetUpdateTime(lastDevice.getUpdateTime()); + } + + } + + + + + private void resetUpdateTime(Date gpsTime) { + try { + lastUpdateTime = DateUtil.format(gpsTime,"yyyy-MM-dd HH:mm:ss"); +// PathUtil.updateProperties("lastUpdateTime",lastUpdateTime,"ruansi.properties"); + }catch (Exception e){ + logger.info("lastTime reset error"+e.getMessage()); + e.printStackTrace(); + } + } + + + + + protected Device produceGpsInfo(AbstractGpsEntity gpsInfo){ + return null; + }; + + protected boolean checkNullOrEmpty(AbstractGpsEntity gpsInfo) { + return false; + }; + + protected abstract List getGpsInfoByTime(String lastUpdateTime); +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AsyncHandler.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AsyncHandler.java new file mode 100644 index 00000000..d743d5f8 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/AsyncHandler.java @@ -0,0 +1,46 @@ +package org.dromara.basetost.handler; + +import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.R; +import org.dromara.system.api.RemoteDeviceService; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-29 9:34 + */ +@Component +public class AsyncHandler { + + private Logger logger = LoggerFactory.getLogger(AsyncHandler.class); + + @DubboReference + private RemoteDeviceService deviceService; + + +// @Async(value = "myCacheExecutor") + boolean saveGpsAsync(String infoSource, List list) { + R response = deviceService.saveDeviceToSt(infoSource,list); + if(Objects.isNull(response) || Objects.isNull(response.getCode())){ + assert response != null; + logger.info("返回null,message={}",response.getMsg()); + return false; + } + if(200 == response.getCode()){ + logger.info("success"); + }else{ + logger.info("fail,message={},data={}",response.getMsg(),response.getData()); + return false; + } + return true; + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PDTHandler.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PDTHandler.java new file mode 100644 index 00000000..bfff71d3 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PDTHandler.java @@ -0,0 +1,42 @@ +package org.dromara.basetost.handler; + +import cn.hutool.core.date.DateUtil; +import org.dromara.basetost.entity.AbstractGpsEntity; +import org.dromara.basetost.entity.Device; +import org.dromara.basetost.repository.DeviceRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + *

description:

+ * + * @author chenle + * @date 2022-08-05 17:32 + */ +@Component("pdthandler") +public class PDTHandler extends AbstractAsyncHandler { + + private Logger logger = LoggerFactory.getLogger(AbstractAsyncHandler.class); + + @Autowired + DeviceRepository deviceRepository; + + public PDTHandler() { + super(); + } + + + @Override + protected List getGpsInfoByTime(String lastUpdateTime) { + + + return deviceRepository.findDeviceByUpdateTimeAfterOrderByUpdateTimeAsc(DateUtil.parse(lastUpdateTime)); +// return deviceRepository.findDeviceByUpdateTimeAfterOrderByUpdateTimeAsc(lastUpdateTime); + } + + +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PathUtil.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PathUtil.java new file mode 100644 index 00000000..ab0a41a3 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/handler/PathUtil.java @@ -0,0 +1,90 @@ +package org.dromara.basetost.handler; + +/** + *

description:

+ * + * @author chenle + * @date 2022-08-05 12:00 + */ + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import org.dromara.basetost.response.MyBusinessException; +import org.dromara.common.core.utils.StringUtils; + +import java.io.*; +import java.util.Objects; +import java.util.Properties; + +public class PathUtil { + + static String outpath = System.getProperty("user.dir")+File.separator+"conf"+File.separator;//先读取config目录的，没有再加载classpath的 + + private static Properties getProperties(String fileName) { + + try { + Properties properties = new Properties(); + InputStream in = new FileInputStream(new File(outpath + fileName)); + properties.load(in); + return properties; + } catch (IOException e) { + try { + Properties properties = new Properties(); + InputStream in = PathUtil.class.getClassLoader().getResourceAsStream(fileName);//默认加载classpath的 + if(Objects.isNull(in)){ + return null; + } + properties.load(in); + return properties; + } catch (IOException es) { + return null; + } + } + } + + + + /** + * 更新properties文件的键值对 + * 如果该主键已经存在，更新该主键的值； + * 如果该主键不存在，则插件一对键值。 + * @param keyname 键名 + * @param keyvalue 键值 + */ + public static void updateProperties( String keyname, String keyvalue, String fileName) throws IOException { + + // 调用 Hashtable 的方法 put，使用 getProperty 方法提供并行性。 + // 强制要求为属性的键和值使用字符串。返回值是 Hashtable 调用 put 的结果。 + Properties props = PathUtil.getProperties(fileName); + OutputStream fos = new FileOutputStream(outpath + fileName); + props.setProperty(keyname, keyvalue); + // 以适合使用 load 方法加载到 Properties 表中的格式， + // 将此 Properties 表中的属性列表（键和元素对）写入输出流 + props.store(fos, "Update '" + keyname + "' value"); + + } + + public static String getValueFromProperties(String propertiesName) { + Properties properties = PathUtil.getProperties("ruansi.properties"); + if(Objects.isNull(properties)){ + throw new MyBusinessException("jar包所在文件夹下conf子目录下缺少[ruansi.properties] 文件，请新建"); + } + String lastUpdateTime = properties.getProperty(propertiesName); + if(StringUtils.isEmpty(lastUpdateTime)){ + throw new MyBusinessException("[ruansi.properties]文件内缺少["+propertiesName+"]属性"); + } + //checkTimeFormatter(lastUpdateTime); + return lastUpdateTime; + } + + private static void checkTimeFormatter(String lastUpdateTime) { + try { + DateTime parse = DateUtil.parse(lastUpdateTime, "yyyy-MM-dd HH:mm:ss"); + }catch (Exception e){ + throw new RuntimeException(e.getMessage()); + } + } + + + +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DeviceRepository.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DeviceRepository.java new file mode 100644 index 00000000..dfbe058a --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DeviceRepository.java @@ -0,0 +1,17 @@ +package org.dromara.basetost.repository; + +import org.dromara.basetost.entity.Device; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +import java.util.Date; +import java.util.List; + +public interface DeviceRepository extends JpaRepository, JpaSpecificationExecutor { + List findDeviceByUpdateTimeAfterOrderByUpdateTimeAsc(Date updateTime); + + +// @Query(nativeQuery = true,value = "select * from t_device t1 " + +// " where t1.update_time>?1 order by update_time asc limit 50") +// List findDevice(@Param("updateTime") String updateTime); +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DictDataRepository.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DictDataRepository.java new file mode 100644 index 00000000..de2fb433 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/repository/DictDataRepository.java @@ -0,0 +1,9 @@ +package org.dromara.basetost.repository; + +import org.dromara.basetost.entity.DictData; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface DictDataRepository extends JpaRepository, JpaSpecificationExecutor { + DictData findDictDataByDictTypeAndDictLabel(String dictType, String dictLabel); +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiCodeEnum.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiCodeEnum.java new file mode 100644 index 00000000..95e6e040 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiCodeEnum.java @@ -0,0 +1,47 @@ +package org.dromara.basetost.response; + +public enum ApiCodeEnum { + + COMMON_SUCCESS (200, "操作成功！"), + COMMON_BAD_REQUEST (400, "参数错误！"), + COMMON_UNAUTHORIZED (401, "用户未登陆！"), + COMMON_FORBIDDEN (403, "用户没有权限！"), + COMMON_NOT_FOUND (404, "接口不存在！"), + COMMON_SERVICE_ERROR (500, "服务器异常！"), + ACCESS_LIMIT_ERROR(501, "操作频繁！"), + ; + + private Integer code; + private String message; + + private ApiCodeEnum(int code, String message) { + this.code = code; + this.message = message; + } + + public static String getMessageByStatus(int code) { + for (ApiCodeEnum refer : ApiCodeEnum.values()) { + if (refer.getCode() == code) { + return refer.getMessage(); + } + } + return null; + } + + public static ApiCodeEnum fromCode(int code) { + for (ApiCodeEnum refer : ApiCodeEnum.values()) { + if (refer.getCode() == code) { + return refer; + } + } + return null; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiResponse.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiResponse.java new file mode 100644 index 00000000..e38b03ba --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/ApiResponse.java @@ -0,0 +1,54 @@ +package org.dromara.basetost.response; + +import lombok.Data; + +@Data +public class ApiResponse { + + private Integer code; + private String message; + private T data; + + + public static ApiResponse build() { + return new ApiResponse(); + } + + public ApiResponse success() { + this.setCode(0); + this.setMessage("success"); + return this; + } + + public ApiResponse success(T obj) { + this.code = ApiCodeEnum.COMMON_SUCCESS.getCode(); + this.message = ApiCodeEnum.COMMON_SUCCESS.getMessage(); + this.data = obj; + return this; + } + + public ApiResponse success(String message) { + this.code = ApiCodeEnum.COMMON_SUCCESS.getCode(); + this.message = message; + + return this; + } + + public ApiResponse error(int code, String message) { + this.code = code; + this.message = message; + return this; + } + + public ApiResponse tokenError(String message) { + code = ApiCodeEnum.COMMON_UNAUTHORIZED.getCode(); + this.message = message; + return this; + } + + public ApiResponse accessLimitError(String message) { + code = ApiCodeEnum.ACCESS_LIMIT_ERROR.getCode(); + this.message = message; + return this; + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/MyBusinessException.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/MyBusinessException.java new file mode 100644 index 00000000..dbb39af3 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/response/MyBusinessException.java @@ -0,0 +1,54 @@ +package org.dromara.basetost.response; + +/** + *

description:

+ * + * @author chenle + * @date 2021-06-07 10:56 + */ +public class MyBusinessException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public MyBusinessException(String msg) { + super(msg); + this.msg = msg; + } + + public MyBusinessException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public MyBusinessException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public MyBusinessException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/schedule/BaseToSTSchedule.java b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/schedule/BaseToSTSchedule.java new file mode 100644 index 00000000..2f291fc6 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/java/org/dromara/basetost/schedule/BaseToSTSchedule.java @@ -0,0 +1,28 @@ +package org.dromara.basetost.schedule; + +import org.dromara.basetost.handler.AbstractAsyncHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + *

description:

+ * + * @author chenle + * @date 2023-05-22 9:24 + */ +@Component +public class BaseToSTSchedule { + + + @Autowired + @Qualifier(value = "pdthandler") + AbstractAsyncHandler abstractAsyncHandler; + + + @Scheduled(cron = "${devicecorn:0/30 * * * * ?}") + public void sendToSt(){ + abstractAsyncHandler.saveBaseToST(); + } +} diff --git a/stwzhj-modules/stwzhj-baseToSt/src/main/resources/application.yml b/stwzhj-modules/stwzhj-baseToSt/src/main/resources/application.yml new file mode 100644 index 00000000..6f7b9f71 --- /dev/null +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/resources/application.yml @@ -0,0 +1,45 @@ +# Tomcat +server: + port: 10025 +devicecorn: 0/10 * * * * ? + +# Spring +spring: + application: + # 应用名称 + name: stwzhj-basetost + profiles: + # 环境配置 + active: dev + +--- # nacos 配置 +spring: + datasource: + url: jdbc:mysql://localhost:3306/wzhj_hs?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=false + username: root + password: root + driver-class-name: com.mysql.jdbc.Driver + type: com.zaxxer.hikari.HikariDataSource + jpa: + show-sql: true + hibernate: + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + cloud: + nacos: + # nacos 服务地址 + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + discovery: + # 注册组 + group: DEFAULT_GROUP + namespace: ${spring.profiles.active} + config: + # 配置组 + group: DEFAULT_GROUP + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-baseToSt/src/main/resources/banner.txt similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/resources/banner.txt rename to stwzhj-modules/stwzhj-baseToSt/src/main/resources/banner.txt index e5e8395c..fbd45f53 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/banner.txt +++ b/stwzhj-modules/stwzhj-baseToSt/src/main/resources/banner.txt @@ -1,10 +1,10 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ - (_) | | - _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ -| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ -| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | -|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| - __/ | __/ | +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | |___/ |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-baseToSt/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-baseToSt/src/main/resources/logback-plus.xml diff --git a/stwzhj-modules/stwzhj-consumer/pom.xml b/stwzhj-modules/stwzhj-consumer/pom.xml new file mode 100644 index 00000000..7b704482 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/pom.xml @@ -0,0 +1,172 @@ + + + + org.dromara + stwzhj-modules + ${revision} + + 4.0.0 + + stwzhj-consumer + + + + + org.dromara + stwzhj-common-nacos + + + + org.dromara + stwzhj-common-sentinel + + + + + org.dromara + stwzhj-common-log + + + + org.dromara + stwzhj-common-dict + + + + org.dromara + stwzhj-common-doc + + + + org.dromara + stwzhj-common-web + + + + + org.dromara + stwzhj-common-dubbo + + + + org.dromara + stwzhj-common-seata + + + + org.dromara + stwzhj-common-idempotent + + + + org.dromara + stwzhj-common-tenant + + + + org.dromara + stwzhj-common-security + + + + org.dromara + stwzhj-common-translation + + + + org.dromara + stwzhj-common-sensitive + + + + org.dromara + stwzhj-common-encrypt + + + + + org.dromara + stwzhj-api-system + + + + org.dromara + stwzhj-api-data2es + + + + org.apache.kafka + kafka-clients + 2.4.0-hw-ei-302002 + + + + com.ruansee.app + app_common + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + cn.hutool + hutool-all + 5.1.0 + compile + + + + de.codecentric + spring-boot-admin-starter-client + 2.3.1 + + + org.apache.zookeeper + zookeeper + 3.5.6 + + + + + cn.dynamictp + dynamic-tp-spring-boot-starter-common + 1.1.0 + + + + org.springframework.kafka + spring-kafka + + + org.apache.kafka + kafka-clients + + + + + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/KafkaConsumerApplication.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/KafkaConsumerApplication.java new file mode 100644 index 00000000..0fe37b81 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/KafkaConsumerApplication.java @@ -0,0 +1,34 @@ +package org.dromara.kafka.consumer; + +import com.ruansee.redis.JedisConfig; +import com.ruansee.redis.RedisConfig; +import com.ruansee.redis.RedisUtil; +import com.ruansee.redis.RedissionLockUtil; +import org.dromara.kafka.consumer.config.KafkaPropertiesConfig; +import org.redisson.spring.starter.RedissonAutoConfiguration; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; +import org.springframework.boot.autoconfigure.data.redis.RedisReactiveAutoConfiguration; +import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.scheduling.annotation.EnableAsync; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 11:12 + */ +@SpringBootApplication +@EnableAsync +@EnableConfigurationProperties({KafkaPropertiesConfig.class}) +@ServletComponentScan +public class KafkaConsumerApplication { + public static void main(String[] args){ + SpringApplication.run(KafkaConsumerApplication.class,args); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/AsyncConfig.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/AsyncConfig.java new file mode 100644 index 00000000..ecdfc330 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/AsyncConfig.java @@ -0,0 +1,69 @@ +package org.dromara.kafka.consumer.config; + +import com.dtp.common.em.QueueTypeEnum; +import com.dtp.common.em.RejectedTypeEnum; +import com.dtp.core.support.ThreadPoolBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 16:31 + */ +@Configuration +public class AsyncConfig { + + @Bean("taskExecutor") + public ThreadPoolTaskExecutor taskExecutor(){ + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(8); + taskExecutor.setMaxPoolSize(20); + taskExecutor.setQueueCapacity(200); + taskExecutor.setKeepAliveSeconds(60); + taskExecutor.setThreadNamePrefix("hfapp--kafkaConsumer--"); + taskExecutor.setWaitForTasksToCompleteOnShutdown(true); + taskExecutor.setAwaitTerminationSeconds(60); + taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy()); + return taskExecutor; + } + + /** + * tips: 建议直接在配置中心配置就行，不用 @Bean 声明 + * @return 线程池实例 + */ +// @Bean(name = "dtpExecutor2") + public ThreadPoolExecutor dtpExecutor2() { + return ThreadPoolBuilder.newBuilder() + .threadPoolName("dtpExecutor2") + .corePoolSize(8) + .maximumPoolSize(20) + .keepAliveTime(60) + .timeUnit(TimeUnit.MILLISECONDS) + .workQueue(QueueTypeEnum.VARIABLE_LINKED_BLOCKING_QUEUE.getName(), 1024, false) + .waitForTasksToCompleteOnShutdown(true) + .awaitTerminationSeconds(60) + .rejectedExecutionHandler(RejectedTypeEnum.CALLER_RUNS_POLICY.getName()) + .buildDynamic(); + } + + @Bean(name = "threadPoolExecutor") + public ThreadPoolExecutor threadPoolExecutor() { + return new ThreadPoolExecutor( + 8, // 核心线程数 + 20, // 最大线程数 + 60, // 空闲时间300秒 + TimeUnit.SECONDS, + new LinkedBlockingQueue<>(10000), // 任务队列最大长度 + new ThreadPoolExecutor.CallerRunsPolicy() // 拒绝策略：由调用线程处理 + ); + } + +} + diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaProperties.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaProperties.java new file mode 100644 index 00000000..45606d28 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaProperties.java @@ -0,0 +1,136 @@ +package org.dromara.kafka.consumer.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.Properties; + +public final class KafkaProperties +{ + private static final Logger LOG = LoggerFactory.getLogger(KafkaProperties.class); + + // Topic名称，安全模式下，需要以管理员用户添加当前用户的访问权限 + public final static String TOPIC = "t_gps_realtime"; + + private static Properties serverProps = new Properties(); + private static Properties producerProps = new Properties(); + + private static Properties consumerProps = new Properties(); + + private static Properties clientProps = new Properties(); + + private static KafkaProperties instance = null; + + private KafkaProperties() + { + String filePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator; + + try + { + File proFile = new File(filePath + "producer.properties"); + + if (proFile.exists()) + { + producerProps.load(new FileInputStream(filePath + "producer.properties")); + } + + File conFile = new File(filePath + "producer.properties"); + + if (conFile.exists()) + { + consumerProps.load(new FileInputStream(filePath + "consumer.properties")); + } + + File serFile = new File(filePath + "server.properties"); + + if (serFile.exists()) + { + serverProps.load(new FileInputStream(filePath + "server.properties")); + } + + File cliFile = new File(filePath + "client.properties"); + + if (cliFile.exists()) + { + clientProps.load(new FileInputStream(filePath + "client.properties")); + } + } + catch (IOException e) + { + LOG.info("The Exception occured.", e); + } + } + + public synchronized static KafkaProperties getInstance() + { + if (null == instance) + { + instance = new KafkaProperties(); + } + + return instance; + } + + /** + * 获取参数值 + * @param key properites的key值 + * @param defValue 默认值 + * @return + */ + public String getValues(String key, String defValue) + { + String rtValue = null; + + if (null == key) + { + LOG.error("key is null"); + } + else + { + rtValue = getPropertiesValue(key); + } + + if (null == rtValue) + { + LOG.warn("KafkaProperties.getValues return null, key is " + key); + rtValue = defValue; + } + + LOG.info("KafkaProperties.getValues: key is " + key + "; Value is " + rtValue); + + return rtValue; + } + + /** + * 根据key值获取server.properties的值 + * @param key + * @return + */ + private String getPropertiesValue(String key) + { + String rtValue = serverProps.getProperty(key); + + // server.properties中没有，则再向producer.properties中获取 + if (null == rtValue) + { + rtValue = producerProps.getProperty(key); + } + + // producer中没有，则再向consumer.properties中获取 + if (null == rtValue) + { + rtValue = consumerProps.getProperty(key); + } + + // consumer没有，则再向client.properties中获取 + if (null == rtValue) + { + rtValue = clientProps.getProperty(key); + } + + return rtValue; + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaPropertiesConfig.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaPropertiesConfig.java new file mode 100644 index 00000000..5f4edabf --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/KafkaPropertiesConfig.java @@ -0,0 +1,35 @@ +package org.dromara.kafka.consumer.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Profile; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 15:13 + */ +@ConfigurationProperties(prefix = "mykafka") +@Profile(value = "dev") +public +class KafkaPropertiesConfig { + private String serverUrl; + + private MyConsumerProperties consumerProperties = new MyConsumerProperties(); + + public String getServerUrl() { + return serverUrl; + } + + public void setServerUrl(String serverUrl) { + this.serverUrl = serverUrl; + } + + public MyConsumerProperties getConsumerProperties() { + return consumerProperties; + } + + public void setConsumerProperties(MyConsumerProperties consumerProperties) { + this.consumerProperties = consumerProperties; + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/LoginUtil.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/LoginUtil.java new file mode 100644 index 00000000..2f7ae3fe --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/LoginUtil.java @@ -0,0 +1,214 @@ +package org.dromara.kafka.consumer.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +public class LoginUtil +{ + + static Logger logger = LoggerFactory.getLogger(LoginUtil.class); + + public enum Module + { + STORM("StormClient"), KAFKA("KafkaClient"), ZOOKEEPER("Client"); + + private String name; + + private Module(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + } + + /** + * line operator string + */ + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + + /** + * jaas file postfix + */ + private static final String JAAS_POSTFIX = ".jaas.conf"; + + /** + * is IBM jdk or not + */ + private static final boolean IS_IBM_JDK = System.getProperty("java.vendor").contains("IBM"); + + /** + * IBM jdk login module + */ + private static final String IBM_LOGIN_MODULE = "com.ibm.security.auth.module.Krb5LoginModule required"; + + /** + * oracle jdk login module + */ + private static final String SUN_LOGIN_MODULE = "com.sun.security.auth.module.Krb5LoginModule required"; + + /** + * Zookeeper quorum principal. + */ + public static final String ZOOKEEPER_AUTH_PRINCIPAL = "zookeeper.server.principal"; + + /** + * java security krb5 file path + */ + public static final String JAVA_SECURITY_KRB5_CONF = "java.security.krb5.conf"; + + /** + * java security login file path + */ + public static final String JAVA_SECURITY_LOGIN_CONF = "java.security.auth.login.config"; + + /** + * 设置jaas.conf文件 + * + * @param principal + * @param keytabPath + * @throws IOException + */ + public static void setJaasFile(String principal, String keytabPath) + throws IOException + { + String jaasPath = + new File(System.getProperty("java.io.tmpdir")) + File.separator + System.getProperty("user.name") + + JAAS_POSTFIX; + + // windows路径下分隔符替换 + jaasPath = jaasPath.replace("\\", "\\\\"); + // 删除jaas文件 + deleteJaasFile(jaasPath); + writeJaasFile(jaasPath, principal, keytabPath); + logger.error("jaasPath--{}",jaasPath); + System.setProperty(JAVA_SECURITY_LOGIN_CONF, jaasPath); + } + + /** + * 设置zookeeper服务端principal + * + * @param zkServerPrincipal + * @throws IOException + */ + public static void setZookeeperServerPrincipal(String zkServerPrincipal) + throws IOException + { + System.setProperty(ZOOKEEPER_AUTH_PRINCIPAL, zkServerPrincipal); + String ret = System.getProperty(ZOOKEEPER_AUTH_PRINCIPAL); + if (ret == null) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is null."); + } + if (!ret.equals(zkServerPrincipal)) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is " + ret + " is not " + zkServerPrincipal + "."); + } + } + + /** + * 设置krb5文件 + * + * @param krb5ConfFile + * @throws IOException + */ + public static void setKrb5Config(String krb5ConfFile) + throws IOException + { + System.setProperty(JAVA_SECURITY_KRB5_CONF, krb5ConfFile); + String ret = System.getProperty(JAVA_SECURITY_KRB5_CONF); + if (ret == null) + { + throw new IOException(JAVA_SECURITY_KRB5_CONF + " is null."); + } + if (!ret.equals(krb5ConfFile)) + { + throw new IOException(JAVA_SECURITY_KRB5_CONF + " is " + ret + " is not " + krb5ConfFile + "."); + } + } + + /** + * 写入jaas文件 + * + * @throws IOException + * 写文件异常 + */ + private static void writeJaasFile(String jaasPath, String principal, String keytabPath) + throws IOException + { + FileWriter writer = new FileWriter(new File(jaasPath)); + try + { + writer.write(getJaasConfContext(principal, keytabPath)); + writer.flush(); + } + catch (IOException e) + { + throw new IOException("Failed to create jaas.conf File"); + } + finally + { + writer.close(); + } + } + + private static void deleteJaasFile(String jaasPath) + throws IOException + { + File jaasFile = new File(jaasPath); + if (jaasFile.exists()) + { + if (!jaasFile.delete()) + { + throw new IOException("Failed to delete exists jaas file."); + } + } + } + + private static String getJaasConfContext(String principal, String keytabPath) + { + Module[] allModule = Module.values(); + StringBuilder builder = new StringBuilder(); + for (Module modlue : allModule) + { + builder.append(getModuleContext(principal, keytabPath, modlue)); + } + return builder.toString(); + } + + private static String getModuleContext(String userPrincipal, String keyTabPath, Module module) + { + StringBuilder builder = new StringBuilder(); + if (IS_IBM_JDK) + { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append(IBM_LOGIN_MODULE).append(LINE_SEPARATOR); + builder.append("credsType=both").append(LINE_SEPARATOR); + builder.append("principal=\"" + userPrincipal + "\"").append(LINE_SEPARATOR); + builder.append("useKeytab=\"" + keyTabPath + "\"").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } + else + { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append(SUN_LOGIN_MODULE).append(LINE_SEPARATOR); + builder.append("useKeyTab=true").append(LINE_SEPARATOR); + builder.append("keyTab=\"" + keyTabPath + "\"").append(LINE_SEPARATOR); + builder.append("principal=\"" + userPrincipal + "\"").append(LINE_SEPARATOR); + builder.append("useTicketCache=false").append(LINE_SEPARATOR); + builder.append("storeKey=true").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } + + return builder.toString(); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/MyConsumerProperties.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/MyConsumerProperties.java new file mode 100644 index 00000000..040def94 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/MyConsumerProperties.java @@ -0,0 +1,28 @@ +package org.dromara.kafka.consumer.config; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-07 14:54 + */ +public class MyConsumerProperties { + private String clientId; + private String groupId = "222"; + + public String getClientId() { + return clientId; + } + + public void setClientId(String clientId) { + this.clientId = clientId; + } + + public String getGroupId() { + return groupId; + } + + public void setGroupId(String groupId) { + this.groupId = groupId; + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/NewConsumer.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/NewConsumer.java new file mode 100644 index 00000000..2205ee31 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/NewConsumer.java @@ -0,0 +1,159 @@ +package org.dromara.kafka.consumer.config; + +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.dromara.kafka.consumer.handler.KafkaSecurityUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Collections; +import java.util.Properties; + + +public class NewConsumer extends Thread{ + private static final Logger LOG = LoggerFactory.getLogger(NewConsumer.class); + + private final KafkaConsumer consumer; + + private final String topic; + + // 一次请求的最大等待时间 + private final int waitTime = 10000; + + // Broker连接地址 + private final String bootstrapServers = "bootstrap.servers"; + // Group id + private final String groupId = "group.id"; + // 消息内容使用的反序列化类 + private final String valueDeserializer = "value.deserializer"; + // 消息Key值使用的反序列化类 + private final String keyDeserializer = "key.deserializer"; + // 协议类型:当前支持配置为SASL_PLAINTEXT或者PLAINTEXT + private final String securityProtocol = "security.protocol"; + // 服务名 + private final String saslKerberosServiceName = "sasl.kerberos.service.name"; + // 域名 + private final String kerberosDomainName = "kerberos.domain.name"; + // 是否自动提交offset + private final String enableAutoCommit = "enable.auto.commit"; + // 自动提交offset的时间间隔 + private final String autoCommitIntervalMs = "auto.commit.interval.ms"; + + // 会话超时时间 + private final String sessionTimeoutMs = "session.timeout.ms"; + + /** + * 用户自己申请的机机账号keytab文件名称 + */ + private static final String USER_KEYTAB_FILE = "user.keytab"; + + /** + * 用户自己申请的机机账号名称 + */ + private static final String USER_PRINCIPAL = "aqdsj_ruansi"; + + /** + * NewConsumer构造函数 + * @param topic 订阅的Topic名称 + */ + public NewConsumer(String topic) { + + Properties props = new Properties(); + + KafkaProperties kafkaProc = KafkaProperties.getInstance(); + // Broker连接地址 + props.put(bootstrapServers, + kafkaProc.getValues(bootstrapServers, "localhost:21007")); + // Group id + props.put(groupId, "DemoConsumer"); + // 是否自动提交offset + props.put(enableAutoCommit, "true"); + // 自动提交offset的时间间隔 + props.put(autoCommitIntervalMs, "1000"); + // 会话超时时间 + props.put(sessionTimeoutMs, "30000"); + // 消息Key值使用的反序列化类 + props.put(keyDeserializer, + "org.apache.kafka.common.serialization.IntegerDeserializer"); + // 消息内容使用的反序列化类 + props.put(valueDeserializer, + "org.apache.kafka.common.serialization.StringDeserializer"); + // 安全协议类型 + props.put(securityProtocol, kafkaProc.getValues(securityProtocol, "SASL_PLAINTEXT")); + // 服务名 + props.put(saslKerberosServiceName, "kafka"); + // 域名 + props.put(kerberosDomainName, kafkaProc.getValues(kerberosDomainName, "hadoop.hadoop.com")); + consumer = new KafkaConsumer(props); + this.topic = topic; + } + + /** + * 订阅Topic的消息处理函数 + */ + public void doWork() + { + // 订阅 + consumer.subscribe(Collections.singletonList(this.topic)); + // 消息消费请求 + ConsumerRecords records = consumer.poll(waitTime); + // 消息处理 + for (ConsumerRecord record : records) + { + LOG.info("[NewConsumerExample], Received message: (" + record.key() + ", " + record.value() + + ") at offset " + record.offset()); + } + } + + + + public static void main(String[] args) + { + if (KafkaSecurityUtil.isSecurityModel()) + { + try + { + LOG.info("Securitymode start."); + + //!!注意，安全认证时，需要用户手动修改为自己申请的机机账号 + KafkaSecurityUtil.securityPrepare(); + } + catch (IOException e) + { + LOG.error("Security prepare failure."); + LOG.error("The IOException occured : {}.", e); + return; + } + LOG.info("Security prepare success."); + } + + NewConsumer consumerThread = new NewConsumer(KafkaProperties.TOPIC); + consumerThread.start(); + + // 等到60s后将consumer关闭，实际执行过程中可修改 + try + { + Thread.sleep(60000); + } + catch (InterruptedException e) + { + LOG.info("The InterruptedException occured : {}.", e); + } + finally + { + consumerThread.shutdown(); + consumerThread.consumer.close(); + } + } + + @Override + public synchronized void start() { + doWork(); + } + + private void shutdown(){ + Thread.currentThread().interrupt(); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WatchApi.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WatchApi.java new file mode 100644 index 00000000..31bb013c --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WatchApi.java @@ -0,0 +1,25 @@ +package org.dromara.kafka.consumer.config; + +import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.Watcher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-15 16:10 + */ +public class WatchApi implements Watcher { + + private static final Logger logger = LoggerFactory.getLogger(WatchApi.class); + @Override + public void process(WatchedEvent event) { + logger.info("【Watcher监听事件】={}",event.getState()); + logger.info("【监听路径为】={}",event.getPath()); + logger.info("【监听的类型为】={}",event.getType()); // 三种监听类型： 创建，删除，更新 + } +} + + diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WebMvcConfig.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WebMvcConfig.java new file mode 100644 index 00000000..1f928a52 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/config/WebMvcConfig.java @@ -0,0 +1,32 @@ +package org.dromara.kafka.consumer.config; + + +import org.dromara.kafka.consumer.interceptors.MyInterceptor; +import org.dromara.kafka.consumer.interceptors.MyInterceptor2; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-08 16:19 + */ +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + private MyInterceptor myInterceptor; + private MyInterceptor2 myInterceptor2; + + public WebMvcConfig(MyInterceptor myInterceptor, MyInterceptor2 myInterceptor2) { + this.myInterceptor = myInterceptor; + this.myInterceptor2 = myInterceptor2; + } + + @Override + public void addInterceptors(InterceptorRegistry registry) { + registry.addInterceptor(myInterceptor); + registry.addInterceptor(myInterceptor2); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfo.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfo.java new file mode 100644 index 00000000..93b5fa56 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfo.java @@ -0,0 +1,52 @@ +package org.dromara.kafka.consumer.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + *

description:

+ * gps定位信息(es表) + * @author chenle + * @date 2021-05-14 9:39 + */ +@Data +public class EsGpsInfo implements Serializable { + + private static final long serialVersionUID = 7455495841680488351L; + /** + * 唯一码（外部系统）合肥版本不需要 21位id， + * 到时候上传省厅的时候 需要在kafka发送端处理，生成一个省厅需要的21位id + */ + private String deviceCode; + /** + * 类型 + */ + private String deviceType; + private String lat; + private String lng; + //方向 + private String orientation; + //高程 + private String height; + //精度 + private String deltaH; + private String speed; + + private String zzjgdm; + private String zzjgmc; + private String policeNo; + private String policeName; + private String phoneNum; + private String carNum; + + private Integer online; + + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date gpsTime; + //3401,3402等地市代码 + private String infoSource; + +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfoVO.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfoVO.java new file mode 100644 index 00000000..2252a1e7 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/EsGpsInfoVO.java @@ -0,0 +1,41 @@ +package org.dromara.kafka.consumer.entity; + +import lombok.Data; + +import java.io.Serializable; + +/** + *

description:

+ * + * @author chenle + * @date 2022-04-16 14:59 + */ +@Data +public class EsGpsInfoVO implements Serializable { + /** + * 设备串号，设备唯一值 + */ + private String deviceCode; + private String latitude; + private String longitude; + //方向 + private String direction; + //高程 + private String height; + //精度 + private String speed; + + private String gpsTime; + + private String zzjgdm; + + private String zzjgmc; + + private String policeNo; + + private String policeName; + + private String carNum; + + private Integer online; +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicCarGps.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicCarGps.java new file mode 100644 index 00000000..a24812a4 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicCarGps.java @@ -0,0 +1,24 @@ +package org.dromara.kafka.consumer.entity; + +import lombok.Data; + +/** + *

description:

+ * 公车kafka原始数据 + * @author chenle + * @date 2021-11-01 18:02 + */ +@Data +public class TopicCarGps { + private String ID; + private String MSG_CAR_ID; + private String MSG_DIRECTION; + private String MSG_DIRECTION_STR; + //时间戳 1600091231000#0 + private String MSG_GPS_TIME; + private String MSG_KM; + private String MSG_LAT; + private String MSG_LON; + private String MSG_PHONE; + private String MSG_SPEED; +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicGpsRealTime.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicGpsRealTime.java new file mode 100644 index 00000000..92bcc264 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicGpsRealTime.java @@ -0,0 +1,18 @@ +package org.dromara.kafka.consumer.entity; + +import lombok.Data; + +/** + *

description:

+ * pdt手台kafka原始数据 + * @author chenle + * @date 2021-11-01 18:06 + */ +@Data +public class TopicGpsRealTime { + private String GPSID; + //标准日期格式 2021-11-01 18:06:01 + private String REALTIME; + private String X; + private String Y; +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicZFJLY.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicZFJLY.java new file mode 100644 index 00000000..bda0d941 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/entity/TopicZFJLY.java @@ -0,0 +1,100 @@ +package org.dromara.kafka.consumer.entity; + +/** + *

description:

+ * + * @author chenle + * @date 2021-12-28 15:21 + */ +public class TopicZFJLY { + private String PlatformID; + private String EventId;//事件ID + private String Puid; //设备ID + private String Latitude; + private String Longtide; + private String Bearing;//方向 + private String Speed;//速度 + private String Altitude; //海拔 + private String Status;//GPS推送状态 + private String Time; //时间戳（UTC时间） + + public String getPlatformID() { + return PlatformID; + } + + public void setPlatformID(String platformID) { + PlatformID = platformID; + } + + public String getEventId() { + return EventId; + } + + public void setEventId(String eventId) { + EventId = eventId; + } + + public String getPuid() { + return Puid; + } + + public void setPuid(String puid) { + Puid = puid; + } + + public String getLatitude() { + return Latitude; + } + + public void setLatitude(String latitude) { + Latitude = latitude; + } + + public String getLongtide() { + return Longtide; + } + + public void setLongtide(String longtide) { + Longtide = longtide; + } + + public String getBearing() { + return Bearing; + } + + public void setBearing(String bearing) { + Bearing = bearing; + } + + public String getSpeed() { + return Speed; + } + + public void setSpeed(String speed) { + Speed = speed; + } + + public String getAltitude() { + return Altitude; + } + + public void setAltitude(String altitude) { + Altitude = altitude; + } + + public String getStatus() { + return Status; + } + + public void setStatus(String status) { + Status = status; + } + + public String getTime() { + return Time; + } + + public void setTime(String time) { + Time = time; + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/filters/MyFilter.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/filters/MyFilter.java new file mode 100644 index 00000000..fcae2d78 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/filters/MyFilter.java @@ -0,0 +1,30 @@ +package org.dromara.kafka.consumer.filters; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.*; +import javax.servlet.annotation.WebFilter; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-08 15:40 + */ +@WebFilter(filterName="MyFilter",urlPatterns = "/*") +public class MyFilter implements Filter { + + private Logger logger = LoggerFactory.getLogger(MyFilter.class); + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + HttpServletRequest request = (HttpServletRequest) servletRequest; + String queryString = request.getQueryString(); +// logger.error("pre,queryString={}",queryString); + filterChain.doFilter(servletRequest,servletResponse); +// logger.error("queryString={}",queryString); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/ConsumerWorker.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/ConsumerWorker.java new file mode 100644 index 00000000..37634b12 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/ConsumerWorker.java @@ -0,0 +1,234 @@ +package org.dromara.kafka.consumer.handler; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import cn.hutool.core.convert.ConvertException; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; +import com.ruansee.response.ApiResponse; +import org.apache.commons.lang.StringUtils; +import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.dromara.common.core.domain.R; +import org.dromara.data2es.api.RemoteDataToEsService; +import org.dromara.data2es.api.domain.RemoteGpsInfo; +import org.dromara.kafka.consumer.entity.EsGpsInfo; +import org.dromara.kafka.consumer.entity.EsGpsInfoVO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.LinkedBlockingDeque; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 16:44 + */ +public class ConsumerWorker implements Runnable { + private ConsumerRecord record; + private Logger logger = LoggerFactory.getLogger(ConsumerWorker.class); + + public static LinkedBlockingDeque linkedBlockingDeque = new LinkedBlockingDeque<>(5000); + + private String cityCode ; + + ConsumerWorker(ConsumerRecord record, String cityCode) { + this.record = record; + this.cityCode = cityCode; + } + + @Override + public void run() { + //其他地市使用的方法,这里使用了一个巧妙的方法，我们开发的地市都是传4位，这种其他地市的cityCode传大于4位，然后截取 + if(cityCode.length() > 4){ + cityCode = cityCode.substring(0,4); + normalRequest(); + }else { + //六安、安庆等地市的方法，这些地市都是我们自己公司开发的东西。 + luanrequest(); +// luanrequestBatch(); + } + } + + /* + * 废弃方法 + * */ + private void luanrequestBatch() { + Object value = record.value(); + String topic = record.topic(); + List list = new ArrayList<>(); + logger.info("offset={},topic={},value={}", record.offset(), topic,value); + List jsonObjects = JSON.parseArray((String) value, JSONObject.class); + for (JSONObject jsonObject : jsonObjects) { + EsGpsInfo esGpsInfo; + /*try { + jsonObject = JSONUtil.parseObj(((String) value)); + }catch (ConvertException e){ + logger.info("jsonObject=null:error={}",e.getMessage()); + return; + }*/ + try { + esGpsInfo = JSONUtil.toBean(jsonObject, EsGpsInfo.class); + }catch (ConvertException e){ + logger.info("EsGpsInfo=null:error={}",e.getMessage()); + return; + } + + if(Objects.isNull(esGpsInfo)){ + logger.info("esGpsInfo=null no error"); + return; + } + String deviceCode = esGpsInfo.getDeviceCode(); + if(StringUtils.isEmpty(deviceCode) || deviceCode.length() > 100){ + logger.info("deviceCode:{} is null or is too long ",deviceCode); + return; + } + String latitude = esGpsInfo.getLat(); + if(StringUtils.isEmpty(latitude) || "0.0".equals(latitude)){ + logger.info("latitude:{} is null or is zero ",latitude); + return; + } + String longitude = esGpsInfo.getLng(); + if(StringUtils.isEmpty(longitude) || "0.0".equals(longitude)){ + logger.info("longitude:{} is null or is zero ",longitude); + return; + } + esGpsInfo.setInfoSource(cityCode); + + esGpsInfo.setGpsTime(new Date(Long.valueOf(jsonObject.getStr("gpsTime")))); + list.add(esGpsInfo); + } +// dataToEsService.saveGpsInfoBatch(list); + } + + private void luanrequest() { + Object value = record.value(); + String topic = record.topic(); + + logger.info("offset={},topic={},value={}", record.offset(), topic,value); + RemoteGpsInfo esGpsInfo; + JSONObject jsonObject; + try { + jsonObject = JSONUtil.parseObj(((String) value)); + }catch (ConvertException e){ + logger.info("jsonObject=null:error={}",e.getMessage()); + return; + } + try { + esGpsInfo = JSONUtil.toBean(jsonObject, RemoteGpsInfo.class); + }catch (ConvertException e){ + logger.info("EsGpsInfo=null:error={}",e.getMessage()); + return; + } + + if(Objects.isNull(esGpsInfo)){ + logger.info("esGpsInfo=null no error"); + return; + } + String deviceCode = esGpsInfo.getDeviceCode(); + if(StringUtils.isEmpty(deviceCode) || deviceCode.length() > 100){ + logger.info("deviceCode:{} is null or is too long ",deviceCode); + return; + } + String latitude = esGpsInfo.getLat(); + if(StringUtils.isEmpty(latitude) || "0.0".equals(latitude)){ + logger.info("latitude:{} is null or is zero ",latitude); + return; + } + String longitude = esGpsInfo.getLng(); + if(StringUtils.isEmpty(longitude) || "0.0".equals(longitude)){ + logger.info("longitude:{} is null or is zero ",longitude); + return; + } + esGpsInfo.setInfoSource(cityCode); + try { + esGpsInfo.setGpsTime(new Date(Long.valueOf(jsonObject.getStr("gpsTime")))); + }catch (Exception e){ + logger.error("error_msg={}",e.getMessage()); + } + logger.info("esGpsInfo={}",esGpsInfo); + boolean offer = linkedBlockingDeque.offer(esGpsInfo); + R response = R.ok(offer); + if(Objects.isNull(response)){ + logger.info("response == null"); + } + logger.info("code={},msg={}",response.getCode(),response.getMsg()); + if(200 == response.getCode()){ + logger.info("topic={},data2es={},gpsTime={}",topic,"success",esGpsInfo.getGpsTime()); + }else{ + logger.info("topic={},data2es={}",topic,response.getMsg()); + } + } + + + + /** + * 通用的请求（一般地市采用这个方法） + */ + private void normalRequest() { + Object value = record.value(); + String topic = record.topic(); + + logger.info("offset={},topic={},value={}", record.offset(), topic,value); + + RemoteGpsInfo esGpsInfo = new RemoteGpsInfo(); + EsGpsInfoVO esGpsInfoVO; + try { + esGpsInfoVO = JSONUtil.toBean(((String) value), EsGpsInfoVO.class); + }catch (ConvertException e){ + logger.info("esGpsInfoVO=null:error={}",e.getMessage()); + return; + } + if(Objects.isNull(esGpsInfoVO)){ + logger.info("esGpsInfoVO=null no error"); + return; + } + + + try { + DateTime parse = DateUtil.parse(esGpsInfoVO.getGpsTime(), "yyyy-MM-dd HH:mm:ss"); + }catch (Exception e){ + logger.info("gpsTime:{} format error", esGpsInfoVO.getGpsTime()); + return; + } + + String deviceCode = esGpsInfoVO.getDeviceCode(); + if(StringUtils.isEmpty(deviceCode) || deviceCode.length() > 100){ + logger.info("deviceCode:{} is null or is too long ",deviceCode); + return; + } + String latitude = esGpsInfoVO.getLatitude(); + if(StringUtils.isEmpty(latitude) || "0.0".equals(latitude)){ + logger.info("latitude:{} is null or is zero ",latitude); + return; + } + String longitude = esGpsInfoVO.getLongitude(); + if(StringUtils.isEmpty(longitude) || "0.0".equals(longitude)){ + logger.info("longitude:{} is null or is zero ",longitude); + return; + } + BeanUtil.copyProperties(esGpsInfoVO,esGpsInfo,new CopyOptions()); + esGpsInfo.setLat(latitude); + esGpsInfo.setLng(esGpsInfoVO.getLongitude()); + esGpsInfo.setOrientation(esGpsInfoVO.getDirection()); + esGpsInfo.setInfoSource(cityCode); + + boolean offer = linkedBlockingDeque.offer(esGpsInfo); + R response = R.ok(offer); + if(200 == response.getCode()){ + logger.info("topic={},data2es={}",topic,"success"); + }else{ + logger.error("topic={},data2es={}",topic,"fail"); + } + } + + +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/DataInsertBatchHandler.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/DataInsertBatchHandler.java new file mode 100644 index 00000000..cc798e00 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/DataInsertBatchHandler.java @@ -0,0 +1,57 @@ +package org.dromara.kafka.consumer.handler; + +import cn.hutool.core.collection.CollectionUtil; +import com.google.common.collect.Queues; +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.data2es.api.RemoteDataToEsService; +import org.dromara.data2es.api.domain.RemoteGpsInfo; +import org.dromara.kafka.consumer.entity.EsGpsInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; + +/** + *

description:

+ * 获取blockQueue 然后发送到batch中 + * @author chenle + * @date 2023-04-03 10:29 + */ +@Configuration +@Slf4j +public class DataInsertBatchHandler implements CommandLineRunner { + + @DubboReference + private RemoteDataToEsService gpsService; + + @Override + public void run(String... args) throws Exception { + ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor(); + LinkedBlockingDeque linkedBlockingDeque = ConsumerWorker.linkedBlockingDeque; + singleThreadExecutor.execute(new Runnable() { + @Override + public void run() { + while (true) { + try { + List list = new ArrayList<>(); + Queues.drain(linkedBlockingDeque, list, 200, 5, TimeUnit.SECONDS); + log.info("batch size={}", list.size()); + if(CollectionUtil.isNotEmpty(list)) { + gpsService.saveDataBatch(list); + } + } catch (Exception e) { + log.error("缓存队列批量消费异常：{}", e.getMessage()); + } + } + } + }); + } + +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaConsumerRunnable.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaConsumerRunnable.java new file mode 100644 index 00000000..6d21ea5f --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaConsumerRunnable.java @@ -0,0 +1,98 @@ +package org.dromara.kafka.consumer.handler; + +import org.apache.dubbo.config.annotation.DubboReference; +import org.apache.kafka.clients.consumer.ConsumerRecord; +import org.apache.kafka.clients.consumer.ConsumerRecords; +import org.apache.kafka.clients.consumer.KafkaConsumer; +import org.apache.kafka.common.PartitionInfo; +import org.apache.kafka.common.TopicPartition; +import org.dromara.data2es.api.RemoteDataToEsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.kafka.config.ConcurrentKafkaListenerContainerFactory; +import org.springframework.kafka.config.KafkaListenerContainerFactory; +import org.springframework.kafka.core.DefaultKafkaConsumerFactory; +import org.springframework.kafka.listener.ContainerProperties; +import org.springframework.kafka.listener.MessageListener; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ThreadPoolExecutor; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 16:39 + */ +public class KafkaConsumerRunnable implements Runnable { + + private Map props; + private ThreadPoolExecutor taskExecutor; + + private String cityCode; + private Logger logger = LoggerFactory.getLogger(KafkaConsumerRunnable.class); + + public KafkaConsumerRunnable(Map props, ThreadPoolExecutor taskExecutor, + String cityCode) { + this.props = props; + this.taskExecutor = taskExecutor; + this.cityCode = cityCode; + } + + private DefaultKafkaConsumerFactory buildConsumerFactory(){ + return new DefaultKafkaConsumerFactory(props); + } + + private ContainerProperties containerProperties(String[] topic, MessageListener messageListener) { + ContainerProperties containerProperties = new ContainerProperties(topic); + containerProperties.setMessageListener(messageListener); + return containerProperties; + } + + private KafkaListenerContainerFactory buildListenerFactory(){ + ConcurrentKafkaListenerContainerFactory factory = new ConcurrentKafkaListenerContainerFactory(); + factory.setConsumerFactory(buildConsumerFactory()); + factory.setConcurrency(4); + factory.setBatchListener(true); + + factory.getContainerProperties().setPollTimeout(3000); + return factory; + } + + + + + + + @Override + public void run() { + KafkaConsumer consumer = new KafkaConsumer<>(props); + + List topics = (List) props.get("topics"); + consumer.subscribe(topics); + consumer.poll(0); // 令订阅生效 + + List topicPartitions = new ArrayList<>(); + Map> stringListMap = consumer.listTopics(); + for (Object topic : topics) { + String topic1 = (String) topic; + List partitionInfos = stringListMap.get(topic1); + for (PartitionInfo partitionInfo : partitionInfos) { + TopicPartition partition = new TopicPartition(topic1, partitionInfo.partition()); + topicPartitions.add(partition); + } + } + consumer.seekToEnd(topicPartitions); // 如果传Collections.emptyList()表示移动所有订阅topic分区offset到最末端 + + while (true) { + ConsumerRecords records = consumer.poll(Duration.ofMillis(100)); + for (ConsumerRecord record : records) { + taskExecutor.submit(new ConsumerWorker(record, cityCode)); + } + + } + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaSecurityUtil.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaSecurityUtil.java new file mode 100644 index 00000000..cf4a3238 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/KafkaSecurityUtil.java @@ -0,0 +1,108 @@ +package org.dromara.kafka.consumer.handler; + +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import org.dromara.kafka.consumer.entity.EsGpsInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + *

description:

+ * + * @author chenle + * @date 2021-10-28 14:48 + */ +public class KafkaSecurityUtil { + + + + + static Logger logger = LoggerFactory.getLogger(KafkaSecurityUtil.class); + + public static void main(String[] args) { + EsGpsInfo esGpsInfo = new EsGpsInfo(); + String realtime = "2021/11/04 12:00:11"; + DateTime dateTime = DateUtil.parse(realtime); + esGpsInfo.setGpsTime(dateTime.toJdkDate()); + logger.info("esGpsInfo:{},deviceType={},gpsTime={}",esGpsInfo.toString(), + esGpsInfo.getDeviceType(),dateTime.toJdkDate().toString()); + } + /** + * 用户自己申请的机机账号keytab文件名称 + */ + private static final String USER_KEYTAB_FILE = "user.keytab"; + + /** + * 用户自己申请的机机账号名称 + */ + private static final String USER_PRINCIPAL = "aqdsj_ruansi@HADOOP.COM"; + + public static void securityPrepare() throws IOException + { + logger.error("进入了---securityPrepare"); + //String filePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator; + //String krbFile = filePath + "krb5.conf"; + //ClassPathResource classPathResource = new ClassPathResource("krb5.conf"); + //String krbFile = classPathResource.getAbsolutePath(); + String krbFile = "/gpsstore/krb5.conf"; +// String userKeyTableFile = filePath + USER_KEYTAB_FILE; + //ClassPathResource classPathResource1 = new ClassPathResource(USER_KEYTAB_FILE); + String userKeyTableFile = "/gpsstore/user.keytab"; + + //windows路径下分隔符替换 + userKeyTableFile = userKeyTableFile.replace("\\", "\\\\"); + krbFile = krbFile.replace("\\", "\\\\"); + + LoginUtil.setKrb5Config(krbFile); + LoginUtil.setZookeeperServerPrincipal("zookeeper/hadoop.hadoop.com"); + logger.error("userKeyTableFile路径---{}",userKeyTableFile); + LoginUtil.setJaasFile(USER_PRINCIPAL, userKeyTableFile); + } + + public static Boolean isSecurityModel() + { + Boolean isSecurity = false; + //String krbFilePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "kafkaSecurityMode"; + //ClassPathResource classPathResource = new ClassPathResource("kafkaSecurityMode"); + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("kafkaSecurityMode"); + + /*File file = classPathResource.getFile(); + + if(!file.exists()){ + return isSecurity; + }*/ + + Properties securityProps = new Properties(); + + + try + { + securityProps.load(inputStream); + if ("yes".equalsIgnoreCase(securityProps.getProperty("kafka.client.security.mode"))) + { + isSecurity = true; + } + } + catch (Exception e) + { + logger.info("The Exception occured : {}.", e); + } + + return isSecurity; + } + + /* + * 判断文件是否存在 + */ + private static boolean isFileExists(String fileName) + { + File file = new File(fileName); + + return file.exists(); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/LoginUtil.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/LoginUtil.java new file mode 100644 index 00000000..8fa4b0bf --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/LoginUtil.java @@ -0,0 +1,215 @@ +package org.dromara.kafka.consumer.handler; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +/** + *

description:

+ * + * @author chenle + * @date 2021-10-28 15:40 + */ +public class LoginUtil +{ + + public enum Module + { + STORM("StormClient"), KAFKA("KafkaClient"), ZOOKEEPER("Client"); + + private String name; + + private Module(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + } + + /** + * line operator string + */ + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + + /** + * jaas file postfix + */ + private static final String JAAS_POSTFIX = ".jaas.conf"; + + /** + * is IBM jdk or not + */ + private static final boolean IS_IBM_JDK = System.getProperty("java.vendor").contains("IBM"); + + /** + * IBM jdk login module + */ + private static final String IBM_LOGIN_MODULE = "com.ibm.security.auth.module.Krb5LoginModule required"; + + /** + * oracle jdk login module + */ + private static final String SUN_LOGIN_MODULE = "com.sun.security.auth.module.Krb5LoginModule required"; + + /** + * Zookeeper quorum principal. + */ + public static final String ZOOKEEPER_AUTH_PRINCIPAL = "zookeeper.server.principal"; + + /** + * java security krb5 file path + */ + public static final String JAVA_SECURITY_KRB5_CONF = "java.security.krb5.conf"; + + /** + * java security login file path + */ + public static final String JAVA_SECURITY_LOGIN_CONF = "java.security.auth.login.config"; + + /** + * 设置jaas.conf文件 + * + * @param principal + * @param keytabPath + * @throws IOException + */ + public static void setJaasFile(String principal, String keytabPath) + throws IOException + { + String jaasPath = + new File(System.getProperty("java.io.tmpdir")) + File.separator + System.getProperty("user.name") + + JAAS_POSTFIX; + + // windows路径下分隔符替换 + jaasPath = jaasPath.replace("\\", "\\\\"); + // 删除jaas文件 + deleteJaasFile(jaasPath); + writeJaasFile(jaasPath, principal, keytabPath); + System.setProperty(JAVA_SECURITY_LOGIN_CONF, jaasPath); + } + + /** + * 设置zookeeper服务端principal + * + * @param zkServerPrincipal + * @throws IOException + */ + public static void setZookeeperServerPrincipal(String zkServerPrincipal) + throws IOException + { + System.setProperty(ZOOKEEPER_AUTH_PRINCIPAL, zkServerPrincipal); + String ret = System.getProperty(ZOOKEEPER_AUTH_PRINCIPAL); + if (ret == null) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is null."); + } + if (!ret.equals(zkServerPrincipal)) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is " + ret + " is not " + zkServerPrincipal + "."); + } + } + + /** + * 设置krb5文件 + * + * @param krb5ConfFile + * @throws IOException + */ + public static void setKrb5Config(String krb5ConfFile) + throws IOException + { + System.setProperty(JAVA_SECURITY_KRB5_CONF, krb5ConfFile); + String ret = System.getProperty(JAVA_SECURITY_KRB5_CONF); + if (ret == null) + { + throw new IOException(JAVA_SECURITY_KRB5_CONF + " is null."); + } + if (!ret.equals(krb5ConfFile)) + { + throw new IOException(JAVA_SECURITY_KRB5_CONF + " is " + ret + " is not " + krb5ConfFile + "."); + } + } + + /** + * 写入jaas文件 + * + * @throws IOException + * 写文件异常 + */ + private static void writeJaasFile(String jaasPath, String principal, String keytabPath) + throws IOException + { + FileWriter writer = new FileWriter(new File(jaasPath)); + try + { + writer.write(getJaasConfContext(principal, keytabPath)); + writer.flush(); + } + catch (IOException e) + { + throw new IOException("Failed to create jaas.conf File"); + } + finally + { + writer.close(); + } + } + + private static void deleteJaasFile(String jaasPath) + throws IOException + { + File jaasFile = new File(jaasPath); + if (jaasFile.exists()) + { + if (!jaasFile.delete()) + { + throw new IOException("Failed to delete exists jaas file."); + } + } + } + + private static String getJaasConfContext(String principal, String keytabPath) + { + Module[] allModule = Module.values(); + StringBuilder builder = new StringBuilder(); + for (Module modlue : allModule) + { + builder.append(getModuleContext(principal, keytabPath, modlue)); + } + return builder.toString(); + } + + private static String getModuleContext(String userPrincipal, String keyTabPath, Module module) + { + StringBuilder builder = new StringBuilder(); + if (IS_IBM_JDK) + { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append(IBM_LOGIN_MODULE).append(LINE_SEPARATOR); + builder.append("credsType=both").append(LINE_SEPARATOR); + builder.append("principal=\"" + userPrincipal + "\"").append(LINE_SEPARATOR); + builder.append("useKeytab=\"" + keyTabPath + "\"").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } + else + { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append(SUN_LOGIN_MODULE).append(LINE_SEPARATOR); + builder.append("useKeyTab=true").append(LINE_SEPARATOR); + builder.append("keyTab=\"" + keyTabPath + "\"").append(LINE_SEPARATOR); + builder.append("principal=\"" + userPrincipal + "\"").append(LINE_SEPARATOR); + builder.append("useTicketCache=false").append(LINE_SEPARATOR); + builder.append("storeKey=true").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } + + return builder.toString(); + } +} + diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/RealConsumer.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/RealConsumer.java new file mode 100644 index 00000000..29307c6f --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/handler/RealConsumer.java @@ -0,0 +1,130 @@ +package org.dromara.kafka.consumer.handler; + + +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.common.serialization.StringDeserializer; +import org.dromara.kafka.consumer.config.KafkaPropertiesConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadPoolExecutor; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-06 11:15 + */ +@Component +public class RealConsumer implements CommandLineRunner { + + private String kafkaServers; + + private String groupId; + + private String topics; + + private String cityCode = "3400"; + + + + @Autowired + KafkaPropertiesConfig kafkaPropertiesConfig; + + @Autowired + ThreadPoolExecutor dtpExecutor2; + + + private Logger logger = LoggerFactory.getLogger(RealConsumer.class); + + @Override + public void run(String... args) throws Exception { + kafkaServers = "127.0.0.1:9092"; + topics = "topic.send.2,topic.send.3,topic.send.4,topic.send.5,topic.send.8"; + groupId = "group_ruansi_xuancheng"; + cityCode = "3418"; + if(args.length > 0){ + /*kafkaServers = args[0]; + topics = args[1]; + groupId = args[2]; + cityCode = args[3];*/ + + } + ExecutorService executorService = Executors.newSingleThreadExecutor(); + Map kafkaProp = getKafkaProp(); + + + if (KafkaSecurityUtil.isSecurityModel()) + { + try + { + logger.info("Securitymode start."); + + //!!注意，安全认证时，需要用户手动修改为自己申请的机机账号 + //认证方式 SASL_PLAINTEXT 或者 PLAINTEXT + kafkaProp.put("security.protocol","SASL_PLAINTEXT"); + //服务名 + kafkaProp.put("sasl.kerberos.service.name","kafka"); + //域名 + kafkaProp.put("kerberos.domain.name","hadoop.hadoop.com"); + KafkaSecurityUtil.securityPrepare(); + } + catch (IOException e) + { + logger.error("Security prepare failure."); + logger.error("The IOException occured.", e); + return; + } + logger.info("Security prepare success."); + } + + KafkaConsumerRunnable runnable = new KafkaConsumerRunnable(kafkaProp,dtpExecutor2,cityCode); + executorService.execute(runnable); + } + + + + /** + * 获取kafka配置 + * @return + */ + private Map getKafkaProp() { +// Properties map = new Properties(); + Map map = new HashMap<>(); + map.put("bootstrap.servers",kafkaServers); + map.put("group.id",groupId); + map.put("enable.auto.commit", "true"); + map.put("auto.commit.interval.ms", "1000"); + map.put("session.timeout.ms", "30000"); + map.put("key.deserializer", StringDeserializer.class); + map.put("value.deserializer", StringDeserializer.class); + map.put(ConsumerConfig.MAX_POLL_RECORDS_CONFIG,5); +// map.put(ConsumerConfig.MAX_POLL_INTERVAL_MS_CONFIG,1000 * 5); +// map.put("ack.mode", "manual_immediate"); + +// //认证方式 SASL_PLAINTEXT 或者 PLAINTEXT +// map.put("security.protocol","SASL_PLAINTEXT"); +// //服务名 +// map.put("sasl.kerberos.service.name","kafka"); +// //域名 +// map.put("kerberos.domain.name","hadoop.hadoop.com"); + String[] split = topics.split(","); + List list = CollectionUtils.arrayToList(split); + map.put("topics", list); + return map; + } + + + +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor.java new file mode 100644 index 00000000..bcae27a2 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor.java @@ -0,0 +1,39 @@ +package org.dromara.kafka.consumer.interceptors; + +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-08 16:09 + */ +@Configuration +public class MyInterceptor implements HandlerInterceptor { + + private Logger logger = LoggerFactory.getLogger(MyInterceptor.class); + + @Override + public boolean preHandle(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, Object handler) throws Exception { + return HandlerInterceptor.super.preHandle(request, response, handler); + } + + @Override + public void postHandle(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + HandlerInterceptor.super.postHandle(request, response, handler, modelAndView); + } + + @Override + public void afterCompletion(jakarta.servlet.http.HttpServletRequest request, jakarta.servlet.http.HttpServletResponse response, Object handler, Exception ex) throws Exception { + HandlerInterceptor.super.afterCompletion(request, response, handler, ex); + } + +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor2.java b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor2.java new file mode 100644 index 00000000..48a98e0a --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/java/org/dromara/kafka/consumer/interceptors/MyInterceptor2.java @@ -0,0 +1,36 @@ +package org.dromara.kafka.consumer.interceptors; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +/** + *

description:

+ * + * @author chenle + * @date 2021-09-08 16:09 + */ +@Configuration +public class MyInterceptor2 implements HandlerInterceptor { + + private Logger logger = LoggerFactory.getLogger(MyInterceptor2.class); + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + return HandlerInterceptor.super.preHandle(request, response, handler); + } + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + HandlerInterceptor.super.postHandle(request, response, handler, modelAndView); + } + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + HandlerInterceptor.super.afterCompletion(request, response, handler, ex); + } +} diff --git a/stwzhj-modules/stwzhj-consumer/src/main/resources/application.yml b/stwzhj-modules/stwzhj-consumer/src/main/resources/application.yml new file mode 100644 index 00000000..760a3a62 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/resources/application.yml @@ -0,0 +1,32 @@ +# Tomcat +server: + port: 9214 + +# Spring +spring: + application: + # 应用名称 + name: stwzhj-consumer + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + username: @nacos.username@ + password: @nacos.password@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml diff --git a/stwzhj-modules/stwzhj-consumer/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-consumer/src/main/resources/banner.txt new file mode 100644 index 00000000..fbd45f53 --- /dev/null +++ b/stwzhj-modules/stwzhj-consumer/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-consumer/src/main/resources/logback-plus.xml diff --git a/stwzhj-modules/stwzhj-data2es/pom.xml b/stwzhj-modules/stwzhj-data2es/pom.xml new file mode 100644 index 00000000..3b749d9d --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/pom.xml @@ -0,0 +1,177 @@ + + + + org.dromara + stwzhj-modules + ${revision} + + 4.0.0 + + stwzhj-data2es + + + stwzhj-data2es位置汇聚数据处理 + + + + + + org.dromara + stwzhj-common-nacos + + + + org.dromara + stwzhj-common-sentinel + + + + + org.dromara + stwzhj-common-log + + + + org.dromara + stwzhj-common-dict + + + + org.dromara + stwzhj-common-doc + + + + org.dromara + stwzhj-common-web + + + + org.dromara + stwzhj-common-mybatis + + + + org.dromara + stwzhj-common-dubbo + + + + org.dromara + stwzhj-common-seata + + + + org.dromara + stwzhj-common-idempotent + + + + org.dromara + stwzhj-common-tenant + + + + org.dromara + stwzhj-common-security + + + + org.dromara + stwzhj-common-translation + + + + org.dromara + stwzhj-common-sensitive + + + + org.dromara + stwzhj-common-encrypt + + + + org.dromara + stwzhj-common-redis + + + + + org.dromara + stwzhj-api-system + + + + org.dromara + stwzhj-api-resource + + + + org.dromara + stwzhj-api-data2es + + + + + org.elasticsearch + elasticsearch + 7.14.0 + + + log4j-api + org.apache.logging.log4j + + + + + org.elasticsearch.client + elasticsearch-rest-client + 7.14.0 + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + 7.14.0 + + + org.elasticsearch + elasticsearch + + + elasticsearch-rest-client + org.elasticsearch.client + + + + + + + + org.springframework.kafka + spring-kafka + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java new file mode 100644 index 00000000..aa57683e --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/HjData2esApplication.java @@ -0,0 +1,22 @@ +package org.dromara.data2es; + + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableDubbo +@EnableScheduling +@SpringBootApplication +public class HjData2esApplication { + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(HjData2esApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ "); + } + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java new file mode 100644 index 00000000..a41e0289 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/ElasticsearchConfig.java @@ -0,0 +1,92 @@ +package org.dromara.data2es.config; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpHost; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestClientBuilder; +import org.elasticsearch.client.RestHighLevelClient; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +/** + * restHighLevelClient 客户端配置类 + */ +@Slf4j +@Data +@Configuration +@ConfigurationProperties(prefix = "elasticsearch") +public class ElasticsearchConfig { + + // es host ip 地址（集群） + private String hosts; + // es 用户名 + private String userName; + // es 密码 + private String password; + // es 请求方式 + private String scheme; + // es 集群名称 + private String clusterName; + // es 连接超时时间 + private int connectTimeOut; + // es socket 连接超时时间 + private int socketTimeOut; + // es 请求超时时间 + private int connectionRequestTimeOut; + // es 最大连接数 + private int maxConnectNum; + // es 每个路由的最大连接数 + private int maxConnectNumPerRoute; + + /** + * 如果@Bean没有指定bean的名称，那么这个bean的名称就是方法名 + */ + @Bean(name = "restHighLevelClient") + public RestHighLevelClient restHighLevelClient() { + RestHighLevelClient restHighLevelClient = null; + try { + // 集群，拆分地址 + List hostLists = new ArrayList<>(); + String[] hostList = hosts.split(","); + for (String addr : hostList) { + String host = addr.split(":")[0]; + String port = addr.split(":")[1]; + hostLists.add(new HttpHost(host, Integer.parseInt(port), scheme)); + } + // 转换成 HttpHost 数组 + HttpHost[] httpHost = hostLists.toArray(new HttpHost[]{}); + // 构建连接对象 + RestClientBuilder builder = RestClient.builder(httpHost); + // 设置用户名、密码 + CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); +// credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); + // 连接延时配置 + builder.setRequestConfigCallback(requestConfigBuilder -> { + requestConfigBuilder.setConnectTimeout(connectTimeOut); + requestConfigBuilder.setSocketTimeout(socketTimeOut); + requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeOut); + return requestConfigBuilder; + }); + // 连接数配置 + builder.setHttpClientConfigCallback(httpClientBuilder -> { + httpClientBuilder.setMaxConnTotal(maxConnectNum); + httpClientBuilder.setMaxConnPerRoute(maxConnectNumPerRoute); + httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + return httpClientBuilder; + }); + restHighLevelClient = new RestHighLevelClient(builder); + } catch (NumberFormatException e) { + log.error("ES 连接池初始化异常"); + } + return restHighLevelClient; + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java new file mode 100644 index 00000000..d2e119c6 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaConfig.java @@ -0,0 +1,190 @@ +package org.dromara.data2es.config; + +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.dromara.data2es.producer.NewProducer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.kafka.KafkaProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.kafka.core.KafkaAdmin; +import org.springframework.stereotype.Component; + +import java.io.IOException; +import java.util.Properties; + +/** + *

description:

+ * + * @author chenle + * @date 2021-11-03 14:15 + */ +//@Component +public class KafkaConfig { + + private Logger logger = LoggerFactory.getLogger(KafkaConfig.class); + +// private String kafkaServers = "140.168.2.31:21007,140.168.2.32:21007,140.168.2.33:21007"; +// private String kafkaServers = "53.208.61.105:6667,53.208.61.106:6667,53.208.61.107:6667";//六安GA网 +// private String kafkaServers = "34.72.62.93:9092";//六安视频网 + private String kafkaServers = "127.0.0.1:9092";//本地 +// private String kafkaServers = "eurekahost1:9090,eurekahost2:9090,eurekahost3:9090";//省厅 + + private String groupId = "ruansiProducer"; + + + private static final Logger LOG = LoggerFactory.getLogger(NewProducer.class); + + + // Broker地址列表 + private final String bootstrapServers = "bootstrap.servers"; + + // 客户端ID + private final String clientId = "client.id"; + + // Key序列化类 + private final String keySerializer = "key.serializer"; + + // Value序列化类 + private final String valueSerializer = "value.serializer"; + + // 协议类型:当前支持配置为SASL_PLAINTEXT或者PLAINTEXT + private final String securityProtocol = "security.protocol"; + + // 服务名 + private final String saslKerberosServiceName = "sasl.kerberos.service.name"; + + // 域名 + private final String kerberosDomainName = "kerberos.domain.name"; + + //默认发送20条消息 + private final int messageNumToSend = 100; + + /** + * 用户自己申请的机机账号keytab文件名称 + */ + private static final String USER_KEYTAB_FILE = "请修改为真实keytab文件名"; + + /** + * 用户自己申请的机机账号名称 + */ + private static final String USER_PRINCIPAL = "请修改为真实用户名称"; + + /** + * 新Producer 构造函数 + * @param + * @param + */ + + @Bean(name = "myKafkaProducer") + public KafkaProducer newProducer() { + Properties props = new Properties(); + + if (KafkaSecurityUtil.isSecurityModel()) + { + try + { + logger.info("Securitymode start."); + //!!注意，安全认证时，需要用户手动修改为自己申请的机机账号 + KafkaSecurityUtil.securityPrepare(); + props.put(securityProtocol, "SASL_PLAINTEXT"); + // 服务名 + props.put(saslKerberosServiceName, "kafka"); + // 域名 + props.put(kerberosDomainName, "hadoop.hadoop.com"); + } + catch (IOException e) + { + logger.error("Security prepare failure."); + logger.error("The IOException occured.", e); + return null; + } + logger.info("Security prepare success."); + }else{ + props.put(securityProtocol, "PLAINTEXT"); + } + + + + // Broker地址列表 + props.put(bootstrapServers,kafkaServers); + // 客户端ID +// props.put(clientId, "ruansiProducer"); + // Key序列化类 + props.put(keySerializer, + "org.apache.kafka.common.serialization.IntegerSerializer"); + // Value序列化类 + props.put(valueSerializer, + "org.apache.kafka.common.serialization.StringSerializer"); + //批量发送信息配置 + props.put("batch.size", 16384); + props.put("linger.ms", 1); + props.put("buffer.memory", 33554432); + // 协议类型:当前支持配置为SASL_PLAINTEXT或者PLAINTEXT + //props.put(securityProtocol, "SASL_PLAINTEXT"); +// // 服务名 +// props.put(saslKerberosServiceName, "kafka"); +// // 域名 +// props.put(kerberosDomainName, "hadoop.hadoop.com"); + //设置自定义的分区策略类，默认不传key，是粘性分区，尽量往一个分区中发消息。如果key不为null，则默认是按照key的hashcode与 partition的取余来决定哪个partition + //props.put("partitioner.class","com.kafka.myparitioner.CidPartitioner"); + KafkaProducer producer = new KafkaProducer<>(props); +// KafkaProducer producer = new KafkaProducer<>(props); + + return producer; + } + + @Bean + public KafkaAdmin admin(KafkaProperties properties){ + KafkaAdmin admin = new KafkaAdmin(properties.buildAdminProperties()); + admin.setFatalIfBrokerNotAvailable(true); + return admin; + } + @Bean + public NewTopic topic5() { + return new NewTopic("topic.send.5", 1, (short) 1); + } + @Bean + public NewTopic topic1() { + return new NewTopic("topic.send.1", 1, (short) 1); + } + @Bean + public NewTopic topic2() { + return new NewTopic("topic.send.2", 1, (short) 1); + } + @Bean + public NewTopic topic3() { + return new NewTopic("topic.send.3", 1, (short) 1); + } + @Bean + public NewTopic topic4() { + return new NewTopic("topic.send.4", 1, (short) 1); + } + @Bean + public NewTopic topic6() { + return new NewTopic("topic.send.6", 1, (short) 1); + } + + @Bean + public NewTopic topic_zfjly() { + return new NewTopic("topic_gps_zfjly", 1, (short) 1); + } + + + @Bean + public NewTopic topic_gps_car() { + return new NewTopic("topic_gps_car", 1, (short) 1); + } + + @Bean + public NewTopic topic_zfjly2() { + return new NewTopic("topic_gps_zfjly2", 3, (short) 1); + } + + + @Bean + public NewTopic topic_gps_car2() { + return new NewTopic("topic_gps_car2", 3, (short) 1); + } + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java new file mode 100644 index 00000000..3b6409a4 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/KafkaSecurityUtil.java @@ -0,0 +1,93 @@ +package org.dromara.data2es.config; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +/** + *

description:

+ * + * @author chenle + * @date 2021-10-28 14:48 + */ +public class KafkaSecurityUtil { + + static Logger logger = LoggerFactory.getLogger(KafkaSecurityUtil.class); + /** + * 用户自己申请的机机账号keytab文件名称 + */ + private static final String USER_KEYTAB_FILE = "user.keytab"; + + /** + * 用户自己申请的机机账号名称 + */ + private static final String USER_PRINCIPAL = "aqdsj_ruansi@HADOOP.COM"; + + public static void securityPrepare() throws IOException + { + //logger.error("进入了---securityPrepare"); + //String filePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator; + //String krbFile = filePath + "krb5.conf"; + //ClassPathResource classPathResource = new ClassPathResource("krb5.conf"); + //String krbFile = classPathResource.getAbsolutePath(); + String krbFile = "/gpsstore/krb5.conf"; +// String userKeyTableFile = filePath + USER_KEYTAB_FILE; + //ClassPathResource classPathResource1 = new ClassPathResource(USER_KEYTAB_FILE); + String userKeyTableFile = "/gpsstore/user.keytab"; + + //windows路径下分隔符替换 + userKeyTableFile = userKeyTableFile.replace("\\", "\\\\"); + krbFile = krbFile.replace("\\", "\\\\"); + + LoginUtil.setKrb5Config(krbFile); + LoginUtil.setZookeeperServerPrincipal("zookeeper/hadoop.hadoop.com"); + //logger.error("userKeyTableFile路径---{}",userKeyTableFile); + LoginUtil.setJaasFile(USER_PRINCIPAL, userKeyTableFile); + } + + public static Boolean isSecurityModel() + { + Boolean isSecurity = false; + //String krbFilePath = System.getProperty("user.dir") + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "kafkaSecurityMode"; + //ClassPathResource classPathResource = new ClassPathResource("kafkaSecurityMode"); + InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("kafkaSecurityMode"); + + /*File file = classPathResource.getFile(); + + if(!file.exists()){ + return isSecurity; + }*/ + + Properties securityProps = new Properties(); + + + try + { + securityProps.load(inputStream); + if ("yes".equalsIgnoreCase(securityProps.getProperty("kafka.client.security.mode"))) + { + isSecurity = true; + } + } + catch (Exception e) + { + logger.info("The Exception occured : {}.", e); + } + + return isSecurity; + } + + /* + * 判断文件是否存在 + */ + private static boolean isFileExists(String fileName) + { + File file = new File(fileName); + + return file.exists(); + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java new file mode 100644 index 00000000..2b5f2aac --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/LoginUtil.java @@ -0,0 +1,177 @@ +package org.dromara.data2es.config; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; + +/** + *

description:

+ * + * @author chenle + * @date 2021-11-01 14:30 + */ +public class LoginUtil { + private static final Log LOG = LogFactory.getLog(LoginUtil.class); + private static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final String ES = "es."; + private static final String JAAS_POSTFIX = ".jaas.conf"; + private static final String IBM_LOGIN_MODULE = "com.ibm.security.auth.module.Krb5LoginModule required"; + private static final String SUN_LOGIN_MODULE = "com.sun.security.auth.module.Krb5LoginModule required"; + private static final String JAVA_SECURITY_LOGIN_CONF_KEY = "java.security.auth.login.config"; + private static final String JAVA_SECURITY_KRB5_CONF_KEY = "java.security.krb5.conf"; + private static final boolean IS_IBM_JDK = System.getProperty("java.vendor").contains("IBM"); + private static final String ZOOKEEPER_AUTH_PRINCIPAL = "zookeeper.server.principal"; + private static boolean WriteFlag = false; + + public LoginUtil() { + } + + static void setKrb5Config(String krb5ConfFile) throws IOException { + System.setProperty("java.security.krb5.conf", krb5ConfFile); + String ret = System.getProperty("java.security.krb5.conf"); + if (ret == null) { + LOG.error("java.security.krb5.conf is null."); + throw new IOException("java.security.krb5.conf is null."); + } else if (!ret.equals(krb5ConfFile)) { + LOG.error("java.security.krb5.conf is " + ret + " is not " + krb5ConfFile + "."); + throw new IOException("java.security.krb5.conf is " + ret + " is not " + krb5ConfFile + "."); + } + } + + + + static synchronized void setJaasFile(String principal, String keytabPath) throws IOException { + //String filePath = keytabPath.substring(0, keytabPath.lastIndexOf(File.separator)); +// String jaasPath = filePath + File.separator + "es." + System.getProperty("user.name") + ".jaas.conf"; +// jaasPath = jaasPath.replace("\\", "\\\\"); + + String jaasPath = + new File(System.getProperty("java.io.tmpdir")) + File.separator + System.getProperty("user.name") + + JAAS_POSTFIX; + + keytabPath = keytabPath.replace("\\", "\\\\"); + LOG.info("jaasPath is {} " + jaasPath); + LOG.info("keytabPath is " + keytabPath); + if ((new File(jaasPath)).exists()) { + if (!WriteFlag) { + deleteJaasFile(jaasPath); + writeJaasFile(jaasPath, principal, keytabPath); + System.setProperty("java.security.auth.login.config", jaasPath); + WriteFlag = true; + } + } else { + writeJaasFile(jaasPath, principal, keytabPath); + System.setProperty("java.security.auth.login.config", jaasPath); + WriteFlag = true; + } + + } + + private static void writeJaasFile(String jaasPath, String principal, String keytabPath) throws IOException { + try { + FileWriter writer = new FileWriter(new File(jaasPath)); + + try { + writer.write(getJaasConfContext(principal, keytabPath)); + writer.flush(); + } catch (Throwable var7) { + try { + writer.close(); + } catch (Throwable var6) { + var7.addSuppressed(var6); + } + + throw var7; + } + + writer.close(); + } catch (IOException var8) { + throw new IOException("Failed to create jaas.conf File"); + } + } + + private static void deleteJaasFile(String jaasPath) throws IOException { + File jaasFile = new File(jaasPath); + if (jaasFile.exists() && !jaasFile.delete()) { + throw new IOException("Failed to delete exists jaas file."); + } + } + + private static String getJaasConfContext(String principal, String keytabPath) { + Module[] allModule = Module.values(); + StringBuilder builder = new StringBuilder(); + Module[] var4 = allModule; + int var5 = allModule.length; + + for(int var6 = 0; var6 < var5; ++var6) { + Module modlue = var4[var6]; + builder.append(getModuleContext(principal, keytabPath, modlue)); + } + + return builder.toString(); + } + + private static String getModuleContext(String userPrincipal, String keyTabPath, Module module) { + StringBuilder builder = new StringBuilder(); + if (IS_IBM_JDK) { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append("com.ibm.security.auth.module.Krb5LoginModule required").append(LINE_SEPARATOR); + builder.append("credsType=both").append(LINE_SEPARATOR); + builder.append("principal=\"").append(userPrincipal).append("\"").append(LINE_SEPARATOR); + builder.append("useKeytab=\"").append(keyTabPath).append("\"").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } else { + builder.append(module.getName()).append(" {").append(LINE_SEPARATOR); + builder.append("com.sun.security.auth.module.Krb5LoginModule required").append(LINE_SEPARATOR); + builder.append("useKeyTab=true").append(LINE_SEPARATOR); + builder.append("keyTab=\"").append(keyTabPath).append("\"").append(LINE_SEPARATOR); + builder.append("principal=\"").append(userPrincipal).append("\"").append(LINE_SEPARATOR); + builder.append("useTicketCache=false").append(LINE_SEPARATOR); + builder.append("storeKey=true").append(LINE_SEPARATOR); + builder.append("debug=true;").append(LINE_SEPARATOR); + builder.append("};").append(LINE_SEPARATOR); + } + + return builder.toString(); + } + + + /** + * 设置zookeeper服务端principal + * + * @param zkServerPrincipal + * @throws IOException + */ + public static void setZookeeperServerPrincipal(String zkServerPrincipal) + throws IOException + { + System.setProperty(ZOOKEEPER_AUTH_PRINCIPAL, zkServerPrincipal); + String ret = System.getProperty(ZOOKEEPER_AUTH_PRINCIPAL); + if (ret == null) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is null."); + } + if (!ret.equals(zkServerPrincipal)) + { + throw new IOException(ZOOKEEPER_AUTH_PRINCIPAL + " is " + ret + " is not " + zkServerPrincipal + "."); + } + } + + public static enum Module { + Elasticsearch("EsClient"); + + private String name; + + private Module(String name) { + this.name = name; + } + + public String getName() { + return this.name; + } + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java new file mode 100644 index 00000000..586af34e --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/config/RedisListenerConfig.java @@ -0,0 +1,24 @@ +package org.dromara.data2es.config; + +import org.dromara.data2es.handler.RedisExpireListener; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.listener.KeyExpirationEventMessageListener; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; + +@Configuration +public class RedisListenerConfig { + + @Bean + RedisMessageListenerContainer listenerContainer(RedisConnectionFactory connectionFactory) { + RedisMessageListenerContainer listenerContainer = new RedisMessageListenerContainer(); + listenerContainer.setConnectionFactory(connectionFactory); + return listenerContainer; + } + + @Bean + KeyExpirationEventMessageListener redisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) { + return new RedisExpireListener(listenerContainer); + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java new file mode 100644 index 00000000..e0f666a2 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DataToEsController.java @@ -0,0 +1,107 @@ +package org.dromara.data2es.controller; + +import org.apache.commons.lang.StringUtils; +import org.dromara.common.core.domain.R; +import org.dromara.common.web.core.BaseController; +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.lang.reflect.InvocationTargetException; +import java.util.Date; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.LinkedBlockingDeque; + +@RequestMapping("/gps") +@RestController +public class DataToEsController extends BaseController { + + public static LinkedBlockingDeque linkedBlockingDeque = new LinkedBlockingDeque<>(5000); + + @Autowired + private ServletWebServerApplicationContext webServerAppCtxt; + + + @RequestMapping("/saveGpsInfo") + public R saveGpsInfo(@RequestBody EsGpsInfoVO2 esGpsInfo ){ + R apiResponse = new R<>(); + try { + if(StringUtils.isBlank(esGpsInfo.getInfoSource())){ + apiResponse.setCode(500); + apiResponse.setMsg("infoSource为空"); + return apiResponse; + } + boolean offer = linkedBlockingDeque.offer(esGpsInfo); + apiResponse = R.ok(offer); + } catch (Exception e) { + e.printStackTrace(); + R.fail("参数解析失败"); + } + return apiResponse; + } + + + @RequestMapping("/saveGpsInfoBatch") + public R saveGpsInfoBatch(@RequestBody EsGpsInfoVO2 esGpsInfo ){ + R apiResponse = null; + //add() IllegalStateException if this deque is full + //put() 队列满了，等待空间插入 + //offer() 队列满了，返回false + + try { + linkedBlockingDeque.offer(esGpsInfo); + //apiResponse = gpsService.saveDataBatch(esGpsInfo); + } catch (Exception e) { + e.printStackTrace(); + R.fail("参数解析失败"); + } + return apiResponse; + } + + @RequestMapping("/getPort") + public R getPort(){ + int port = webServerAppCtxt.getWebServer().getPort(); + return R.ok(port); + } + + @RequestMapping("/getQueueSize") + public R getQueueSize(){ + int size = linkedBlockingDeque.size(); + return R.ok(size); + } + + +// @Scheduled(cron = "0/10 * * * * ?") + public void produceGps() throws InvocationTargetException, IllegalAccessException, ExecutionException, InterruptedException { + int a = 11000; + int b = 22000; + + + for (long i = 20; i < 100; i++) { + EsGpsInfoVO2 esGpsInfo = new EsGpsInfoVO2(); + + HashMap map = new HashMap<>(); + esGpsInfo.setDeviceCode("34153800001320000101"); + esGpsInfo.setDeviceType("05"); + esGpsInfo.setInfoSource("3401"); + esGpsInfo.setGpsTime(new Date()); + + esGpsInfo.setLat("31.1" + (a + i)); + esGpsInfo.setLng("117.2" + (b + i)); + esGpsInfo.setZzjgdm("340100000000"); + esGpsInfo.setZzjgmc("合肥市公安局"); + esGpsInfo.setCarNum("霍邱看守所01"); + saveGpsInfo(esGpsInfo); + //gpsService.saveData(map); + + } + } + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java new file mode 100644 index 00000000..58ac27b8 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/controller/DeviceInfoController.java @@ -0,0 +1,68 @@ +package org.dromara.data2es.controller; + +import cn.hutool.core.bean.BeanUtil; +import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.R; +import org.dromara.common.web.core.BaseController; +import org.dromara.data2es.exception.MyBusinessException; +import org.dromara.system.api.RemoteDataScopeService; +import org.dromara.system.api.RemoteDeviceService; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.springframework.context.annotation.Bean; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; +import java.util.Objects; + + +@RequestMapping("device") +@RestController +public class DeviceInfoController extends BaseController { + + @DubboReference + private RemoteDeviceService deviceService; + + + + @RequestMapping("saveDeviceV2") + public R saveDeviceV2(@RequestBody Map params){ + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数为空"); + } + Object dataList = params.get("dataList"); + if(Objects.isNull(dataList)){ + return R.fail("参数 [dataList] 为空"); + } + List dataList1 = (List) dataList; + if(!CollectionUtils.isEmpty(dataList1) && dataList1.size() > 100){ + return R.fail("单次数据超过了100条"); + } + List list = BeanUtil.copyToList(dataList1, RemoteDeviceBo.class); + + boolean inserted = deviceService.batchSaveDevice(list); + + if(inserted) { + return R.ok(dataList); + }else{ + return R.fail("插入失败"); + } + } + + @RequestMapping("/getDeviceListV2") + public R getDeviceListV2(@RequestBody RemoteDeviceBo requestBody) { + + if (Objects.isNull(requestBody)) { + throw new MyBusinessException("[requestBody] 不能为空"); + } + if (requestBody.getPageSize() > 100) { + throw new MyBusinessException("[pageSize] 不能大于100"); + } + return deviceService.pageDeviceList(requestBody); + } + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java new file mode 100644 index 00000000..f38a5369 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfo.java @@ -0,0 +1,36 @@ +package org.dromara.data2es.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class EsGpsInfo implements Serializable { + private static final long serialVersionUID = 6429544067398830194L; + + /** + * 设备串号，设备唯一值 + */ + private String deviceCode; + private String deviceType; + private String lat; + private String lng; + //方向 + private String orientation; + //高程 + private String height; + //精度 + private String deltaH; + private String speed; + + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date gpsTime; + //3401 ,3402 地市代码 + private String infoSource; + + private Integer online; + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java new file mode 100644 index 00000000..a9d700b6 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/EsGpsInfoVO2.java @@ -0,0 +1,21 @@ +package org.dromara.data2es.domain; + +import lombok.Data; + +/** + *

description:

+ * + * @author chenle + * @date 2021-10-11 15:14 + */ +@Data +public class EsGpsInfoVO2 extends EsGpsInfo { + private static final long serialVersionUID = -4252583194984423318L; + + private String zzjgdm; + private String zzjgmc; + private String policeNo; + private String policeName; + private String phoneNum; + private String carNum; +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java new file mode 100644 index 00000000..959c0aa9 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/domain/entity/GpsInfoEntity.java @@ -0,0 +1,49 @@ +package org.dromara.data2es.domain.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.data.annotation.Id; + +import java.io.Serializable; +import java.util.Date; + +/** + *

description:

+ * gps定位信息(es表) + * @author chenle + * @date 2021-05-14 9:39 + */ +@Data +//@Document(indexName = "#{esConfig.indexNameByDay()}" ,shards = 3,replicas = 1,createIndex = false) +public class GpsInfoEntity implements Serializable { + + private static final long serialVersionUID = 7233463305371277306L; + @Id + private String id; + + private String deviceCode; + /** + * 设备串号，设备唯一值 + */ + private String deviceType; + + + + private Double[] location; + + //方向 + private String orientation; + //高程 + private String height; + //精度 + private String deltaH; + private String speed; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date gpsTime; + + //地市代码 3401，3402 + private String infoSource; + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java new file mode 100644 index 00000000..716d6600 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/dubbo/RemoteDataToEsServiceImpl.java @@ -0,0 +1,26 @@ +package org.dromara.data2es.dubbo; + +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.data2es.api.RemoteDataToEsService; +import org.dromara.data2es.api.domain.RemoteGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.dromara.data2es.service.IGpsService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteDataToEsServiceImpl implements RemoteDataToEsService { + + private final IGpsService gpsService; + + @Override + public R saveDataBatch(List gpsInfoList) { + return gpsService.saveDataBatch(MapstructUtils.convert(gpsInfoList, EsGpsInfoVO2.class)); + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java new file mode 100644 index 00000000..fc7aa944 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/exception/MyBusinessException.java @@ -0,0 +1,54 @@ +package org.dromara.data2es.exception; + +/** + *

description:

+ * + * @author chenle + * @date 2021-06-07 10:56 + */ +public class MyBusinessException extends RuntimeException { + private static final long serialVersionUID = 1L; + + private String msg; + private int code = 500; + + public MyBusinessException(String msg) { + super(msg); + this.msg = msg; + } + + public MyBusinessException(String msg, Throwable e) { + super(msg, e); + this.msg = msg; + } + + public MyBusinessException(String msg, int code) { + super(msg); + this.msg = msg; + this.code = code; + } + + public MyBusinessException(String msg, int code, Throwable e) { + super(msg, e); + this.msg = msg; + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java new file mode 100644 index 00000000..87a2d5de --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/DataInsertBatchHandler.java @@ -0,0 +1,57 @@ +package org.dromara.data2es.handler; + +import cn.hutool.core.collection.CollectionUtil; +import com.google.common.collect.Queues; +import lombok.extern.slf4j.Slf4j; +import org.dromara.data2es.controller.DataToEsController; +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.dromara.data2es.service.IGpsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.TimeUnit; + +/** + *

description:

+ * 获取blockQueue 然后发送到batch中 + * @author chenle + * @date 2023-04-03 10:29 + */ +@Configuration +@Slf4j +public class DataInsertBatchHandler implements CommandLineRunner { + + @Autowired + IGpsService gpsService; + + @Override + public void run(String... args) throws Exception { + ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor(); + LinkedBlockingDeque linkedBlockingDeque = DataToEsController.linkedBlockingDeque; + singleThreadExecutor.execute(new Runnable() { + @Override + public void run() { + while (true) { + try { + List list = new ArrayList<>(); + Queues.drain(linkedBlockingDeque, list, 200, 5, TimeUnit.SECONDS); + log.info("batch size={}", list.size()); + if(CollectionUtil.isNotEmpty(list)) { + gpsService.saveDataBatch(list); + } + } catch (Exception e) { + log.error("缓存队列批量消费异常：{}", e.getMessage()); + } + } + } + }); + } + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java new file mode 100644 index 00000000..ea228278 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RedisExpireListener.java @@ -0,0 +1,70 @@ +package org.dromara.data2es.handler; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.json.JSONObject; +import org.apache.commons.lang.StringUtils; +import org.dromara.common.core.utils.RedisConstants; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.data2es.controller.DataToEsController; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.connection.Message; +import org.springframework.data.redis.connection.MessageListener; +import org.springframework.data.redis.listener.KeyExpirationEventMessageListener; +import org.springframework.data.redis.listener.RedisMessageListenerContainer; +import org.springframework.stereotype.Component; + +import java.util.Date; +import java.util.Objects; + +/** + *

description:

+ * + * @author chenle + * @date 2021-11-08 16:40 + */ +@Component +public class RedisExpireListener extends KeyExpirationEventMessageListener { + + @Autowired + DataToEsController dataToEsController; + + Logger logger = LoggerFactory.getLogger(RedisExpireListener.class); + + + /** + * Creates new {@link MessageListener} for {@code __keyevent@*__:expired} messages. + * + * @param listenerContainer must not be {@literal null}. + */ + public RedisExpireListener(RedisMessageListenerContainer listenerContainer) { + super(listenerContainer); + } + + @Override + public void onMessage(Message message, byte[] pattern) { + String expireKey = message.toString(); + if(StringUtils.isNotEmpty(expireKey) && + expireKey.startsWith(RedisConstants.ORG_CODE_PRE)){ + String[] split = expireKey.split(":"); + EsGpsInfoVO2 esGpsInfoVO2 = new EsGpsInfoVO2(); + esGpsInfoVO2.setDeviceType(split[2]); + esGpsInfoVO2.setDeviceCode(split[3]); + String zzjgdm = split[1]; + String deviceType = split[2]; + String deviceCode = split[3]; + if(StringUtils.isNotEmpty(zzjgdm)) { + JSONObject object = RedisUtils.getBucket(RedisConstants.ONLINE_USERS + zzjgdm + ":" + + deviceType+":"+deviceCode); + EsGpsInfoVO2 gpsInfo = BeanUtil.toBean(object, EsGpsInfoVO2.class); + gpsInfo.setGpsTime(new Date()); + gpsInfo.setOnline(0); + dataToEsController.saveGpsInfo(gpsInfo); + } + } + logger.info("redis key expired:key={}", expireKey); + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java new file mode 100644 index 00000000..438d8507 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java @@ -0,0 +1,120 @@ +package org.dromara.data2es.handler; + +/* +* 处理数据存入各类中间件 +* es redis kafka +* */ + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONPObject; +import com.alibaba.fastjson2.util.JSONObject1O; +import jodd.util.StringUtil; +import org.apache.commons.lang.StringUtils; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.dromara.data2es.service.IGpsService; +import org.dromara.data2es.util.ConfigConstants; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.bulk.BulkResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.kafka.core.KafkaTemplate; +import org.springframework.scheduling.annotation.Async; + +import java.io.IOException; +import java.util.*; +import java.util.concurrent.CompletableFuture; + +@Configuration +public class RequestHandler { + + @Autowired + private KafkaTemplate kafkaTemplate; + + @Autowired + private RestHighLevelClient restHighLevelClient; + + + private Logger logger = LoggerFactory.getLogger(RequestHandler.class); + + + /*@Async + public CompletableFuture doRequest(EsGpsInfo esGpsInfo){ + EsGpsInfo entity = gpsService.createEntity(esGpsInfo); + + return CompletableFuture.completedFuture(entity); + }*/ + + @Async + public void sendToKafka(EsGpsInfoVO2 esGpsInfoVO2) { + if (!Objects.isNull(esGpsInfoVO2)) { + + String deviceType = esGpsInfoVO2.getDeviceType(); + if(StringUtil.isEmpty(deviceType)){ + deviceType = "99"; + } + String infoSource = esGpsInfoVO2.getInfoSource(); + if(StringUtils.isEmpty(infoSource)){ + infoSource = "other"; + } + /** + * 获取该条记录的基本信息推送给第三方使用 + */ + //EsGpsInfoVO esGpsInfoVO = deviceInfoContext.doGetInfo(esGpsInfo); + //EsGpsInfoVO2 esGpsInfoVO2 = getInfo(esGpsInfo); + + //kafkaProducer.send(esGpsInfo, ConfigConstants.KAFKA_TOPIC_SEND_PRE+"."+ infoSource); + //todo 2023年3月30日 cpu过载暂时隐藏 + + kafkaTemplate.send(ConfigConstants.KAFKA_TOPIC_SEND_PRE+"."+deviceType, JSON.toJSONString(esGpsInfoVO2)); + //kafkaProducer.send(esGpsInfoVO2, ConfigConstants.KAFKA_TOPIC_SEND_PRE+"."+deviceType); + //地市的kafka数据，如接收地市某个设备的数据可以对接此kafka topic + //todo 暂时隐藏 + kafkaTemplate.send(ConfigConstants.KAFKA_TOPIC_SEND_PRE+"."+infoSource+"."+deviceType,JSON.toJSONString(esGpsInfoVO2)); + } + + } + + + + + + /** + * 批量在线用户存入 + * @param map + */ + @Async + public void redisOnlineUserBatch(Map map, long time){ + RedisUtils.batchInsert(map,time); + } + + @Async + public void redisDeleteBatch(List deleteKeys){ + RedisUtils.deleteObject(deleteKeys); + } + + /** + * 批量存入es + * @param bulkRequest + */ + @Async + public void esRealBulkSave(BulkRequest bulkRequest){ + try { + BulkResponse response = restHighLevelClient.bulk(bulkRequest, RequestOptions.DEFAULT); + boolean b = response.hasFailures(); + String bulkErrorMsg = response.buildFailureMessage(); + logger.info("b={}", bulkErrorMsg); + } catch (IOException e) { + e.printStackTrace(); + logger.error("batchInsert error={}",e.getMessage()); + } + } + + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/mapper/TDeviceMapper.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/mapper/TDeviceMapper.java new file mode 100644 index 00000000..e8d379cf --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/mapper/TDeviceMapper.java @@ -0,0 +1,4 @@ +package org.dromara.data2es.mapper; + +public class TDeviceMapper { +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java new file mode 100644 index 00000000..462df090 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/producer/NewProducer.java @@ -0,0 +1,54 @@ +package org.dromara.data2es.producer; + +import com.alibaba.fastjson.JSONObject; +import org.apache.kafka.clients.producer.KafkaProducer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + *

description:

+ * + * @author chenle + * @date 2021-11-01 17:20 + */ +//@Component +public class NewProducer { + + @Autowired + @Resource(name = "myKafkaProducer") + KafkaProducer kafkaProducer; + + private Logger LOG = LoggerFactory.getLogger(NewProducer.class); + + + /** + * 生产者线程执行函数，循环发送消息。 + */ + public void send(Object obj,String topic) { + String obj2String = JSONObject.toJSONString(obj); + + // 构造消息记录 + ProducerRecord record = new ProducerRecord(topic, obj2String); + + kafkaProducer.send(record, (recordMetadata, e) -> { + if (e != null) { + LOG.error("send--The Exception occured.", e); + } + if (recordMetadata != null) + { + LOG.info("sent to partition(" + recordMetadata.partition() + "), " + + "offset(" + recordMetadata.offset()+"),topic="+recordMetadata.topic()); + } + }); + + } + + + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/replace b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/replace new file mode 100644 index 00000000..e69de29b diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java new file mode 100644 index 00000000..bbbaf47a --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/GpsTaskTest.java @@ -0,0 +1,56 @@ +package org.dromara.data2es.schedule; + +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.service.IGpsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.Scheduled; + +import java.lang.reflect.InvocationTargetException; +import java.util.Date; +import java.util.HashMap; +import java.util.concurrent.ExecutionException; + +/** + *

description:

+ * + * @author chenle + * @date 2021-05-14 10:51 + */ +@Configuration +public class GpsTaskTest { + + @Autowired + IGpsService gpsService; + + + @Scheduled(cron = "0/10 * * * * ?") + public void produceGps() throws InvocationTargetException, IllegalAccessException, ExecutionException, InterruptedException { + int a = 10000; + int b = 20000; + + + for (long i = 50; i < 100; i++) { + EsGpsInfo esGpsInfo = new EsGpsInfo(); + + HashMap map = new HashMap<>(); + map.put("id",i+1); + esGpsInfo.setDeviceCode(String.valueOf(i+13)); + map.put("deviceCode",String.valueOf(i+1)); + map.put("infoSource","3400"); + map.put("deviceType","02"); + //esGpsInfo.setCreateTime(new Date()); + map.put("createTime",new Date()); + esGpsInfo.setGpsTime(new Date()); + map.put("gpsTime",new Date()); + map.put("locationDesc","合肥市公安局"); + + esGpsInfo.setLat("31.3" + (a + i)); + map.put("lat","31." + (a + i)); + esGpsInfo.setLng("117.2" + (b + i)); + map.put("lng","117." + (b + i)); + //gpsService.saveData(map); + + } + } +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/RedisOnlineUserSchedule.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/RedisOnlineUserSchedule.java new file mode 100644 index 00000000..48740302 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/schedule/RedisOnlineUserSchedule.java @@ -0,0 +1,13 @@ +package org.dromara.data2es.schedule; + +/** + *

description:

+ * + * @author chenle + * @date 2021-05-18 18:23 + */ + +public class RedisOnlineUserSchedule { + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java new file mode 100644 index 00000000..2b2f326d --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/IGpsService.java @@ -0,0 +1,17 @@ +package org.dromara.data2es.service; + +import org.dromara.common.core.domain.R; +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; + +import java.lang.reflect.InvocationTargetException; +import java.util.List; +import java.util.concurrent.ExecutionException; + +public interface IGpsService { + + EsGpsInfo createEntity(EsGpsInfoVO2 esGpsInfo); + + R saveDataBatch(List esGpsInfoVO2s); + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java new file mode 100644 index 00000000..91ca1efe --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/service/impl/GpsServiceImpl.java @@ -0,0 +1,326 @@ +package org.dromara.data2es.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONUtil; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang.StringUtils; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.RedisConstants; +import org.dromara.data2es.domain.EsGpsInfo; +import org.dromara.data2es.domain.EsGpsInfoVO2; +import org.dromara.data2es.domain.entity.GpsInfoEntity; +import org.dromara.data2es.exception.MyBusinessException; +import org.dromara.data2es.handler.RequestHandler; +import org.dromara.data2es.service.IGpsService; +import org.elasticsearch.action.bulk.BulkRequest; +import org.elasticsearch.action.index.IndexRequest; +import org.elasticsearch.action.index.IndexResponse; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.client.indices.CreateIndexRequest; +import org.elasticsearch.client.indices.CreateIndexResponse; +import org.elasticsearch.client.indices.GetIndexRequest; +import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.xcontent.XContentBuilder; +import org.elasticsearch.common.xcontent.XContentFactory; +import org.elasticsearch.rest.RestStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.*; + + +@RequiredArgsConstructor +@Service +public class GpsServiceImpl implements IGpsService { + + @Autowired + private RestHighLevelClient restHighLevelClient; + + private final RequestHandler requestHandler; + + private Logger logger = LoggerFactory.getLogger(GpsServiceImpl.class); + + @Override + public EsGpsInfo createEntity(EsGpsInfoVO2 esGpsInfo) { + + GpsInfoEntity gpsInfoEntity = new GpsInfoEntity(); + BeanUtil.copyProperties(esGpsInfo,gpsInfoEntity); + double lng ; + double lat ; + try { + lng = Double.parseDouble(esGpsInfo.getLng()); + lat = Double.parseDouble(esGpsInfo.getLat()); + }catch (NumberFormatException e){ + throw new MyBusinessException("经纬度转double异常，经度为："+esGpsInfo.getLng() +"纬度为"+esGpsInfo.getLat()); + } + + gpsInfoEntity.setLocation(new Double[]{lng,lat}); + + //elasticsearchRestTemplate.save(gpsInfoEntity); + String indexName = checkIndexExist(); + if(Objects.isNull(indexName)){ + throw new MyBusinessException("动态创建index失败"); + } + //存入数据 + IndexRequest indexRequest = getIndexRequest(indexName,gpsInfoEntity); +// logger.error("indexRequest:{}",indexRequest.version()); + try { + IndexResponse indexResponse = restHighLevelClient.index(indexRequest,RequestOptions.DEFAULT); + RestStatus status = indexResponse.status(); + if (status == RestStatus.CREATED) { + return esGpsInfo; + }else{ + logger.error("插入数据失败：indexResponse状态码为：{}",indexResponse.status().getStatus()); + } + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + /* + * 批量插入 + * */ + @Override + public R saveDataBatch(List list) { + Map onlineUserDataMap = new HashMap<>(); + Map orgCodeDataMap = new HashMap<>(); + List deleteKeys = new ArrayList<>(); + BulkRequest bulkRequest = new BulkRequest(); + for (EsGpsInfoVO2 info : list) { + + if(StringUtils.isBlank(info.getInfoSource())){ + logger.info("infoSource 为空"); + continue; + } + //设置地市zzjgdm + info = getInfoByInfoSource(info); + //redis + buildRedisMap(info,onlineUserDataMap,orgCodeDataMap,deleteKeys); + + IndexRequest indexRequest = buildEsIndexRequest(info); + bulkRequest.add(indexRequest); + + // 发送到 kafka + requestHandler.sendToKafka(info); + } + + requestHandler.redisOnlineUserBatch(onlineUserDataMap, RedisConstants.REDIS_ONLINE_USER_NEVER_EXPIRE); + requestHandler.redisOnlineUserBatch(orgCodeDataMap, 300); + requestHandler.redisDeleteBatch(deleteKeys); + + requestHandler.esRealBulkSave(bulkRequest); + + return R.ok(); + } + + + /** + * 获取基本信息（主要是组织机构） 不查库 否者对库压力过大 + * @param esGpsInfo + * @return + */ + private EsGpsInfoVO2 getInfoByInfoSource(EsGpsInfo esGpsInfo) { + EsGpsInfoVO2 esGpsInfoVO2 = new EsGpsInfoVO2(); + BeanUtil.copyProperties(esGpsInfo,esGpsInfoVO2); + if(null == esGpsInfoVO2.getZzjgdm() || "".equals(esGpsInfoVO2.getZzjgdm())){ + esGpsInfoVO2.setZzjgdm(esGpsInfo.getInfoSource()+"00000000"); + } + + return esGpsInfoVO2; + } + + private IndexRequest buildEsIndexRequest(EsGpsInfo esGpsInfo) { + IndexRequest request = getIndexRequest(esGpsInfo); + return request; + } + + /** + * 判断当天的索引是否创建完毕，如果索引没创建，就创建它 + * @param + */ + private String checkIndexExist() { + String todayIndexName = "gpsinfo"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); + CreateIndexRequest createIndexRequest ; + if(!existsIndex(todayIndexName)){ + logger.error("进入了exist"); + createIndexRequest = new CreateIndexRequest(todayIndexName); + generateMappingRequest(createIndexRequest); + CreateIndexResponse createIndexResponse= null; + + try { + createIndexResponse = restHighLevelClient.indices().create(createIndexRequest, RequestOptions.DEFAULT); + + logger.error("index创建,index,{},isAck,{}",createIndexResponse.index(), + createIndexResponse.isAcknowledged()); + } catch (IOException e) { + e.printStackTrace(); + } + if(!Objects.isNull(createIndexResponse) && + !createIndexResponse.isAcknowledged()){ + logger.error("创建索引失败error:{}",createIndexResponse.isAcknowledged()); + return null; + } + } + return todayIndexName; + } + + //存入数据到索引 + private IndexRequest getIndexRequest(String indexName, GpsInfoEntity gpsInfoEntity) { + Date gpsTime = gpsInfoEntity.getGpsTime(); + if(!Objects.isNull(gpsTime)){ + DateTime dateTime = DateUtil.offsetHour(gpsTime, 8); + gpsInfoEntity.setGpsTime(dateTime.toJdkDate()); + } + Map map = BeanUtil.beanToMap(gpsInfoEntity); + UUID uuid = UUID.randomUUID(); + gpsInfoEntity.setId(uuid.toString()); + IndexRequest indexRequest = new IndexRequest(indexName,"_doc",uuid.toString()).source(map); + return indexRequest; + } + + /** + * 判断索引是否存在 + * @param index + * @return + * @throws IOException + */ + public boolean existsIndex(String index) { + GetIndexRequest request = new GetIndexRequest(index); + boolean exists = false; + try { + exists = restHighLevelClient.indices().exists(request, RequestOptions.DEFAULT); + } catch (IOException e) { + e.printStackTrace(); + } +// logger.error("exists,{}",exists); + return exists; + } + + /** + * 生成indexRequest,包含当天的index名称和经纬度转换 + * @param esGpsInfo + * @return + */ + public IndexRequest getIndexRequest(EsGpsInfo esGpsInfo){ + GpsInfoEntity gpsInfoEntity = new GpsInfoEntity(); + BeanUtil.copyProperties(esGpsInfo,gpsInfoEntity); + double lng ; + double lat ; + try { + lng = Double.parseDouble(esGpsInfo.getLng()); + lat = Double.parseDouble(esGpsInfo.getLat()); + }catch (NumberFormatException e){ + throw new MyBusinessException("经纬度转double异常，经度为："+esGpsInfo.getLng() +"纬度为"+esGpsInfo.getLat()); + } + + gpsInfoEntity.setLocation(new Double[]{lng,lat}); + + String indexName = checkIndexExist(); + if(Objects.isNull(indexName)){ + throw new MyBusinessException("动态创建index失败"); + } + //存入数据 + IndexRequest indexRequest = getIndexRequest(indexName,gpsInfoEntity); + return indexRequest; + } + + public void buildRedisMap(EsGpsInfoVO2 esGpsInfoVo2, Map onlineUserDataMap, Map orgCodeDataMap, List deleteKeys) { + Date gpsTime = esGpsInfoVo2.getGpsTime(); + String zzjgdm = esGpsInfoVo2.getZzjgdm(); + String deviceCode = esGpsInfoVo2.getDeviceCode(); + String deviceType = esGpsInfoVo2.getDeviceType(); + + if (StringUtils.isEmpty(zzjgdm)) { + logger.error("redis ORG_CODE_PRE 存入失败,zzjgdm 代码为空"); + return; + } + if (!Objects.isNull(gpsTime)) { + + if (DateUtil.between(gpsTime, new Date(), DateUnit.SECOND) <= 3600L) { + + if (null == esGpsInfoVo2.getOnline()){ + esGpsInfoVo2.setOnline(1); + } + String jsonValue = JSONUtil.toJsonStr(esGpsInfoVo2); + + String onlineUsersKey = RedisConstants.ONLINE_USERS + + zzjgdm + ":" + deviceType + + ":" + deviceCode; + onlineUserDataMap.put(onlineUsersKey, jsonValue); + //todo 省厅左侧只需要展示到市级以及区县级数量，所以需要查询出该单位的上级单位进行存储。 + //如：key = "org_code:340800260000:deviceType:deviceCode 安庆交通警察支队 + // 1、计算市局的只需要keys 3401* + //2、计算某个类型的 keys *:deviceType:*，计算某个市局某个类型 keys org_code:3401*:2* + String orgCodeKey = RedisConstants.ORG_CODE_PRE + zzjgdm + ":" + deviceType + + ":" + deviceCode; + + if(esGpsInfoVo2.getOnline() == 1) { + orgCodeDataMap.put(orgCodeKey, jsonValue); + }else{ + deleteKeys.add(orgCodeKey); //离线的删除 + } + + } + } + } + + private void generateMappingRequest(CreateIndexRequest createIndexRequest) { + XContentBuilder builder = null; + try { + builder = XContentFactory.jsonBuilder(); + builder.startObject() + .startObject("properties") + .startObject("id") + .field("type", "text") + .endObject() + .startObject("deviceCode") + .field("type", "text") + .endObject() + .startObject("deviceType") + .field("type", "text") + .endObject() + .startObject("location") + .field("type", "geo_point") + .endObject() + .startObject("orientation") + .field("type", "text") + .endObject() + .startObject("height") + .field("type", "text") + .endObject() + .startObject("deltaH") + .field("type", "text") + .endObject() + .startObject("speed") + .field("type", "text") + .endObject() + .startObject("gpsTime") + .field("type", "date") +// .field("format","yyyy-MM-dd HH:mm:ss") + .endObject() + .endObject() + .endObject(); + createIndexRequest.mapping(builder); + //settings + createIndexRequest.settings(Settings.builder().put("index.number_of_shards", 3) + .put("index.number_of_replicas", 1)); + + logger.error("generateMappingRequest-index创建成功"); + } catch (IOException e) { + e.printStackTrace(); + logger.error("generateMappingRequest-index创建失败"); + } + } + + +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java new file mode 100644 index 00000000..867ad32a --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/java/org/dromara/data2es/util/ConfigConstants.java @@ -0,0 +1,7 @@ +package org.dromara.data2es.util; + +public class ConfigConstants { + public static final String HTTP_HEADER_AUTH_TOKEN = "Auth-Token"; + + public static final String KAFKA_TOPIC_SEND_PRE = "topic.send"; +} diff --git a/stwzhj-modules/stwzhj-data2es/src/main/resources/application.yml b/stwzhj-modules/stwzhj-data2es/src/main/resources/application.yml new file mode 100644 index 00000000..ea12e957 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/resources/application.yml @@ -0,0 +1,34 @@ +# Tomcat +server: + port: 9212 + +# Spring +spring: + application: + # 应用名称 + name: stwzhj-data2es + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + username: @nacos.username@ + password: @nacos.password@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/stwzhj-modules/stwzhj-data2es/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-data2es/src/main/resources/banner.txt new file mode 100644 index 00000000..fbd45f53 --- /dev/null +++ b/stwzhj-modules/stwzhj-data2es/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-data2es/src/main/resources/logback-plus.xml diff --git a/ruoyi-modules/ruoyi-gen/Dockerfile b/stwzhj-modules/stwzhj-gen/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-gen/Dockerfile rename to stwzhj-modules/stwzhj-gen/Dockerfile diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/stwzhj-modules/stwzhj-gen/pom.xml similarity index 78% rename from ruoyi-modules/ruoyi-gen/pom.xml rename to stwzhj-modules/stwzhj-gen/pom.xml index 997aaa99..c84a566d 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/stwzhj-modules/stwzhj-gen/pom.xml @@ -4,22 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + stwzhj-modules ${revision} 4.0.0 - ruoyi-gen + stwzhj-gen - ruoyi-gen代码生成 + stwzhj-gen代码生成 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos @@ -31,37 +31,37 @@ org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-security + stwzhj-common-security @@ -83,11 +83,11 @@ - - - - - + + org.anyline + anyline-data-jdbc-postgresql + ${anyline.version} + diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/RuoYiGenApplication.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/RuoYiGenApplication.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/RuoYiGenApplication.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/RuoYiGenApplication.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/config/GenConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/GenConfig.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/config/GenConfig.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/config/MyBatisDataSourceMonitor.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/constant/GenConstants.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/constant/GenConstants.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/constant/GenConstants.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/controller/GenController.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/controller/GenController.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/domain/GenTable.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTable.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/domain/GenTable.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/domain/GenTableColumn.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/mapper/GenTableColumnMapper.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/mapper/GenTableMapper.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/service/GenTableServiceImpl.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/service/IGenTableService.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/service/IGenTableService.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/service/IGenTableService.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/GenUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/GenUtils.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/GenUtils.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityInitializer.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/VelocityInitializer.java similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityInitializer.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/VelocityInitializer.java diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java similarity index 86% rename from ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java rename to stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java index 61cd55e9..99d3c584 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java +++ b/stwzhj-modules/stwzhj-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java @@ -122,6 +122,8 @@ public class VelocityUtils { templates.add("vm/sql/oracle/sql.vm"); } else if (DataBaseHelper.isPostgerSql()) { templates.add("vm/sql/postgres/sql.vm"); + } else if (DataBaseHelper.isSqlServer()) { + templates.add("vm/sql/sqlserver/sql.vm"); } else { templates.add("vm/sql/sql.vm"); } @@ -132,6 +134,20 @@ public class VelocityUtils { } else if (GenConstants.TPL_TREE.equals(tplCategory)) { templates.add("vm/vue/index-tree.vue.vm"); } + /** + * 添加vben + */ + templates.add("vm/vben/api/index.ts.vm"); + templates.add("vm/vben/api/model.ts.vm"); + templates.add("vm/vben/views/data.ts.vm"); + if (GenConstants.TPL_CRUD.equals(tplCategory)) { + templates.add("vm/vben/views/index_vben.vue.vm"); + templates.add("vm/vben/views/modal.vue.vm"); + } else if (GenConstants.TPL_TREE.equals(tplCategory)) { + templates.add("vm/vben/views/index_vben_tree.vue.vm"); + templates.add("vm/vben/views/modal_tree.vue.vm"); + } + return templates; } @@ -184,6 +200,34 @@ public class VelocityUtils { } else if (template.contains("index-tree.vue.vm")) { fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); } + + String vbenPath = "vben"; + String BusinessName = StringUtils.capitalize(genTable.getBusinessName()); + /** + * 添加vben + */ + if (template.contains("index.ts.vm")) { + fileName = StringUtils.format("{}/api/{}/{}/index.ts", vbenPath, moduleName, businessName); + } + if (template.contains("model.ts.vm")) { + fileName = StringUtils.format("{}/api/{}/{}/model.ts", vbenPath, moduleName, businessName); + } + if (template.contains("index_vben.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vbenPath, moduleName, businessName); + } + if (template.contains("index_vben_tree.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/index.vue", vbenPath, moduleName, businessName); + } + if (template.contains("data.ts.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/{}.data.ts", vbenPath, moduleName, businessName, businessName); + } + if (template.contains("modal.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/{}Modal.vue", vbenPath, moduleName, businessName, BusinessName); + } + if (template.contains("modal_tree.vue.vm")) { + fileName = StringUtils.format("{}/views/{}/{}/{}Modal.vue", vbenPath, moduleName, businessName, BusinessName); + } + return fileName; } @@ -213,9 +257,6 @@ public class VelocityUtils { importList.add("com.fasterxml.jackson.annotation.JsonFormat"); } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) { importList.add("java.math.BigDecimal"); - } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) { - importList.add("org.dromara.common.translation.annotation.Translation"); - importList.add("org.dromara.common.translation.constant.TransConstant"); } } return importList; diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/application.yml b/stwzhj-modules/stwzhj-gen/src/main/resources/application.yml similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/application.yml rename to stwzhj-modules/stwzhj-gen/src/main/resources/application.yml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-gen/src/main/resources/banner.txt similarity index 88% rename from ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt rename to stwzhj-modules/stwzhj-gen/src/main/resources/banner.txt index a66e8b82..05f528cc 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/banner.txt +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/banner.txt @@ -1,10 +1,10 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ - (_) - _ __ _ _ ___ _ _ _ ______ __ _ ___ _ __ -| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \ -| | | |_| || (_) || |_| || | | (_| || __/| | | | -|_| \__,_| \___/ \__, ||_| \__, | \___||_| |_| - __/ | __/ | +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ + (_) + _ __ _ _ ___ _ _ _ ______ __ _ ___ _ __ +| '__|| | | | / _ \ | | | || ||______| / _` | / _ \| '_ \ +| | | |_| || (_) || |_| || | | (_| || __/| | | | +|_| \__,_| \___/ \__, ||_| \__, | \___||_| |_| + __/ | __/ | |___/ |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-gen/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-gen/src/main/resources/logback-plus.xml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/stwzhj-modules/stwzhj-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to stwzhj-modules/stwzhj-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/stwzhj-modules/stwzhj-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to stwzhj-modules/stwzhj-gen/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/package-info.md b/stwzhj-modules/stwzhj-gen/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/mapper/package-info.md rename to stwzhj-modules/stwzhj-gen/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/bo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/bo.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/bo.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/domain.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/mapper.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/service.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/vo.java.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/vo.java.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/java/vo.java.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/oracle/sql.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/oracle/sql.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/postgres/sql.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/postgres/sql.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/postgres/sql.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/sql/sql.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/ts/api.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/ts/api.ts.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/ts/types.ts.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/types.ts.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/ts/types.ts.vm diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/index.ts.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/index.ts.vm new file mode 100644 index 00000000..b7c7c163 --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/index.ts.vm @@ -0,0 +1,59 @@ +import { defHttp } from '@/utils/http/axios'; +import { ID, IDS, commonExport } from '@/api/base'; +import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from './model'; + +/** + * 查询${functionName}列表 + * @param params + * @returns + */ +export function ${businessName}List(params?: ${BusinessName}Query) { + return defHttp.get<${BusinessName}VO[]>({ url: '/${moduleName}/${businessName}/list', params }); +} + +#if($tplCategory != 'tree') +/** + * 导出${functionName}列表 + * @param params + * @returns + */ +export function ${businessName}Export(params?: ${BusinessName}Query) { + return commonExport('/${moduleName}/${businessName}/export', params ?? {}); +} +#end + +/** + * 查询${functionName}详细 + * @param ${pkColumn.javaField} id + * @returns + */ +export function ${businessName}Info(${pkColumn.javaField}: ID) { + return defHttp.get<${BusinessName}VO>({ url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField} }); +} + +/** + * 新增${functionName} + * @param data + * @returns + */ +export function ${businessName}Add(data: ${BusinessName}Form) { + return defHttp.postWithMsg({ url: '/${moduleName}/${businessName}', data }); +} + +/** + * 更新${functionName} + * @param data + * @returns + */ +export function ${businessName}Update(data: ${BusinessName}Form) { + return defHttp.putWithMsg({ url: '/${moduleName}/${businessName}', data }); +} + +/** + * 删除${functionName} + * @param ${pkColumn.javaField} id + * @returns + */ +export function ${businessName}Remove(${pkColumn.javaField}: ID | IDS) { + return defHttp.deleteWithMsg({ url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField} }); +} diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/model.ts.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/model.ts.vm new file mode 100644 index 00000000..5d18b5d7 --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/api/model.ts.vm @@ -0,0 +1,56 @@ +import { BaseEntity, PageQuery } from '@/api/base'; + +export interface ${BusinessName}VO { +#foreach ($column in $columns) +#if($column.list) + /** + * $column.columnComment + */ + $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#end +#end +#if ($table.tree) + /** + * 子对象 + */ + children: ${BusinessName}VO[]; +#end +} + +export interface ${BusinessName}Form extends BaseEntity { +#foreach ($column in $columns) +#if($column.insert || $column.edit) + /** + * $column.columnComment + */ + $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#end +#end +} + +export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{ +#foreach ($column in $columns) +#if($column.query) + /** + * $column.columnComment + */ + $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf("Id") != -1) string | number; + #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType == 'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number; + #elseif($column.javaType == 'Boolean') boolean; + #else string; + #end +#end +#end + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/data.ts.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/data.ts.vm new file mode 100644 index 00000000..129ab5d7 --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/data.ts.vm @@ -0,0 +1,176 @@ +import { BasicColumn } from '@/components/Table'; +import { FormSchema } from '@/components/Form'; +#if(${dicts} != '') +import { getDictOptions } from '@/utils/dict'; +import { useRender } from '@/hooks/component/useRender'; +#end + +export const formSchemas: FormSchema[] = [ + #foreach($column in $columns) + #if($column.query) + #if($column.dictType) + #set($dictType=$column.dictType) + #else + #set($dictType="") + #end + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.htmlType == "input") + #set($component="Input") + #elseif($column.htmlType == "textarea") + #set($component="InputTextArea") + #elseif($column.htmlType == "select") + #set($component="Select") + #elseif($column.htmlType == "radio") + #set($component="RadioButtonGroup") + #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") + #set($component="DatePicker") + #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") + #set($component="RangePicker") + #else + #set($component="Input") + #end + { + label: '${comment}', + field: '${column.javaField}', + component: '${component}', + #if($dictType != "") + componentProps: { + options: getDictOptions('$dictType') + }, + #elseif($component == "DatePicker" || $component == "RangePicker") + componentProps: { + showTime: true, + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + }, + #end + }, + #end + #end +]; + +#if(${dicts} != '') +const { renderDict } = useRender(); +#end +export const columns: BasicColumn[] = [ + #foreach($column in $columns) + #if($column.list) + #if($column.dictType) + #set($dictType=$column.dictType) + #else + #set($dictType="") + #end + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + { + title: '${comment}', + dataIndex: '${column.javaField}', + #if($dictType != "") + customRender: ({ value }) => renderDict(value, '$dictType'), + #end + }, + #end + #end +]; + +export const modalSchemas: FormSchema[] = [ + #foreach($column in $columns) + #if($column.edit) + #if($column.dictType) + #set($dictType=$column.dictType) + #else + #set($dictType="") + #end + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #if($column.htmlType == "input") + #set($component="Input") + #elseif($column.htmlType == "textarea") + #set($component="InputTextArea") + #elseif($column.htmlType == "select") + #set($component="Select") + #elseif($column.htmlType == "radio") + #set($component="RadioButtonGroup") + #elseif($column.htmlType == "imageUpload") + #set($component="ImageUpload") + #elseif($column.htmlType == "fileUpload") + #set($component="Upload") + #elseif($column.htmlType == "editor") + #set($component="RichTextarea") + #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN") + #set($component="DatePicker") + #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") + #set($component="RangePicker") + #else + #set($component="Input") + #end + #if($column.required && $column.pk == false) + #set($required='true') + #else + #set($required='false') + #end + { + label: '${comment}', + field: '${column.javaField}', + required: ${required}, + #if("" != $treeParentCode && $column.javaField == $treeParentCode) + component: 'TreeSelect', + #else + component: '${component}', + #end + #if($dictType != "") + componentProps: { + options: getDictOptions('$dictType') + }, + #elseif($component == "DatePicker" || $component == "RangePicker") + componentProps: { + showTime: true, + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + }, + #elseif($component == "ImageUpload") + /** + * 注意这里获取为数组 需要自行定义回显/提交 + */ + componentProps: { + // accept: ['jpg'], // 不支持type/*的写法 建议使用拓展名 + // maxNumber: 1, // 最大上传文件数 + // resultField: 'url', // 上传成功后返回的字段名 默认url 可选['ossId', 'url', 'fileName'] + }, + #elseif($component == "Upload") + /** + * 注意这里获取为数组 需要自行定义回显/提交 + */ + componentProps: { + // accept: ['xlsx'], // 不支持type/*的写法 建议使用拓展名 + // maxNumber: 1, // 最大上传文件数 + // resultField: 'url', // 上传成功后返回的字段名 默认url 可选['ossId', 'url', 'fileName'] + }, + #elseif($component == "RichTextarea") + /** + * 注意 好像没啥可写的 + */ + componentProps: { + // 没啥可写的 + }, + #end + #if(${column.pk}) + show: false, + #end + }, + #end + #end +]; diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben.vue.vm new file mode 100644 index 00000000..d1e59dc3 --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben.vue.vm @@ -0,0 +1,122 @@ + + + + + diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben_tree.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben_tree.vue.vm new file mode 100644 index 00000000..7455e01a --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/index_vben_tree.vue.vm @@ -0,0 +1,111 @@ + + + + + diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal.vue.vm new file mode 100644 index 00000000..dc8958c7 --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal.vue.vm @@ -0,0 +1,69 @@ + + + + + diff --git a/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal_tree.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal_tree.vue.vm new file mode 100644 index 00000000..999a013b --- /dev/null +++ b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vben/views/modal_tree.vue.vm @@ -0,0 +1,87 @@ + + + + + diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm b/stwzhj-modules/stwzhj-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-modules/ruoyi-gen/src/main/resources/vm/xml/mapper.xml.vm rename to stwzhj-modules/stwzhj-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-modules/ruoyi-job/Dockerfile b/stwzhj-modules/stwzhj-job/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-job/Dockerfile rename to stwzhj-modules/stwzhj-job/Dockerfile diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/stwzhj-modules/stwzhj-job/pom.xml similarity index 74% rename from ruoyi-modules/ruoyi-job/pom.xml rename to stwzhj-modules/stwzhj-job/pom.xml index 5de4ab6a..6959e578 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/stwzhj-modules/stwzhj-job/pom.xml @@ -4,75 +4,75 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + stwzhj-modules ${revision} 4.0.0 - ruoyi-job + stwzhj-job - ruoyi-job 任务调度模块 + stwzhj-job 任务调度模块 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-dict + stwzhj-common-dict org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-job + stwzhj-common-job org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-api-system + stwzhj-api-system diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/RuoYiJobApplication.java b/stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/RuoYiJobApplication.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/RuoYiJobApplication.java rename to stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/RuoYiJobApplication.java diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java rename to stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java rename to stwzhj-modules/stwzhj-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/application.yml b/stwzhj-modules/stwzhj-job/src/main/resources/application.yml similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/resources/application.yml rename to stwzhj-modules/stwzhj-job/src/main/resources/application.yml diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-job/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/resources/banner.txt rename to stwzhj-modules/stwzhj-job/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-job/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-modules/ruoyi-job/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-job/src/main/resources/logback-plus.xml diff --git a/stwzhj-modules/stwzhj-location/pom.xml b/stwzhj-modules/stwzhj-location/pom.xml new file mode 100644 index 00000000..17f45728 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/pom.xml @@ -0,0 +1,165 @@ + + + + org.dromara + stwzhj-modules + ${revision} + + 4.0.0 + + stwzhj-location + + + stwzhj-location位置汇聚坐标点位历史轨迹 + + + + + + org.dromara + stwzhj-common-nacos + + + + org.dromara + stwzhj-common-sentinel + + + + + org.dromara + stwzhj-common-log + + + + org.dromara + stwzhj-common-dict + + + + org.dromara + stwzhj-common-doc + + + + org.dromara + stwzhj-common-web + + + + org.dromara + stwzhj-common-mybatis + + + + org.dromara + stwzhj-common-dubbo + + + + org.dromara + stwzhj-common-seata + + + + org.dromara + stwzhj-common-idempotent + + + + org.dromara + stwzhj-common-tenant + + + + org.dromara + stwzhj-common-security + + + + org.dromara + stwzhj-common-translation + + + + org.dromara + stwzhj-common-sensitive + + + + org.dromara + stwzhj-common-encrypt + + + + + org.dromara + stwzhj-api-system + + + + org.dromara + stwzhj-api-resource + + + + org.elasticsearch + elasticsearch + 7.14.0 + + + log4j-api + org.apache.logging.log4j + + + + + org.elasticsearch.client + elasticsearch-rest-client + 7.14.0 + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + 7.14.0 + + + org.elasticsearch + elasticsearch + + + elasticsearch-rest-client + org.elasticsearch.client + + + + + + + org.springframework.kafka + spring-kafka + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java new file mode 100644 index 00000000..d77f8d29 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/LocationApplication.java @@ -0,0 +1,22 @@ +package org.dromara.location; + + +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableDubbo +@EnableScheduling +@SpringBootApplication +public class LocationApplication { + + public static void main(String[] args) { + SpringApplication application = new SpringApplication(LocationApplication.class); + application.setApplicationStartup(new BufferingApplicationStartup(2048)); + application.run(args); + System.out.println("(♥◠‿◠)ﾉﾞ Location启动成功 ლ(´ڡ`ლ)ﾞ "); + } + +} diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java new file mode 100644 index 00000000..5012741c --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/config/ElasticsearchConfig.java @@ -0,0 +1,90 @@ +package org.dromara.location.config; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.HttpHost; +import org.apache.http.client.CredentialsProvider; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.elasticsearch.client.RestClient; +import org.elasticsearch.client.RestClientBuilder; +import org.elasticsearch.client.RestHighLevelClient; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.ArrayList; +import java.util.List; + +/** + * restHighLevelClient 客户端配置类 + */ +@Slf4j +@Data +@Configuration +@ConfigurationProperties(prefix = "elasticsearch") +public class ElasticsearchConfig { + + // es host ip 地址（集群） + private String hosts; + // es 用户名 + private String userName; + // es 密码 + private String password; + // es 请求方式 + private String scheme; + // es 集群名称 + private String clusterName; + // es 连接超时时间 + private int connectTimeOut; + // es socket 连接超时时间 + private int socketTimeOut; + // es 请求超时时间 + private int connectionRequestTimeOut; + // es 最大连接数 + private int maxConnectNum; + // es 每个路由的最大连接数 + private int maxConnectNumPerRoute; + + /** + * 如果@Bean没有指定bean的名称，那么这个bean的名称就是方法名 + */ + @Bean(name = "restHighLevelClient") + public RestHighLevelClient restHighLevelClient() { + RestHighLevelClient restHighLevelClient = null; + try { + // 集群，拆分地址 + List hostLists = new ArrayList<>(); + String[] hostList = hosts.split(","); + for (String addr : hostList) { + String host = addr.split(":")[0]; + String port = addr.split(":")[1]; + hostLists.add(new HttpHost(host, Integer.parseInt(port), scheme)); + } + // 转换成 HttpHost 数组 + HttpHost[] httpHost = hostLists.toArray(new HttpHost[]{}); + // 构建连接对象 + RestClientBuilder builder = RestClient.builder(httpHost); + // 设置用户名、密码 + CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); +// credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(userName, password)); + // 连接延时配置 + builder.setRequestConfigCallback(requestConfigBuilder -> { + requestConfigBuilder.setConnectTimeout(connectTimeOut); + requestConfigBuilder.setSocketTimeout(socketTimeOut); + requestConfigBuilder.setConnectionRequestTimeout(connectionRequestTimeOut); + return requestConfigBuilder; + }); + // 连接数配置 + builder.setHttpClientConfigCallback(httpClientBuilder -> { + httpClientBuilder.setMaxConnTotal(maxConnectNum); + httpClientBuilder.setMaxConnPerRoute(maxConnectNumPerRoute); + httpClientBuilder.setDefaultCredentialsProvider(credentialsProvider); + return httpClientBuilder; + }); + restHighLevelClient = new RestHighLevelClient(builder); + } catch (NumberFormatException e) { + log.error("ES 连接池初始化异常"); + } + return restHighLevelClient; + } +} diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java new file mode 100644 index 00000000..1fe047e1 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/ElasticSearchController.java @@ -0,0 +1,42 @@ +package org.dromara.location.controller; + + +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.web.core.BaseController; +import org.dromara.location.service.ISearchService; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/history") +public class ElasticSearchController extends BaseController { + + private final ISearchService searchService; + + @RequestMapping("/searchCar") + public R searchByType(@RequestBody Map params){ + //String startTime,String endTime,String deviceId + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数不能为空"); + } + String deviceCode = params.get("deviceCode").toString(); + String startTime = params.get("startTime").toString(); + String endTime = params.get("endTime").toString(); + String deviceType = params.get("deviceType").toString(); + List gpsInfoEntities = null; + try { + gpsInfoEntities = searchService.searchCar(deviceCode, startTime, endTime,deviceType); + }catch (RuntimeException e){ + return R.fail(500,e.getMessage()); + } + return R.ok(gpsInfoEntities); + } + +} diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java new file mode 100644 index 00000000..ff53efa7 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/controller/LocationController.java @@ -0,0 +1,221 @@ +package org.dromara.location.controller; + +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; +import cn.hutool.json.JSONObject; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.R; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.system.api.RemoteDeviceService; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.dromara.system.api.domain.vo.RemoteDeviceVo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import redis.clients.jedis.resps.GeoRadiusResponse; + +import javax.annotation.Resource; +import java.util.*; + +@Configuration +@RestController +public class LocationController { + + + @DubboReference + private RemoteDeviceService deviceService; + + Logger logger = LoggerFactory.getLogger(LocationController.class); + + + /* + * 根据条件获取设备坐标信息集合 + * */ + @PostMapping("/getAllLocation") + public R getAllLocaltion(@RequestBody Map params){ + String now = DateUtil.format(new Date(),"YYYY-MM-dd"); + String keys = "online_users:"; + String key = null; // 在不同条件下赋值 最后根据此key取值 + if(CollectionUtils.isEmpty(params)){ + key = keys +"*"; + } + List list = new ArrayList<>(); + if (null != params.get("type")){ + String type = params.get("type").toString(); + key = keys + "*:[" +type+"]:*"; + if (null != params.get("deptId")){ + key = keys + params.get("deptId").toString() + "*:["+type+"]:*"; // key值为 online_users:2022-04-20:3401*:[01,02]:* + } + + } + list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + return R.ok(list); + } + + @PostMapping("/getLocation") + public R getLocaltion(@RequestBody Map params){ + String keys = "online_users:"; + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数不能为空"); + } + String zzjgdms = ""; + List dlist = new ArrayList<>(); + if (null != params.get("type")){ //类型不为空时 查询Redis数据 + String type = params.get("type").toString(); +// String[] types = Convert.toStrArray(type); + zzjgdms = params.get("zzjgdm").toString(); + String[] zzjgdm = Convert.toStrArray(zzjgdms); + for (String s : zzjgdm) { + s = deptIdSub(s); + String key = keys + s + ":["+type+"]:*"; // key值为 online_users:3401xxxx:[01,02]:* + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + dlist.addAll(list); + } + }else { + zzjgdms = params.get("zzjgdm").toString(); + String[] zzjgdm = Convert.toStrArray(zzjgdms); + for (String s : zzjgdm) { + s = deptIdSub(s); + String key = keys + s + ":*"; + List list = RedisUtils.searchAndGetKeysValues(key); + list.removeAll(Collections.singleton(null)); + dlist.addAll(list); + } + } + JSONArray.toJSONString(dlist); + return R.ok(dlist); + } + + /* + * 根据设备ID 获取设备信息 + * */ + @PostMapping("/getLocationByDeviceId") + public R getLocationByDeviceId(@RequestBody Map params){ + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数不能为空"); + } + String keys = "online_users:"; + String key = ""; + if (null != params.get("deviceType")){ + key = keys + params.get("type").toString()+":*"; + } + if (null != params.get("deviceCode")){ + key = keys +"*:"+params.get("deviceCode").toString(); + } + if (null != params.get("deviceCode") && null != params.get("deviceType")){ + key = keys + ":*:" + params.get("deviceType").toString()+":" + params.get("deviceCode").toString(); + } + List list = new ArrayList<>(); + List maps = RedisUtils.searchAndGetKeysValues(key); + if (maps.size()>0){ + return R.ok(maps.get(0)); + } + return R.ok(null); + } + + + /* + * 根据坐标和距离返回范围内设备 + * */ + @PostMapping("/getLocationByPoint") + public R getLocationByPoint(@RequestBody Map params){ + String keys = "online_users:"; + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数不能为空"); + } + String lat = params.get("lat").toString(); + String lng = params.get("lng").toString(); + String dist = params.get("distance").toString(); + /* List geoRadiusResponses = redisUtil.nearByXYReadonly(RedisConstants.ONLINE_USERS_GEO, + Double.parseDouble(lng), Double.parseDouble(lat), Double.parseDouble(dist)); + List list = new ArrayList<>(); + for (GeoRadiusResponse geoRadiusRespons : geoRadiusResponses) { + String memberByString = geoRadiusRespons.getMemberByString(); + logger.info("member:"+memberByString); + String[] strs = memberByString.split("#"); + logger.info("key值:"+keys+":"+strs[0]+":"+strs[1]+":"+strs[2]); + Object object = redisUtil.get(keys+":"+strs[0]+":"+strs[1]+":"+strs[2]); + if (null != object){ + Device device = FastJSONUtil.parsePojo(object.toString(), Device.class); + //device = rebuildDevice(device); + list.add(device); + } + }*/ + + return R.ok(); + } + + /*+ + * 根据机构、类型和模糊条件匹配设备 + * */ + @PostMapping("/getObjByCondition") + public R getObjByCondition(@RequestBody Map params){ + if(CollectionUtils.isEmpty(params)){ + return R.fail("参数不能为空"); + } + String zzjgdms = ""; + String name = ""; + if (null != params.get("deviceName")){ + name = params.get("deviceName").toString(); + } + if (null != params.get("zzjgdm")){ + zzjgdms = params.get("zzjgdm").toString(); + } + if (null != params.get("type")){ + String type = params.get("type").toString(); + RemoteDeviceBo device = new RemoteDeviceBo(); + device.setValid(1); + device.setDeviceType(type); + device.setPoliceName(name); + /*if("01".equals(type) || "02".equals(type) || "06".equals(type) ||"07".equals(type) ||"08".equals(type) || "09".equals(type)){ + device.setCarNum(name); + }else{ + device.setPoliceNo(name); + }*/ + List devices = new ArrayList<>(); + if (!"".equals(zzjgdms)){ //前端选择机构时 + String[] zzjgdm = zzjgdms.split(","); + for (String s : zzjgdm) { + device.setZzjgdm(s); + List tDeviceList = deviceService.deviceList(device); + devices.addAll(tDeviceList); + } + } + if ("".equals(zzjgdms)){ //前端查询全部时 + List tDeviceList = deviceService.deviceList(device); + devices.addAll(tDeviceList); + } + return R.ok(devices); + } + + return R.ok(); + + } + + + public String deptIdSub(String zzjgdm){ + if (zzjgdm.endsWith("0000000000")){ // 省厅 即全部 + zzjgdm = zzjgdm.substring(0,2)+"*"; + }else if(zzjgdm.endsWith("00000000")){ //地市 + zzjgdm = zzjgdm.substring(0,4)+"*"; + + }else if(zzjgdm.endsWith("000000")){ // 分局 + zzjgdm = zzjgdm.substring(0,6)+"*"; + }else{ // 支队 + zzjgdm = zzjgdm.substring(0,8)+"*"; + } + return zzjgdm; + } + + + +} diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/package-info.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/package-info.java new file mode 100644 index 00000000..abbfa76b --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/package-info.java @@ -0,0 +1 @@ +package org.dromara.location; diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java new file mode 100644 index 00000000..55915b5d --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/ISearchService.java @@ -0,0 +1,11 @@ +package org.dromara.location.service; + +import java.util.List; +import java.util.Map; + + +public interface ISearchService { + public List searchCar(String deviceCode, String startTime, String endTime,String deviceType) ; + + +} diff --git a/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java new file mode 100644 index 00000000..972be5fb --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/java/org/dromara/location/service/impl/SearchServiceImpl.java @@ -0,0 +1,151 @@ +package org.dromara.location.service.impl; + +import cn.hutool.core.date.DateField; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; +import lombok.RequiredArgsConstructor; +import org.dromara.location.service.ISearchService; +import org.elasticsearch.action.search.*; +import org.elasticsearch.client.RequestOptions; +import org.elasticsearch.client.RestHighLevelClient; +import org.elasticsearch.core.TimeValue; +import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.QueryBuilders; +import org.elasticsearch.index.query.TermQueryBuilder; +import org.elasticsearch.search.Scroll; +import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.builder.SearchSourceBuilder; +import org.elasticsearch.search.sort.SortOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.Consumer; + + +@RequiredArgsConstructor +@Service +public class SearchServiceImpl implements ISearchService { + + @Autowired + private RestHighLevelClient restHighLevelClient; + + + @Override + public List searchCar(String deviceCode, String startTime, String endTime,String deviceType) throws RuntimeException{ + List sourceList = new ArrayList(); + List esIndexByTime = findEsIndexByTime(startTime, endTime); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + DateTime startDate = DateUtil.parse(startTime, "yyyy-MM-dd HH:mm:ss"); + DateTime endDate = DateUtil.parse(endTime, "yyyy-MM-dd HH:mm:ss"); + + BoolQueryBuilder boolBuilder = QueryBuilders.boolQuery(); + // 匹配第一个 + TermQueryBuilder termTerminalBuilder1 = QueryBuilders.termQuery("deviceCode", deviceCode); + // 匹配第二个 + TermQueryBuilder termTerminalBuilder2 = QueryBuilders.termQuery("deviceType", deviceType); + + boolBuilder.must(termTerminalBuilder1); + + boolBuilder.must(termTerminalBuilder2); + System.out.print(format.format(startDate)); + boolBuilder.must(QueryBuilders.rangeQuery("gpsTime") + .gte(format.format(startDate)) + .lte(format.format(endDate)) ); + + Scroll scroll = new Scroll(TimeValue.timeValueMinutes(1L)); + SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); + sourceBuilder.query(boolBuilder).sort("gpsTime",SortOrder.ASC).size(5000); + SearchRequest rq = new SearchRequest(); + rq.scroll(scroll); + rq.source(sourceBuilder); + rq.indices(esIndexByTime.toArray(new String[0])); +// SearchResponse rp = null; + try { + SearchResponse rp = restHighLevelClient.search(rq,RequestOptions.DEFAULT); + SearchHit[] searchHits = rp.getHits().getHits(); + for (SearchHit searchHit : searchHits) { + Map sourceAsMap = searchHit.getSourceAsMap(); + sourceList.add(sourceAsMap); + } + + //遍历搜索命中的数据，直到没有数据 + String scrollId = rp.getScrollId(); + while (searchHits != null && searchHits.length > 0) { + SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); + scrollRequest.scroll(scroll); + try { + rp = restHighLevelClient.scroll(scrollRequest,RequestOptions.DEFAULT); + } catch (IOException e) { + e.printStackTrace(); + } + scrollId = rp.getScrollId(); + searchHits = rp.getHits().getHits(); + if (searchHits != null && searchHits.length > 0) { + for (SearchHit searchHit : searchHits) { + Map sourceAsMap = searchHit.getSourceAsMap(); + sourceList.add(sourceAsMap); + } + } + } + //清除滚屏 + ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); + clearScrollRequest.addScrollId(scrollId);//也可以选择setScrollIds()将多个scrollId一起使用 + ClearScrollResponse clearScrollResponse = null; + try { + clearScrollResponse = restHighLevelClient.clearScroll(clearScrollRequest, RequestOptions.DEFAULT); + } catch (IOException e) { + e.printStackTrace(); + } + boolean succeeded = clearScrollResponse.isSucceeded(); + + } catch (Exception e) { + e.printStackTrace(); + } + + return sourceList; + } + + + + private List findEsIndexByTime(String startTime, String endTime) { + + startTime = startTime.substring(0, 10).replaceAll("-","");//yyyyMMdd + endTime = endTime.substring(0, 10).replaceAll("-",""); + + Date start = DateUtil.parse(startTime, "yyyyMMdd"); + Date end = DateUtil.parse(endTime, "yyyyMMdd"); + List dateTimes = DateUtil.rangeToList(start, end, DateField.DAY_OF_YEAR); + List list = new ArrayList<>(); + String hash; + int len = dateTimes.size() < 7 ? dateTimes.size() : 7; + for (int i = 0; i < len; i++) { + hash = dateTimes.get(i).toString(); + hash = hash.substring(0, 10).replaceAll("-",""); + list.add("gpsinfo" + hash); + } + return list; + } + + + + // 工具方法 + public static Consumer consumerWithIndex(BiConsumer consumer) { + class Obj { + int i; + } + Obj obj = new Obj(); + return t -> { + int index = obj.i++; + consumer.accept(t, index); + }; + } + +} diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/application.yml b/stwzhj-modules/stwzhj-location/src/main/resources/application.yml new file mode 100644 index 00000000..7ab487c2 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/resources/application.yml @@ -0,0 +1,34 @@ +# Tomcat +server: + port: 9213 + +# Spring +spring: + application: + # 应用名称 + name: stwzhj-location + profiles: + # 环境配置 + active: @profiles.active@ + +--- # nacos 配置 +spring: + cloud: + nacos: + # nacos 服务地址 + server-addr: @nacos.server@ + username: @nacos.username@ + password: @nacos.password@ + discovery: + # 注册组 + group: @nacos.discovery.group@ + namespace: ${spring.profiles.active} + config: + # 配置组 + group: @nacos.config.group@ + namespace: ${spring.profiles.active} + config: + import: + - optional:nacos:application-common.yml + - optional:nacos:datasource.yml + - optional:nacos:${spring.application.name}.yml diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-location/src/main/resources/banner.txt new file mode 100644 index 00000000..fbd45f53 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..caaa3455 --- /dev/null +++ b/stwzhj-modules/stwzhj-location/src/main/resources/logback-plus.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-resource/Dockerfile b/stwzhj-modules/stwzhj-resource/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-resource/Dockerfile rename to stwzhj-modules/stwzhj-resource/Dockerfile diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/stwzhj-modules/stwzhj-resource/pom.xml similarity index 69% rename from ruoyi-modules/ruoyi-resource/pom.xml rename to stwzhj-modules/stwzhj-resource/pom.xml index 8a623d66..d4842a79 100644 --- a/ruoyi-modules/ruoyi-resource/pom.xml +++ b/stwzhj-modules/stwzhj-resource/pom.xml @@ -4,113 +4,113 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + stwzhj-modules ${revision} 4.0.0 - ruoyi-resource + stwzhj-resource - ruoyi-resource资源服务 + stwzhj-resource资源服务 org.dromara - ruoyi-common-nacos + stwzhj-common-nacos org.dromara - ruoyi-common-sentinel + stwzhj-common-sentinel org.dromara - ruoyi-common-doc + stwzhj-common-doc org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-seata + stwzhj-common-seata org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-oss + stwzhj-common-oss org.dromara - ruoyi-common-ratelimiter + stwzhj-common-ratelimiter org.dromara - ruoyi-common-mail + stwzhj-common-mail org.dromara - ruoyi-common-sms + stwzhj-common-sms org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-common-translation + stwzhj-common-translation org.dromara - ruoyi-common-websocket + stwzhj-common-websocket org.dromara - ruoyi-common-sse + stwzhj-common-sse org.dromara - ruoyi-api-system + stwzhj-api-system org.dromara - ruoyi-api-resource + stwzhj-api-resource diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/RuoYiResourceApplication.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/RuoYiResourceApplication.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/RuoYiResourceApplication.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/RuoYiResourceApplication.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysOssController.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssController.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysOssController.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/SysOss.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOss.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/SysOss.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/SysOssConfig.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/bo/SysOssBo.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/bo/SysOssConfigBo.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/convert/SysOssVoConvert.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssConfigVo.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssUploadVo.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/domain/vo/SysOssVo.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssConfigMapper.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/mapper/SysOssConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssConfigMapper.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/mapper/SysOssConfigMapper.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/mapper/SysOssMapper.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/runner/ResourceApplicationRunner.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/ISysOssConfigService.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/ISysOssService.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/ISysOssService.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/ISysOssService.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/impl/SysOssConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java b/stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java rename to stwzhj-modules/stwzhj-resource/src/main/java/org/dromara/resource/service/impl/SysOssServiceImpl.java diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/application.yml b/stwzhj-modules/stwzhj-resource/src/main/resources/application.yml similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/application.yml rename to stwzhj-modules/stwzhj-resource/src/main/resources/application.yml diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-resource/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/banner.txt rename to stwzhj-modules/stwzhj-resource/src/main/resources/banner.txt diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/logback-plus.xml rename to stwzhj-modules/stwzhj-resource/src/main/resources/logback-plus.xml diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/mapper/package-info.md b/stwzhj-modules/stwzhj-resource/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/mapper/package-info.md rename to stwzhj-modules/stwzhj-resource/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssConfigMapper.xml b/stwzhj-modules/stwzhj-resource/src/main/resources/mapper/resource/SysOssConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssConfigMapper.xml rename to stwzhj-modules/stwzhj-resource/src/main/resources/mapper/resource/SysOssConfigMapper.xml diff --git a/ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssMapper.xml b/stwzhj-modules/stwzhj-resource/src/main/resources/mapper/resource/SysOssMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-resource/src/main/resources/mapper/resource/SysOssMapper.xml rename to stwzhj-modules/stwzhj-resource/src/main/resources/mapper/resource/SysOssMapper.xml diff --git a/ruoyi-modules/ruoyi-system/Dockerfile b/stwzhj-modules/stwzhj-system/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-system/Dockerfile rename to stwzhj-modules/stwzhj-system/Dockerfile diff --git a/stwzhj-modules/stwzhj-system/pom.xml b/stwzhj-modules/stwzhj-system/pom.xml new file mode 100644 index 00000000..bd976e2a --- /dev/null +++ b/stwzhj-modules/stwzhj-system/pom.xml @@ -0,0 +1,133 @@ + + + + org.dromara + stwzhj-modules + ${revision} + + 4.0.0 + + stwzhj-system + + + stwzhj-system系统模块 + + + + + + org.dromara + stwzhj-common-nacos + + + + org.dromara + stwzhj-common-sentinel + + + + + org.dromara + stwzhj-common-log + + + + org.dromara + stwzhj-common-dict + + + + org.dromara + stwzhj-common-doc + + + + org.dromara + stwzhj-common-web + + + + org.dromara + stwzhj-common-mybatis + + + + org.dromara + stwzhj-common-dubbo + + + + org.dromara + stwzhj-common-seata + + + + org.dromara + stwzhj-common-idempotent + + + + org.dromara + stwzhj-common-tenant + + + + org.dromara + stwzhj-common-security + + + + org.dromara + stwzhj-common-translation + + + + org.dromara + stwzhj-common-sensitive + + + + org.dromara + stwzhj-common-encrypt + + + + + org.dromara + stwzhj-api-system + + + + org.dromara + stwzhj-api-resource + + + + com.github.jeffreyning + mybatisplus-plus + 1.5.1-RELEASE + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java index 3359c7d2..e2e497f4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/RuoYiSystemApplication.java @@ -4,6 +4,7 @@ import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 系统模块 @@ -11,6 +12,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt * @author ruoyi */ @EnableDubbo +@EnableScheduling @SpringBootApplication public class RuoYiSystemApplication { public static void main(String[] args) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java new file mode 100644 index 00000000..9d28f3ff --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/IndexStaticsController.java @@ -0,0 +1,148 @@ +package org.dromara.system.controller.system; + + +import jdk.dynalink.linker.LinkerServices; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.common.web.core.BaseController; +import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.domain.bo.TDeviceBo; +import org.dromara.system.domain.vo.DeviceStaticsVo; +import org.dromara.system.domain.vo.SysDeptVo; +import org.dromara.system.domain.vo.SysDictDataVo; +import org.dromara.system.service.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RequiredArgsConstructor +@RestController +public class IndexStaticsController extends BaseController { + + private final ISysDeptService deptService; + + private final ITDeviceService deviceService; + + private final ISysDictTypeService dictTypeService; + + private final IDeviceRedisService redisService; + + + /* + * 首页顶部统计 全省各个终端数量及在在线数 + * */ + @GetMapping("/topPan") + public R topPan(String zzjgdm){ + DeviceRedis redis = new DeviceRedis(); + redis.setZzjgdm(zzjgdm); + return R.ok(redisService.countByCondition(redis)); + } + + /* + * 各地市总数和在线数 + * */ + @PostMapping("/onLineBar") + public R onLineBar(){ + List deptVoList = deptService.getDsList(); + List staticsVoList = deviceService.countByDs(); + List list = new ArrayList<>(); //用来接收处理后的统计结果 + for (SysDeptVo deptVo : deptVoList) { + boolean bl = false; //用来统计结果是否有当前这个机构 + for (DeviceStaticsVo staticsVo : staticsVoList) { + String deptId = staticsVo.getZzjgdm()+"00000000"; + if (deptId.equals(deptVo.getDeptId())){ + staticsVo.setZzjgdm(deptId); + staticsVo.setZzjgmc(deptVo.getDeptName().replaceAll("公安局","")); + int onlineCo = RedisUtils.searchKeys("org_code:"+staticsVo.getZzjgdm()+"*"); + staticsVo.setOnlineCo(onlineCo); + list.add(staticsVo); + bl = true; + break; + } + } + if (!bl){ + DeviceStaticsVo staticsVo = new DeviceStaticsVo(); + staticsVo.setZzjgdm(deptVo.getDeptId()); + staticsVo.setZzjgmc(deptVo.getDeptName().replaceAll("公安局","")); + staticsVo.setCo(0); + staticsVo.setOnlineCo(0); + list.add(staticsVo); + } + } + return R.ok(list); + } + + /* + * 根据Code查询终端总数和在线数 + * */ + @GetMapping("/dsOnlineCount") + public R dsOnlineCount(String code){ + TDeviceBo bo = new TDeviceBo(); + bo.setInfoSource(code); + Long co = deviceService.countByCondition(bo); + int onlineCo = 0; + if (null == code || "".equals(code)){ + onlineCo = RedisUtils.searchKeys("org_code:*"); + }else { + onlineCo = RedisUtils.searchKeys("org_code:"+code+"*"); + } + HashMap map = new HashMap(); + map.put("co",co); + map.put("onlineCo",onlineCo); + return R.ok(map); + } + + /* + * 全省及各地市的各类终端数量 + * */ + @GetMapping("/deviceCount") + public R deviceCount(String code){ + List dataList = dictTypeService.selectDictDataByType("zd_device_type"); + List list = new ArrayList<>(); + for (SysDictDataVo data : dataList) { + HashMap map = new HashMap(); + TDeviceBo deviceInfo = new TDeviceBo(); + deviceInfo.setDeviceType(data.getDictValue()); + deviceInfo.setInfoSource(code); + Long co = deviceService.countByCondition(deviceInfo); + map.put("name",data.getDictLabel()); + map.put("all",co); + list.add(map); + } + return R.ok(list); + } + + @PostMapping("/getDeviceType") + public R getDeviceType(){ + List dataList = dictTypeService.selectDictDataByType("zd_device_type"); + return R.ok(dataList); + } + + @GetMapping("/countByType") + public R countByType(String type){ + List list = new ArrayList<>(); + List deptVoList = deptService.getDsList(); + for (SysDeptVo deptVo : deptVoList) { + HashMap map = new HashMap(); + TDeviceBo deviceInfo = new TDeviceBo(); + deviceInfo.setDeviceType(type); + deviceInfo.setInfoSource(deptVo.getDeptId().substring(0,4)); + Long co = deviceService.countByCondition(deviceInfo); + map.put("name",deptVo.getDeptName().replaceAll("公安局","")); + map.put("all",co); + list.add(map); + } + return R.ok(list); + } + + + + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysClientController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java similarity index 91% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index 1855a208..ce954fa9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -42,6 +42,12 @@ public class SysDeptController extends BaseController { return R.ok(depts); } + @GetMapping("/deviceDept/{deviceType}") + public R> deviceDpet(@PathVariable(value = "deviceType", required = false) String deviceType) { + List depts = deptService.deviceStatics(deviceType); + return R.ok(depts); + } + /** * 查询部门列表（排除节点） * @@ -63,7 +69,7 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:query") @GetMapping(value = "/{deptId}") - public R getInfo(@PathVariable Long deptId) { + public R getInfo(@PathVariable String deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); } @@ -88,7 +94,7 @@ public class SysDeptController extends BaseController { @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping public R edit(@Validated @RequestBody SysDeptBo dept) { - Long deptId = dept.getDeptId(); + String deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); if (!deptService.checkDeptNameUnique(dept)) { return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在"); @@ -112,7 +118,7 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:remove") @Log(title = "部门管理", businessType = BusinessType.DELETE) @DeleteMapping("/{deptId}") - public R remove(@PathVariable Long deptId) { + public R remove(@PathVariable String deptId) { if (deptService.hasChildByDeptId(deptId)) { return R.warn("存在下级部门,不允许删除"); } @@ -133,7 +139,7 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] deptIds) { + public R> optionselect(@RequestParam(required = false) String[] deptIds) { return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds))); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index 1871183e..7bce34b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -118,7 +118,7 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:query") @GetMapping("/optionselect") - public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) { + public R> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) String deptId) { List list = new ArrayList<>(); if (ObjectUtil.isNotNull(deptId)) { SysPostBo post = new SysPostBo(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysTenantPackageController.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index f773cc05..fae9451d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -139,7 +139,7 @@ public class SysUserController extends BaseController { SysUserVo sysUser = userService.selectUserById(userId); userInfoVo.setUser(sysUser); userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId)); - Long deptId = sysUser.getDeptId(); + String deptId = sysUser.getDeptId(); if (ObjectUtil.isNotNull(deptId)) { SysPostBo postBo = new SysPostBo(); postBo.setDeptId(deptId); @@ -218,7 +218,7 @@ public class SysUserController extends BaseController { @SaCheckPermission("system:user:query") @GetMapping("/optionselect") public R> optionselect(@RequestParam(required = false) Long[] userIds, - @RequestParam(required = false) Long deptId) { + @RequestParam(required = false) String deptId) { return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId)); } @@ -285,7 +285,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/deptTree") - public R>> deptTree(SysDeptBo dept) { + public R>> deptTree(SysDeptBo dept) { return R.ok(deptService.selectDeptTreeList(dept)); } @@ -294,7 +294,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list/dept/{deptId}") - public R> listByDept(@PathVariable @NotNull Long deptId) { + public R> listByDept(@PathVariable @NotNull String deptId) { return R.ok(userService.selectUserListByDept(deptId)); } diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java new file mode 100644 index 00000000..8e7f87da --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/controller/system/TDeviceController.java @@ -0,0 +1,106 @@ +package org.dromara.system.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.system.domain.vo.TDeviceVo; +import org.dromara.system.domain.bo.TDeviceBo; +import org.dromara.system.service.ITDeviceService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * device + * 前端访问路由地址为:/system/device + * + * @author luuy + * @date 2024-11-19 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/device") +public class TDeviceController extends BaseController { + + private final ITDeviceService tDeviceService; + + /** + * 查询device列表 + */ + @SaCheckPermission("system:device:list") + @GetMapping("/list") + public TableDataInfo list(TDeviceBo bo, PageQuery pageQuery) { + return tDeviceService.queryPageList(bo, pageQuery); + } + + /** + * 导出device列表 + */ + @SaCheckPermission("system:device:export") + @Log(title = "device", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(TDeviceBo bo, HttpServletResponse response) { + List list = tDeviceService.queryList(bo); + ExcelUtil.exportExcel(list, "device", TDeviceVo.class, response); + } + + /** + * 获取device详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("system:device:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(tDeviceService.queryById(id)); + } + + /** + * 新增device + */ + @SaCheckPermission("system:device:add") + @Log(title = "device", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody TDeviceBo bo) { + return toAjax(tDeviceService.insertByBo(bo)); + } + + /** + * 修改device + */ + @SaCheckPermission("system:device:edit") + @Log(title = "device", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody TDeviceBo bo) { + return toAjax(tDeviceService.updateByBo(bo)); + } + + /** + * 删除device + * + * @param ids 主键串 + */ + @SaCheckPermission("system:device:remove") + @Log(title = "device", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(tDeviceService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java new file mode 100644 index 00000000..ccdc6e6c --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/DeviceRedis.java @@ -0,0 +1,24 @@ +package org.dromara.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +@Data +@TableName("t_device_redis") +public class DeviceRedis { + + @Serial + private static final long serialVersionUID = 1L; + + private String deviceCode; + + private String deviceType; + + private String online; + + private String zzjgdm; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysClient.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysConfig.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java similarity index 90% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java index b54dd336..ca416d48 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDept.java @@ -28,22 +28,18 @@ public class SysDept extends TenantEntity { * 部门ID */ @TableId(value = "dept_id") - private Long deptId; + private String deptId; /** * 父部门ID */ - private Long parentId; + private String parentId; /** * 部门名称 */ private String deptName; - /** - * 部门类别编码 - */ - private String deptCategory; /** * 显示顺序 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictData.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysDictType.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysLogininfor.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysMenu.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysNotice.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysOperLog.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java index 2c985da6..648da554 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysPost.java @@ -26,7 +26,7 @@ public class SysPost extends TenantEntity { /** * 部门id */ - private Long deptId; + private String deptId; /** * 岗位编码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRole.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java index ba77694e..fa4ec3f3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleDept.java @@ -24,6 +24,6 @@ public class SysRoleDept { /** * 部门ID */ - private Long deptId; + private String deptId; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysSocial.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenant.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java index 2a4ddbd8..b291a36b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUser.java @@ -30,7 +30,7 @@ public class SysUser extends TenantEntity { /** * 部门ID */ - private Long deptId; + private String deptId; /** * 用户账号 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserPost.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/SysUserRole.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java new file mode 100644 index 00000000..c361169c --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/TDevice.java @@ -0,0 +1,96 @@ +package org.dromara.system.domain; + +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serial; + +/** + * device对象 t_device + * + * @author luuy + * @date 2024-11-19 + */ +@Data +@TableName("t_device") +public class TDevice { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @TableId(value = "id",type = IdType.AUTO) + private Long id; + + /** + * 外部系统设备编号建议21位 + */ + @MppMultiId + private String deviceCode; + + /** + * 设备类型 + */ + private String deviceType; + + @MppMultiId + private String infoSource; + + /** + * 组织机构代码 + */ + private String zzjgdm; + + /** + * 组织机构名称 + */ + private String zzjgmc; + + /** + * 警号（若有） + */ + private String policeNo; + + /** + * 姓名（若有） + */ + private String policeName; + + /** + * 联系电话（若有） + */ + private String phoneNum; + + /** + * 车牌号（若有） + */ + private String carNum; + + /** + * 0无效，1有效 + */ + private Integer valid; + + /** + * 备注字段1 + */ + private String remark1; + + /** + * 备注字段2 + */ + private String remark2; + + @TableField(fill = FieldFill.INSERT) + private String createTime; + + @TableField(fill = FieldFill.INSERT_UPDATE) + private String updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java index 5f64d6f3..6fdb0584 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java @@ -24,12 +24,12 @@ public class SysDeptBo extends BaseEntity { /** * 部门id */ - private Long deptId; + private String deptId; /** * 父部门ID */ - private Long parentId; + private String parentId; /** * 部门名称 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java index 042946ca..746ee97f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java @@ -70,7 +70,7 @@ public class SysDictDataBo extends BaseEntity { /** * 创建部门 */ - private Long createDept; + private String createDept; /** * 备注 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java index 736062f6..d7a028e1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java @@ -29,12 +29,12 @@ public class SysPostBo extends BaseEntity { * 部门id（单部门） */ @NotNull(message = "部门id不能为空") - private Long deptId; + private String deptId; /** * 归属部门id（部门树） */ - private Long belongDeptId; + private String belongDeptId; /** * 岗位编码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java index 0c8b4dca..e4a6fa09 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java @@ -81,7 +81,7 @@ public class SysRoleBo extends BaseEntity { /** * 部门组（数据权限） */ - private Long[] deptIds; + private String[] deptIds; public SysRoleBo(Long roleId) { this.roleId = roleId; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysTenantPackageBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 7ad2759b..834ebbb7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -32,7 +32,7 @@ public class SysUserBo extends BaseEntity { /** * 部门ID */ - private Long deptId; + private String deptId; /** * 用户账号 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java new file mode 100644 index 00000000..7befa14f --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/bo/TDeviceBo.java @@ -0,0 +1,91 @@ +package org.dromara.system.domain.bo; + +import org.dromara.system.domain.TDevice; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; + +/** + * device业务对象 t_device + * + * @author luuy + * @date 2024-11-19 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TDevice.class, reverseConvertGenerate = false) +public class TDeviceBo extends BaseEntity { + + /** + * id + */ + private Long id; + + /** + * 外部系统设备编号建议21位 + */ + @NotBlank(message = "设备编号不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceCode; + + @NotBlank(message = "地市编码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String infoSource; + + /** + * 设备类型 + */ + @NotBlank(message = "设备类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String deviceType; + + /** + * 组织机构代码 + */ + @NotBlank(message = "组织机构代码不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zzjgdm; + + /** + * 组织机构名称 + */ + @NotBlank(message = "组织机构名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String zzjgmc; + + /** + * 警号（若有） + */ + private String policeNo; + + /** + * 姓名（若有） + */ + private String policeName; + + /** + * 联系电话（若有） + */ + private String phoneNum; + + /** + * 车牌号（若有） + */ + private String carNum; + + /** + * 0无效，1有效 + */ + private Integer valid; + + /** + * 备注字段1 + */ + private String remark1; + + /** + * 备注字段2 + */ + private String remark2; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysClientVoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysDictDataVoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysLogininforBoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysOperLogBoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialBoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysSocialVoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysTenantVoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserBoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/convert/SysUserVoConvert.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/AvatarVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/CacheListInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java index e8d3b344..7ab914e5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeptTreeSelectVo.java @@ -26,6 +26,6 @@ public class DeptTreeSelectVo implements Serializable { /** * 下拉树结构列表 */ - private List> depts; + private List> depts; } diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java new file mode 100644 index 00000000..fa9f329f --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceRedisVo.java @@ -0,0 +1,27 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +import java.io.Serial; + +@Data +public class DeviceRedisVo { + + @Serial + private static final long serialVersionUID = 1L; + + private String deviceCode; + + private String deviceType; + + private String online; + + private String zzjgdm; + + private String typeName; + + private Integer co; + + private Integer onlien; + +} diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java new file mode 100644 index 00000000..066241a9 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/DeviceStaticsVo.java @@ -0,0 +1,22 @@ +package org.dromara.system.domain.vo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +@Data +public class DeviceStaticsVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + private String zzjgmc; + + private String zzjgdm; + + private Integer co; + + private Integer onlineCo; + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MenuTreeSelectVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/ProfileVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java similarity index 94% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java index 098b8653..565c0c72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java @@ -29,12 +29,12 @@ public class SysDeptVo implements Serializable { * 部门id */ @ExcelProperty(value = "部门id") - private Long deptId; + private String deptId; /** * 父部门id */ - private Long parentId; + private String parentId; /** * 父部门名称 @@ -99,4 +99,8 @@ public class SysDeptVo implements Serializable { @ExcelProperty(value = "创建时间") private Date createTime; + private Integer co; + + private String online; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java index 02498ec3..a7faac9d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java @@ -39,7 +39,7 @@ public class SysPostVo implements Serializable { * 部门id */ @ExcelProperty(value = "部门id") - private Long deptId; + private String deptId; /** * 岗位编码 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantPackageVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysTenantVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java index 86249d20..0140acea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java @@ -41,7 +41,7 @@ public class SysUserVo implements Serializable { /** * 部门ID */ - private Long deptId; + private String deptId; /** * 用户账号 diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java new file mode 100644 index 00000000..a5ad6a17 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/TDeviceVo.java @@ -0,0 +1,115 @@ +package org.dromara.system.domain.vo; + +import org.dromara.system.domain.TDevice; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * device视图对象 t_device + * + * @author luuy + * @date 2024-11-19 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = TDevice.class) +public class TDeviceVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @ExcelProperty(value = "id") + private Long id; + + /** + * 外部系统设备编号建议21位 + */ + @ExcelProperty(value = "外部系统设备编号建议21位") + private String deviceCode; + + /** + * 设备类型 + */ + @ExcelProperty(value = "设备类型") + private String deviceType; + + private String infoSource; + + /** + * 组织机构代码 + */ + @ExcelProperty(value = "组织机构代码") + private String zzjgdm; + + /** + * 组织机构名称 + */ + @ExcelProperty(value = "组织机构名称") + private String zzjgmc; + + /** + * 警号（若有） + */ + @ExcelProperty(value = "警号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "若=有") + private String policeNo; + + /** + * 姓名（若有） + */ + @ExcelProperty(value = "姓名", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "若=有") + private String policeName; + + /** + * 联系电话（若有） + */ + @ExcelProperty(value = "联系电话", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "若=有") + private String phoneNum; + + /** + * 车牌号（若有） + */ + @ExcelProperty(value = "车牌号", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "若=有") + private String carNum; + + /** + * 0无效，1有效 + */ + @ExcelProperty(value = "0无效，1有效") + private Integer valid; + + /** + * 备注字段1 + */ + @ExcelProperty(value = "备注字段1") + private String remark1; + + /** + * 备注字段2 + */ + @ExcelProperty(value = "备注字段2") + private String remark2; + + + private String createTime; + + private String updateTime; + + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java index c26111a6..0e05a51f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java @@ -61,14 +61,14 @@ public class RemoteDataScopeServiceImpl implements RemoteDataScopeService { * @return 返回部门及其下级的权限语句，如果没有找到则返回 null */ @Override - public String getDeptAndChild(Long deptId) { + public String getDeptAndChild(String deptId) { if (ObjectUtil.isNull(deptId)) { return "-1"; } List deptList = deptMapper.selectList(new LambdaQueryWrapper() .select(SysDept::getDeptId) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + List ids = StreamUtils.toList(deptList, SysDept::getDeptId); ids.add(deptId); if (CollUtil.isNotEmpty(ids)) { return StreamUtils.join(ids, Convert::toStr); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java new file mode 100644 index 00000000..9f25f05e --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDeviceImpl.java @@ -0,0 +1,58 @@ +package org.dromara.system.dubbo; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; +import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.api.RemoteDeviceService; +import org.dromara.system.api.domain.bo.RemoteDeviceBo; +import org.dromara.system.api.domain.bo.RemoteDeviceToStBo; +import org.dromara.system.api.domain.vo.RemoteDeviceVo; +import org.dromara.system.domain.TDevice; +import org.dromara.system.domain.bo.TDeviceBo; +import org.dromara.system.domain.vo.TDeviceVo; +import org.dromara.system.service.ITDeviceService; +import org.springframework.context.annotation.Bean; +import org.springframework.stereotype.Service; + +import java.util.List; + +@RequiredArgsConstructor +@Service +@DubboService +public class RemoteDeviceImpl implements RemoteDeviceService { + + private final ITDeviceService deviceService; + + @Override + public boolean batchSaveDevice(List boList) { + List devices = BeanUtil.copyToList(boList, TDevice.class); + boolean flag = deviceService.batchSaveOrUpdate(devices); + return flag; + } + + @Override + public R pageDeviceList(RemoteDeviceBo bo) { + PageQuery pageQuery = new PageQuery(); + pageQuery.setPageNum(bo.getPageNum()); + pageQuery.setPageSize(bo.getPageSize()); + TableDataInfo result = deviceService.queryPageList(BeanUtil.copyProperties(bo, TDeviceBo.class),pageQuery); + return R.ok(result); + } + + @Override + public List deviceList(RemoteDeviceBo bo) { + TDeviceBo deviceBo = BeanUtil.copyProperties(bo, TDeviceBo.class); + List voList = deviceService.queryList(deviceBo); + return BeanUtil.copyToList(voList,RemoteDeviceVo.class); + } + + @Override + public R saveDeviceToSt(String infoSource, List list) { + return deviceService.saveDeviceToSt(infoSource,BeanUtil.copyToList(list,TDevice.class)); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteTenantServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java new file mode 100644 index 00000000..308e93d8 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/DeviceRedisMapper.java @@ -0,0 +1,14 @@ +package org.dromara.system.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.domain.vo.DeviceRedisVo; + +import java.util.List; + +public interface DeviceRedisMapper extends BaseMapperPlus { + + int insertBatch(List list); + + List countByCondition(DeviceRedis redis); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java similarity index 92% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java index 08dda662..a2221dbb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java @@ -32,7 +32,7 @@ public interface SysDeptMapper extends BaseMapperPlus { @DataPermission({ @DataColumn(key = "deptName", value = "dept_id") }) - long countDeptById(Long deptId); + long countDeptById(String deptId); /** * 根据角色ID查询部门树信息 @@ -43,4 +43,6 @@ public interface SysDeptMapper extends BaseMapperPlus { */ List selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly); + List deviceStatics(@Param("deviceType") String deviceType); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysTenantPackageMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java new file mode 100644 index 00000000..591e203c --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/mapper/TDeviceMapper.java @@ -0,0 +1,20 @@ +package org.dromara.system.mapper; + +import org.dromara.system.domain.TDevice; +import org.dromara.system.domain.vo.DeviceStaticsVo; +import org.dromara.system.domain.vo.TDeviceVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +import java.util.List; + +/** + * deviceMapper接口 + * + * @author luuy + * @date 2024-11-19 + */ +public interface TDeviceMapper extends BaseMapperPlus { + + List countByDs(); + +} diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java new file mode 100644 index 00000000..07f90884 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/schedule/DeviceRedisSchedule.java @@ -0,0 +1,29 @@ +package org.dromara.system.schedule; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.json.JSONObject; +import org.dromara.common.redis.utils.RedisUtils; +import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.service.IDeviceRedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.Scheduled; + +import java.util.List; + +@Configuration +public class DeviceRedisSchedule { + + @Autowired + IDeviceRedisService redisService; + + /* + * 把Redis中 online_user数据存入t_device_redis表中 + * */ + @Scheduled(cron = "0/30 * * * * ?") + public void handleDeviceRedis(){ + List jlist = RedisUtils.searchAndGetKeysValues("online_users:*"); + redisService.insertBatch(BeanUtil.copyToList(jlist, DeviceRedis.class)); + } + +} diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java new file mode 100644 index 00000000..8870892c --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/IDeviceRedisService.java @@ -0,0 +1,12 @@ +package org.dromara.system.service; + +import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.domain.vo.DeviceRedisVo; + +import java.util.List; + +public interface IDeviceRedisService { + int insertBatch(List list); + + List countByCondition(DeviceRedis redis); +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysClientService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysConfigService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java similarity index 79% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java index d0d7c93e..f47230aa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -26,7 +26,7 @@ public interface ISysDeptService { * @param dept 部门信息 * @return 部门树信息集合 */ - List> selectDeptTreeList(SysDeptBo dept); + List> selectDeptTreeList(SysDeptBo dept); /** * 构建前端所需要下拉树结构 @@ -34,7 +34,7 @@ public interface ISysDeptService { * @param depts 部门列表 * @return 下拉树结构列表 */ - List> buildDeptTreeSelect(List depts); + List> buildDeptTreeSelect(List depts); /** * 根据角色ID查询部门树信息 @@ -50,7 +50,7 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 部门信息 */ - SysDeptVo selectDeptById(Long deptId); + SysDeptVo selectDeptById(String deptId); /** * 通过部门ID串查询部门 @@ -58,7 +58,7 @@ public interface ISysDeptService { * @param deptIds 部门id串 * @return 部门列表信息 */ - List selectDeptByIds(List deptIds); + List selectDeptByIds(List deptIds); /** * 通过部门ID查询部门名称 @@ -74,7 +74,7 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 子部门数 */ - long selectNormalChildrenDeptById(Long deptId); + long selectNormalChildrenDeptById(String deptId); /** * 是否存在部门子节点 @@ -82,7 +82,7 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 结果 */ - boolean hasChildByDeptId(Long deptId); + boolean hasChildByDeptId(String deptId); /** * 查询部门是否存在用户 @@ -90,7 +90,7 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 结果 true 存在 false 不存在 */ - boolean checkDeptExistUser(Long deptId); + boolean checkDeptExistUser(String deptId); /** * 校验部门名称是否唯一 @@ -106,7 +106,7 @@ public interface ISysDeptService { * * @param deptId 部门id */ - void checkDeptDataScope(Long deptId); + void checkDeptDataScope(String deptId); /** * 新增保存部门信息 @@ -130,5 +130,12 @@ public interface ISysDeptService { * @param deptId 部门ID * @return 结果 */ - int deleteDeptById(Long deptId); + int deleteDeptById(String deptId); + + /* + * 查询各地市集合不包含省厅 + * */ + List getDsList(); + + List deviceStatics(String deviceType); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictDataService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLogininforService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysLogininforService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMenuService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysMenuService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysNoticeService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysOperLogService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPermissionService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java index 3751b23b..f7f3edf5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -86,7 +86,7 @@ public interface ISysPostService { * @param deptId 部门id * @return 结果 */ - long countPostByDeptId(Long deptId); + long countPostByDeptId(String deptId); /** * 删除岗位信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysRoleService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysSocialService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysSocialService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantPackageService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTenantService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysTenantService.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java index a6f18c79..882cf35c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -73,7 +73,7 @@ public interface ISysUserService { * @param deptId 部门id * @return 用户列表信息 */ - List selectUserByIds(List userIds, Long deptId); + List selectUserByIds(List userIds, String deptId); /** * 根据用户ID查询用户所属角色组 @@ -258,7 +258,7 @@ public interface ISysUserService { * @param deptId 部门id * @return 结果 */ - List selectUserListByDept(Long deptId); + List selectUserListByDept(String deptId); /** * 通过角色ID查询用户ID diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java new file mode 100644 index 00000000..b8849915 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/ITDeviceService.java @@ -0,0 +1,79 @@ +package org.dromara.system.service; + +import org.dromara.common.core.domain.R; +import org.dromara.system.domain.TDevice; +import org.dromara.system.domain.vo.DeviceStaticsVo; +import org.dromara.system.domain.vo.TDeviceVo; +import org.dromara.system.domain.bo.TDeviceBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * deviceService接口 + * + * @author luuy + * @date 2024-11-19 + */ +public interface ITDeviceService { + + /** + * 查询device + * + * @param id 主键 + * @return device + */ + TDeviceVo queryById(Long id); + + /** + * 分页查询device列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return device分页列表 + */ + TableDataInfo queryPageList(TDeviceBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的device列表 + * + * @param bo 查询条件 + * @return device列表 + */ + List queryList(TDeviceBo bo); + + /** + * 新增device + * + * @param bo device + * @return 是否新增成功 + */ + Boolean insertByBo(TDeviceBo bo); + + /** + * 修改device + * + * @param bo device + * @return 是否修改成功 + */ + Boolean updateByBo(TDeviceBo bo); + + /** + * 校验并批量删除device信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + Boolean batchSaveOrUpdate(List List); + + List countByDs(); + + Long countByCondition(TDeviceBo bo); + + R saveDeviceToSt(String infoSource,List list); +} diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java new file mode 100644 index 00000000..a66adf19 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/DeviceRedisServiceImpl.java @@ -0,0 +1,64 @@ +package org.dromara.system.service.impl; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.session.ExecutorType; +import org.apache.ibatis.session.SqlSession; +import org.apache.ibatis.session.SqlSessionFactory; +import org.dromara.system.domain.DeviceRedis; +import org.dromara.system.domain.vo.DeviceRedisVo; +import org.dromara.system.mapper.DeviceRedisMapper; +import org.dromara.system.service.IDeviceRedisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Slf4j +@RequiredArgsConstructor +@Service +public class DeviceRedisServiceImpl implements IDeviceRedisService { + + private final DeviceRedisMapper baseMapper; + + @Autowired + SqlSessionFactory sqlSessionFactory; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBatch(List list) { + int groupSize = 2000; + int groupNo = list.size() / groupSize; + SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH); + int num = 0; + try { + if (list.size() <= groupSize) { + num += baseMapper.insertBatch(list); + } else { + List subList=null; + for (int i = 0; i < groupNo; i++) { + subList = list.subList(0, groupSize); + num += baseMapper.insertBatch(subList); + list.subList(0, groupSize).clear(); + } + if (list.size() > 0) { + num += baseMapper.insertBatch(list); + } + } + sqlSession.flushStatements(); + return num; + }catch (Exception e){ + e.printStackTrace(); + }finally { + sqlSession.close(); + return num; + } + } + + @Override + public List countByCondition(DeviceRedis redis) { + return baseMapper.countByCondition(redis); + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java similarity index 89% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index bb5d5691..07cc150e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -67,7 +67,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 部门树信息集合 */ @Override - public List> selectDeptTreeList(SysDeptBo bo) { + public List> selectDeptTreeList(SysDeptBo bo) { // 只查询未禁用部门 bo.setStatus(UserConstants.DEPT_NORMAL); LambdaQueryWrapper lqw = buildQueryWrapper(bo); @@ -78,10 +78,9 @@ public class SysDeptServiceImpl implements ISysDeptService { private LambdaQueryWrapper buildQueryWrapper(SysDeptBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(SysDept::getDelFlag, UserConstants.DEL_FLAG_NORMAL); - lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); - lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId()); + lqw.eq(StringUtils.isNotBlank(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId()); + lqw.eq(StringUtils.isNotBlank(bo.getParentId()), SysDept::getParentId, bo.getParentId()); lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName()); - lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory()); lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus()); lqw.orderByAsc(SysDept::getAncestors); lqw.orderByAsc(SysDept::getParentId); @@ -97,7 +96,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 下拉树结构列表 */ @Override - public List> buildDeptTreeSelect(List depts) { + public List> buildDeptTreeSelect(List depts) { if (CollUtil.isEmpty(depts)) { return CollUtil.newArrayList(); } @@ -128,7 +127,7 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") @Override - public SysDeptVo selectDeptById(Long deptId) { + public SysDeptVo selectDeptById(String deptId) { SysDeptVo dept = baseMapper.selectVoById(deptId); if (ObjectUtil.isNull(dept)) { return null; @@ -146,7 +145,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 部门列表信息 */ @Override - public List selectDeptByIds(List deptIds) { + public List selectDeptByIds(List deptIds) { return baseMapper.selectDeptList(new LambdaQueryWrapper() .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader) .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) @@ -162,7 +161,7 @@ public class SysDeptServiceImpl implements ISysDeptService { @Override public String selectDeptNameByIds(String deptIds) { List list = new ArrayList<>(); - for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) { + for (String id : StringUtils.splitTo(deptIds, Convert::toStr)) { SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id); if (ObjectUtil.isNotNull(vo)) { list.add(vo.getDeptName()); @@ -178,7 +177,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 子部门数 */ @Override - public long selectNormalChildrenDeptById(Long deptId) { + public long selectNormalChildrenDeptById(String deptId) { return baseMapper.selectCount(new LambdaQueryWrapper() .eq(SysDept::getStatus, UserConstants.DEPT_NORMAL) .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); @@ -191,7 +190,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 结果 */ @Override - public boolean hasChildByDeptId(Long deptId) { + public boolean hasChildByDeptId(String deptId) { return baseMapper.exists(new LambdaQueryWrapper() .eq(SysDept::getParentId, deptId)); } @@ -203,7 +202,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @return 结果 true 存在 false 不存在 */ @Override - public boolean checkDeptExistUser(Long deptId) { + public boolean checkDeptExistUser(String deptId) { return userMapper.exists(new LambdaQueryWrapper() .eq(SysUser::getDeptId, deptId)); } @@ -229,7 +228,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @param deptId 部门id */ @Override - public void checkDeptDataScope(Long deptId) { + public void checkDeptDataScope(String deptId) { if (ObjectUtil.isNull(deptId)) { return; } @@ -312,7 +311,7 @@ public class SysDeptServiceImpl implements ISysDeptService { * @param newAncestors 新的父ID集合 * @param oldAncestors 旧的父ID集合 */ - private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) { + private void updateDeptChildren(String deptId, String newAncestors, String oldAncestors) { List children = baseMapper.selectList(new LambdaQueryWrapper() .apply(DataBaseHelper.findInSet(deptId, "ancestors"))); List list = new ArrayList<>(); @@ -337,8 +336,20 @@ public class SysDeptServiceImpl implements ISysDeptService { */ @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId") @Override - public int deleteDeptById(Long deptId) { + public int deleteDeptById(String deptId) { return baseMapper.deleteById(deptId); } + @Override + public List getDsList() { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(SysDept::getParentId,"0"); + lqw.ne(SysDept::getDeptId,"340000000000"); + return baseMapper.selectDeptList(lqw); + } + + @Override + public List deviceStatics(String deviceType) { + return baseMapper.deviceStatics(deviceType); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 2c38129a..3cdc1a77 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -78,7 +78,7 @@ public class SysPostServiceImpl implements ISysPostService { } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) { //部门树搜索 wrapper.and(x -> { - List deptIds = deptMapper.selectList(new LambdaQueryWrapper() + List deptIds = deptMapper.selectList(new LambdaQueryWrapper() .select(SysDept::getDeptId) .apply(DataBaseHelper.findInSet(bo.getBelongDeptId(), "ancestors"))) .stream() @@ -184,7 +184,7 @@ public class SysPostServiceImpl implements ISysPostService { * @return 结果 */ @Override - public long countPostByDeptId(Long deptId) { + public long countPostByDeptId(String deptId) { return baseMapper.selectCount(new LambdaQueryWrapper().eq(SysPost::getDeptId, deptId)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index 2751c9b6..87259856 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -370,7 +370,7 @@ public class SysRoleServiceImpl implements ISysRoleService { int rows = 1; // 新增角色与部门（数据权限）管理 List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) { + for (String deptId : role.getDeptIds()) { SysRoleDept rd = new SysRoleDept(); rd.setRoleId(role.getRoleId()); rd.setDeptId(deptId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantPackageServiceImpl.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 74765498..e9c8151b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -139,7 +139,7 @@ public class SysTenantServiceImpl implements ISysTenantService { dept.setParentId(Constants.TOP_PARENT_ID); dept.setAncestors(Constants.TOP_PARENT_ID.toString()); deptMapper.insert(dept); - Long deptId = dept.getDeptId(); + String deptId = dept.getDeptId(); // 角色和部门关联表 SysRoleDept roleDept = new SysRoleDept(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java rename to stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index bacf9ebf..93d97bfb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -88,7 +88,7 @@ public class SysUserServiceImpl implements ISysUserService { List deptList = deptMapper.selectList(new LambdaQueryWrapper() .select(SysDept::getDeptId) .apply(DataBaseHelper.findInSet(user.getDeptId(), "ancestors"))); - List ids = StreamUtils.toList(deptList, SysDept::getDeptId); + List ids = StreamUtils.toList(deptList, SysDept::getDeptId); ids.add(user.getDeptId()); w.in("u.dept_id", ids); }).orderByAsc("u.user_id"); @@ -183,7 +183,7 @@ public class SysUserServiceImpl implements ISysUserService { * @return 用户列表信息 */ @Override - public List selectUserByIds(List userIds, Long deptId) { + public List selectUserByIds(List userIds, String deptId) { return baseMapper.selectUserList(new LambdaQueryWrapper() .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber) .eq(SysUser::getStatus, UserConstants.USER_NORMAL) .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId) @@ -545,7 +545,7 @@ public class SysUserServiceImpl implements ISysUserService { * @return 用户信息集合信息 */ @Override - public List selectUserListByDept(Long deptId) { + public List selectUserListByDept(String deptId) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.eq(SysUser::getDeptId, deptId); lqw.orderByAsc(SysUser::getUserId); diff --git a/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java new file mode 100644 index 00000000..a660196f --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java @@ -0,0 +1,258 @@ +package org.dromara.system.service.impl; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import org.apache.dubbo.config.annotation.DubboReference; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.dromara.system.api.RemoteDataScopeService; +import org.dromara.system.domain.vo.DeviceStaticsVo; +import org.springframework.stereotype.Service; +import org.dromara.system.domain.bo.TDeviceBo; +import org.dromara.system.domain.vo.TDeviceVo; +import org.dromara.system.domain.TDevice; +import org.dromara.system.mapper.TDeviceMapper; +import org.dromara.system.service.ITDeviceService; +import org.springframework.util.CollectionUtils; + +import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * deviceService业务层处理 + * + * @author luuy + * @date 2024-11-19 + */ +@RequiredArgsConstructor +@Service +public class TDeviceServiceImpl implements ITDeviceService { + + private final TDeviceMapper baseMapper; + + @DubboReference + private RemoteDataScopeService remoteDataScopeService; + + /** + * 查询device + * + * @param id 主键 + * @return device + */ + @Override + public TDeviceVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询device列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return device分页列表 + */ + @Override + public TableDataInfo queryPageList(TDeviceBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的device列表 + * + * @param bo 查询条件 + * @return device列表 + */ + @Override + public List queryList(TDeviceBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(TDeviceBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceCode()), TDevice::getDeviceCode, bo.getDeviceCode()); + lqw.eq(StringUtils.isNotBlank(bo.getDeviceType()), TDevice::getDeviceType, bo.getDeviceType()); + if (StringUtils.isNotBlank(bo.getZzjgdm())){ + String zzjgdm = bo.getZzjgdm(); + if (zzjgdm.endsWith("0000000000")){ // 省厅 即全部 + + }else if(zzjgdm.endsWith("00000000")){ //地市 + lqw.likeRight(TDevice::getZzjgdm,zzjgdm.substring(0,4)); + + }else if(zzjgdm.endsWith("000000")){ // 分局 + lqw.likeRight(TDevice::getZzjgdm,zzjgdm.substring(0,6)); + }else { + String depts = remoteDataScopeService.getDeptAndChild(bo.getZzjgdm()); + lqw.inSql(TDevice::getZzjgdm,depts); + } + } + lqw.eq(StringUtils.isNotBlank(bo.getZzjgmc()), TDevice::getZzjgmc, bo.getZzjgmc()); + lqw.eq(StringUtils.isNotBlank(bo.getInfoSource()), TDevice::getInfoSource, bo.getInfoSource()); + lqw.and(StringUtils.isNotBlank(bo.getPoliceName()),wrapper -> wrapper.like(TDevice::getPoliceNo, bo.getPoliceName()) + .or().like(TDevice::getPoliceName, bo.getPoliceName()).or().like(TDevice::getCarNum, bo.getPoliceName())); + lqw.eq(StringUtils.isNotBlank(bo.getPhoneNum()), TDevice::getPhoneNum, bo.getPhoneNum()); + lqw.eq(bo.getValid() != null, TDevice::getValid, bo.getValid()); + lqw.eq(StringUtils.isNotBlank(bo.getRemark1()), TDevice::getRemark1, bo.getRemark1()); + lqw.eq(StringUtils.isNotBlank(bo.getRemark2()), TDevice::getRemark2, bo.getRemark2()); + lqw.between(bo.getBeginTime() != null && bo.getEndTime() != null, + TDevice::getUpdateTime, bo.getBeginTime(), bo.getEndTime()); + return lqw; + } + + /** + * 新增device + * + * @param bo device + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(TDeviceBo bo) { + TDevice add = MapstructUtils.convert(bo, TDevice.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改device + * + * @param bo device + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(TDeviceBo bo) { + TDevice update = MapstructUtils.convert(bo, TDevice.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(TDevice entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除device信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } + + @Override + public Boolean batchSaveOrUpdate(List List) { + return baseMapper.insertOrUpdateBatch(List); + } + + @Override + public List countByDs() { + return baseMapper.countByDs(); + } + + @Override + public Long countByCondition(TDeviceBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectCount(lqw); + } + + @Override + public R saveDeviceToSt(String infoSource, List list) { + if(StringUtils.isEmpty(infoSource)){ + return R.fail("infoSource为空"); + } + if(CollectionUtils.isEmpty(list)){ + return R.fail("数据为空"); + } + if(!CollectionUtils.isEmpty(list) && list.size() > 50){ + return R.fail("单次数据超过了50条"); + } + int insertCount = 0; + int updatedCount = 0; + + ArrayList errorList = new ArrayList<>(); + for (TDevice deviceEntityV2: list) { + String deviceType = deviceEntityV2.getDeviceType(); + boolean passed = checkDeviceType(deviceType); + if(!passed){ + errorList.add(deviceEntityV2); + continue; + } + deviceEntityV2.setInfoSource(infoSource); + try { + TDevice oldEntity = checkDeviceExists(deviceEntityV2); + if (Objects.isNull(oldEntity)) { + deviceEntityV2.setId(null); + deviceEntityV2.setCreateTime(DateUtil.formatDateTime(new Date())); + int insert = baseMapper.insert(deviceEntityV2); + if (insert > 0) { + insertCount++; + }else{ + errorList.add(deviceEntityV2); + } + + } else { + deviceEntityV2.setId(oldEntity.getId()); + deviceEntityV2.setUpdateTime(DateUtil.formatDateTime(new Date())); + int update = baseMapper.updateById(deviceEntityV2); + if (update > 0) { + updatedCount++; + }else{ + errorList.add(deviceEntityV2); + } + } + }catch (Exception e){ + e.printStackTrace(); + errorList.add(deviceEntityV2); + } + } + + boolean success = (insertCount+updatedCount) == list.size(); + if(success) { + return R.ok(); + }else{ + return R.fail("部分数据插入失败，错误数据请看data",errorList); + } + } + + public TDevice checkDeviceExists(TDevice deviceEntityV2) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("device_code", deviceEntityV2.getDeviceCode()); + queryWrapper.eq("info_source", deviceEntityV2.getInfoSource()); + TDevice deviceEntity1 = baseMapper.selectOne(queryWrapper); + return deviceEntity1; + } + + private boolean checkDeviceType(String deviceType) { + if(org.springframework.util.StringUtils.isEmpty(deviceType)){ + return false; + } + String reg = "[0,9][1-9]"; + Pattern pattern = Pattern.compile(reg); + Matcher matcher = pattern.matcher(deviceType); + return matcher.matches(); + } + +} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml b/stwzhj-modules/stwzhj-system/src/main/resources/application.yml similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/resources/application.yml rename to stwzhj-modules/stwzhj-system/src/main/resources/application.yml index 50b02516..dc30ec3e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/application.yml +++ b/stwzhj-modules/stwzhj-system/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-system + name: stwzhj-system profiles: # 环境配置 active: @profiles.active@ diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-system/src/main/resources/banner.txt new file mode 100644 index 00000000..fbd45f53 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..caaa3455 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/resources/logback-plus.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/package-info.md diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml new file mode 100644 index 00000000..79d7d2ed --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/DeviceRedisMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + insert into t_device_redis (device_code,device_type,online,zzjgdm) + values + + ( + #{entity.deviceCode},#{entity.deviceType},#{entity.online},#{entity.zzjgdm} + ) + + ON conflict(device_code,device_type) do update set + (online,zzjgdm) =(EXCLUDED.online,EXCLUDED.zzjgdm) + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysClientMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml new file mode 100644 index 00000000..24f60ace --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysSocialMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysTenantPackageMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml new file mode 100644 index 00000000..3e8426d0 --- /dev/null +++ b/stwzhj-modules/stwzhj-system/src/main/resources/mapper/system/TDeviceMapper.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/Dockerfile b/stwzhj-modules/stwzhj-workflow/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-workflow/Dockerfile rename to stwzhj-modules/stwzhj-workflow/Dockerfile diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/stwzhj-modules/stwzhj-workflow/pom.xml similarity index 81% rename from ruoyi-modules/ruoyi-workflow/pom.xml rename to stwzhj-modules/stwzhj-workflow/pom.xml index 55c5b8d1..967dc0c6 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/stwzhj-modules/stwzhj-workflow/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + stwzhj-modules ${revision} 4.0.0 - ruoyi-workflow + stwzhj-workflow 工作流模块 @@ -19,7 +19,7 @@ org.dromara - ruoyi-common-nacos + stwzhj-common-nacos @@ -72,66 +72,66 @@ org.dromara - ruoyi-common-websocket + stwzhj-common-websocket org.dromara - ruoyi-common-mail + stwzhj-common-mail org.dromara - ruoyi-common-sms + stwzhj-common-sms org.dromara - ruoyi-common-mybatis + stwzhj-common-mybatis org.dromara - ruoyi-common-web + stwzhj-common-web org.dromara - ruoyi-common-log + stwzhj-common-log org.dromara - ruoyi-common-idempotent + stwzhj-common-idempotent org.dromara - ruoyi-common-excel + stwzhj-common-excel org.dromara - ruoyi-common-translation + stwzhj-common-translation org.dromara - ruoyi-common-tenant + stwzhj-common-tenant org.dromara - ruoyi-common-dubbo + stwzhj-common-dubbo org.dromara - ruoyi-common-security + stwzhj-common-security org.dromara - ruoyi-common-seata + stwzhj-common-seata org.dromara - ruoyi-api-workflow + stwzhj-api-workflow diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/RuoYiWorkflowApplication.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/RuoYiWorkflowApplication.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/RuoYiWorkflowApplication.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/RuoYiWorkflowApplication.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/FormTypeEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfCategoryController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/controller/WfFormManageController.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/ActHiProcinst.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/ActHiTaskinst.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfCategory.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfFormManage.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfNodeConfig.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/WfTaskBackNode.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/AddMultiBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/DelegateBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/DeleteMultiBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInvalidBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskUrgingBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TerminationBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/TransmitBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfCategoryBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfFormManageBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/bo/WfNodeConfigBo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ActHistoryInfoVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/GraphicInfoVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ModelVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/MultiInstanceVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ParticipantVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/VariableVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCategoryVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfFormManageVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/domain/vo/WfNodeConfigVo.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramCanvas.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/CustomDefaultProcessDiagramGenerator.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AddSequenceMultiInstanceCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/AttachmentCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteExecutionCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/DeleteSequenceMultiInstanceCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/ExecutionChildByExecutionIdCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateBusinessStatusCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/cmd/UpdateHiTaskInstCmd.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/config/FlowableConfig.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/config/GlobalFlowableListener.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/handler/FlowProcessEventHandler.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/flowable/handler/TaskTimeoutJobHandler.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActHiProcinstMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActHiTaskinstMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/ActTaskMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfCategoryMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfFormManageMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfNodeConfigMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/mapper/WfTaskBackNodeMapper.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/runner/WorkflowApplicationRunner.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/runner/WorkflowApplicationRunner.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/runner/WorkflowApplicationRunner.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/runner/WorkflowApplicationRunner.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActHiProcinstService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActHiTaskinstService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfCategoryService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfFormManageService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfNodeConfigService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/IWfTaskBackNodeService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/WorkflowService.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiProcinstServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActHiTaskinstServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfCategoryServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfFormManageServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfNodeConfigServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskBackNodeServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/ModelUtils.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java rename to stwzhj-modules/stwzhj-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/application.yml b/stwzhj-modules/stwzhj-workflow/src/main/resources/application.yml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/application.yml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/application.yml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/banner.txt b/stwzhj-modules/stwzhj-workflow/src/main/resources/banner.txt similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/banner.txt rename to stwzhj-modules/stwzhj-workflow/src/main/resources/banner.txt diff --git a/stwzhj-modules/stwzhj-workflow/src/main/resources/logback-plus.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..caaa3455 --- /dev/null +++ b/stwzhj-modules/stwzhj-workflow/src/main/resources/logback-plus.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + + + + + + + + + + diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/package-info.md diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ActHiProcinstMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ActTaskMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ISearchService.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/ActHiTaskinstMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/ISearchService.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfCategoryMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfDefinitionConfigMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfFormManageMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfNodeConfigMapper.xml diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml b/stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml similarity index 100% rename from ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml rename to stwzhj-modules/stwzhj-workflow/src/main/resources/mapper/workflow/WfTaskBackNodeMapper.xml diff --git a/ruoyi-visual/pom.xml b/stwzhj-visual/pom.xml similarity index 76% rename from ruoyi-visual/pom.xml rename to stwzhj-visual/pom.xml index b3335573..3f8ad5c5 100644 --- a/ruoyi-visual/pom.xml +++ b/stwzhj-visual/pom.xml @@ -3,24 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-cloud-plus + stwzhj-cloud-plus ${revision} 4.0.0 - ruoyi-monitor - ruoyi-sentinel-dashboard - ruoyi-seata-server - ruoyi-nacos - ruoyi-snailjob-server + stwzhj-monitor + stwzhj-sentinel-dashboard + stwzhj-seata-server + stwzhj-nacos + stwzhj-snailjob-server - ruoyi-visual + stwzhj-visual pom - ruoyi-visual图形化管理模块 + stwzhj-visual图形化管理模块 diff --git a/ruoyi-visual/ruoyi-monitor/Dockerfile b/stwzhj-visual/stwzhj-monitor/Dockerfile similarity index 100% rename from ruoyi-visual/ruoyi-monitor/Dockerfile rename to stwzhj-visual/stwzhj-monitor/Dockerfile diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/stwzhj-visual/stwzhj-monitor/pom.xml similarity index 94% rename from ruoyi-visual/ruoyi-monitor/pom.xml rename to stwzhj-visual/stwzhj-monitor/pom.xml index 2afc02b9..9829241a 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/stwzhj-visual/stwzhj-monitor/pom.xml @@ -3,12 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-visual + stwzhj-visual ${revision} 4.0.0 - ruoyi-monitor + stwzhj-monitor ruoyi-monitor监控中心 @@ -25,7 +25,7 @@ org.dromara - ruoyi-common-nacos + stwzhj-common-nacos diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/RuoYiMonitorApplication.java b/stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/RuoYiMonitorApplication.java similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/RuoYiMonitorApplication.java rename to stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/RuoYiMonitorApplication.java diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/AdminServerConfig.java b/stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/config/AdminServerConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/AdminServerConfig.java rename to stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/config/AdminServerConfig.java diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java b/stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java rename to stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/config/WebSecurityConfigurer.java diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/controller/PrometheusController.java b/stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/controller/PrometheusController.java similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/controller/PrometheusController.java rename to stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/controller/PrometheusController.java diff --git a/ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/notifier/CustomNotifier.java b/stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/notifier/CustomNotifier.java similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/java/org/dromara/modules/monitor/notifier/CustomNotifier.java rename to stwzhj-visual/stwzhj-monitor/src/main/java/org/dromara/modules/monitor/notifier/CustomNotifier.java diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml b/stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml similarity index 100% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/application.yml rename to stwzhj-visual/stwzhj-monitor/src/main/resources/application.yml diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt b/stwzhj-visual/stwzhj-monitor/src/main/resources/banner.txt similarity index 96% rename from ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt rename to stwzhj-visual/stwzhj-monitor/src/main/resources/banner.txt index c0fbab1d..ecaf8a4d 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/banner.txt +++ b/stwzhj-visual/stwzhj-monitor/src/main/resources/banner.txt @@ -1,10 +1,10 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - _ _ _ - (_) (_)| | - _ __ _ _ ___ _ _ _ ______ _ __ ___ ___ _ __ _ | |_ ___ _ __ -| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \ / _ \ | '_ \ | || __| / _ \ | '__| -| | | |_| || (_) || |_| || | | | | | | || (_) || | | || || |_ | (_) || | -|_| \__,_| \___/ \__, ||_| |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_| - __/ | +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ _ + (_) (_)| | + _ __ _ _ ___ _ _ _ ______ _ __ ___ ___ _ __ _ | |_ ___ _ __ +| '__|| | | | / _ \ | | | || ||______|| '_ ` _ \ / _ \ | '_ \ | || __| / _ \ | '__| +| | | |_| || (_) || |_| || | | | | | | || (_) || | | || || |_ | (_) || | +|_| \__,_| \___/ \__, ||_| |_| |_| |_| \___/ |_| |_||_| \__| \___/ |_| + __/ | |___/ \ No newline at end of file diff --git a/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml b/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml new file mode 100644 index 00000000..caaa3455 --- /dev/null +++ b/stwzhj-visual/stwzhj-monitor/src/main/resources/logback-plus.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + ${console.log.pattern} + utf-8 + + + + + + + + + + + + + + + diff --git a/ruoyi-visual/ruoyi-nacos/Dockerfile b/stwzhj-visual/stwzhj-nacos/Dockerfile similarity index 100% rename from ruoyi-visual/ruoyi-nacos/Dockerfile rename to stwzhj-visual/stwzhj-nacos/Dockerfile diff --git a/ruoyi-visual/ruoyi-nacos/pom.xml b/stwzhj-visual/stwzhj-nacos/pom.xml similarity index 93% rename from ruoyi-visual/ruoyi-nacos/pom.xml rename to stwzhj-visual/stwzhj-nacos/pom.xml index 21d577c8..17642420 100644 --- a/ruoyi-visual/ruoyi-nacos/pom.xml +++ b/stwzhj-visual/stwzhj-nacos/pom.xml @@ -20,10 +20,10 @@ 4.0.0 org.dromara - ruoyi-visual + stwzhj-visual ${revision} - ruoyi-nacos + stwzhj-nacos jar @@ -178,6 +178,13 @@ nacos-common ${nacos.version} + + + com.alibaba.nacos + nacos-all-datasource-plugin-ext + 1.0.0-SNAPSHOT + + com.alibaba.nacos nacos-client @@ -188,12 +195,21 @@ org.springframework.boot spring-boot-starter-web + + spring-boot-starter-tomcat + org.springframework.boot + log4j-to-slf4j org.apache.logging.log4j + + + org.springframework.boot + spring-boot-starter-undertow + org.springframework.boot spring-boot-starter-jdbc @@ -227,10 +243,17 @@ com.mysql mysql-connector-j + + org.postgresql + postgresql + org.apache.derby derby + + + com.alipay.sofa jraft-core diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/Nacos.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/Nacos.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/Nacos.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleConfig.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/config/ConsoleModuleStateBuilder.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/HealthController.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/ServerStateController.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/HealthControllerV2.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/exception/ConsoleExceptionHandler.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/exception/NacosApiExceptionHandler.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/filter/XssFilter.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java b/stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java rename to stwzhj-visual/stwzhj-nacos/src/main/java/com/alibaba/nacos/console/paramcheck/ConsoleDefaultHttpParamExtractor.java diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractHttpParamExtractor b/stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractHttpParamExtractor similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractHttpParamExtractor rename to stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.core.paramcheck.AbstractHttpParamExtractor diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.sys.module.ModuleStateBuilder b/stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.sys.module.ModuleStateBuilder similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.sys.module.ModuleStateBuilder rename to stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/services/com.alibaba.nacos.sys.module.ModuleStateBuilder diff --git a/stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/spring-devtools.properties b/stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/spring-devtools.properties new file mode 100644 index 00000000..b8bbd925 --- /dev/null +++ b/stwzhj-visual/stwzhj-nacos/src/main/resources/META-INF/spring-devtools.properties @@ -0,0 +1,2 @@ +restart.exclude.companycommonlibs=/mycorp-common-[\w-]+.jar +restart.include.projectcommon=/mycorp-myproj-[\w-]+.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties similarity index 94% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties rename to stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties index f4b94fcf..12560508 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/stwzhj-visual/stwzhj-nacos/src/main/resources/application.properties @@ -34,15 +34,16 @@ spring.application.name=ruoyi-nacos #*************** Config Module Related Configurations ***************# ### Deprecated configuration property, it is recommended to use `spring.sql.init.platform` replaced. # spring.datasource.platform=mysql -nacos.plugin.datasource.log.enabled=true -spring.sql.init.platform=mysql +nacos.plugin.datasource.log.enabled=false +spring.sql.init.platform=postgresql ### Count of DB: db.num=1 ### Connect URL of DB: -db.url.0=jdbc:mysql://127.0.0.1:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true -db.user.0=root -db.password.0=root +db.url.0=jdbc:postgresql://localhost:5432/ypc-config?tcpKeepAlive=true&reWriteBatchedInserts=true&ApplicationName=ruoyi-nacos +db.user.0=postgres +db.password.0=ycgis +db.pool.config.driverClassName=org.postgresql.Driver ### the maximum retry times for push nacos.config.push.maxRetryTime=50 @@ -88,8 +89,6 @@ spring.boot.admin.client.url=http://127.0.0.1:9100 spring.boot.admin.client.username=ruoyi spring.boot.admin.client.password=123456 spring.boot.admin.client.instance.service-host-type=IP -spring.boot.admin.client.instance.metadata.username: ${spring.boot.admin.client.username} -spring.boot.admin.client.instance.metadata.userpassword: ${spring.boot.admin.client.password} ### Metrics for prometheus management.endpoints.web.exposure.include=* diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/banner.txt b/stwzhj-visual/stwzhj-nacos/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/banner.txt rename to stwzhj-visual/stwzhj-nacos/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/default-auth-plugin-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/default-control-plugin-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-auth-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-cmdb-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-config-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-config-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-config-plugin-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-consistency-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-control-plugin-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-core-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-core-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-core-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-istio-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-naming-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-persistence-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-prometheus-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar b/stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar rename to stwzhj-visual/stwzhj-nacos/src/main/resources/lib/nacos-sys-2.3.2.jar diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/bootstrap.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/bootstrap.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/bootstrap.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/bootstrap.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/codemirror.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/codemirror.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/codemirror.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/codemirror.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/console1412.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/console1412.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/console1412.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/console1412.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/font-awesome.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/font-awesome.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/font-awesome.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/font-awesome.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/aliyun-console-font.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/font_515771_emcns5054x3whfr.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-bold.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/fonts/roboto-regular.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/icon.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/icon.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/icon.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/icon.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/merge.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/merge.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/css/merge.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/css/merge.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/font_1533967_slipq25tezj.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-bold.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-light.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-medium.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-regular.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/fonts/roboto-thin.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.eot b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.eot similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.eot rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.eot diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.ttf b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.ttf similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.ttf rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.ttf diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff2 b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff2 rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/icons/icon-font.woff2 diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/black_dot.png b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/black_dot.png similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/black_dot.png rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/black_dot.png diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/favicon.ico b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/favicon.ico similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/favicon.ico rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/favicon.ico diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/logo-2000-390.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/logo-2000-390.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/logo-2000-390.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/logo-2000-390.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/nacos-logo.png b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/nacos-logo.png similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/nacos-logo.png rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/nacos-logo.png diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/nacos.png b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/nacos.png similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/img/nacos.png rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/img/nacos.png diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.fullscreen.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.fullscreen.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.fullscreen.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.fullscreen.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.json-lint.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.json-lint.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.json-lint.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.json-lint.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.lint.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.lint.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.lint.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.addone.lint.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.clike-lint.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.clike-lint.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.clike-lint.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.clike-lint.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.json-lint.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.json-lint.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.json-lint.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/codemirror.lib.json-lint.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/diff_match_patch.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/diff_match_patch.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/diff_match_patch.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/diff_match_patch.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/javascript.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/javascript.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/javascript.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/javascript.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/jquery.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/jquery.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/jquery.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/jquery.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/loader.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/loader.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/loader.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/loader.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/merge.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/merge.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/merge.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/merge.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/base/worker/workerMain.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/base/worker/workerMain.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/base/worker/workerMain.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/base/worker/workerMain.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/bat.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/bat.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/bat.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/bat.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/coffee.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/coffee.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/coffee.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/coffee.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/cpp.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/cpp.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/cpp.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/cpp.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/csharp.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/csharp.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/csharp.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/csharp.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/css.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/css.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/css.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/css.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/dockerfile.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/dockerfile.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/dockerfile.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/dockerfile.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/fsharp.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/fsharp.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/fsharp.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/fsharp.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/go.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/go.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/go.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/go.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/handlebars.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/handlebars.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/handlebars.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/handlebars.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/html.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/html.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/html.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/html.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ini.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ini.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ini.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ini.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/java.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/java.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/java.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/java.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/less.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/less.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/less.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/less.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/lua.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/lua.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/lua.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/lua.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/markdown.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/markdown.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/markdown.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/markdown.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/msdax.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/msdax.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/msdax.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/msdax.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/objective-c.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/objective-c.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/objective-c.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/objective-c.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/php.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/php.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/php.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/php.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/postiats.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/postiats.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/postiats.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/postiats.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/powershell.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/powershell.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/powershell.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/powershell.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/pug.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/pug.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/pug.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/pug.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/python.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/python.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/python.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/python.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/r.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/r.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/r.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/r.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/razor.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/razor.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/razor.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/razor.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ruby.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ruby.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ruby.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/ruby.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sb.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sb.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sb.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sb.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/scss.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/scss.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/scss.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/scss.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/solidity.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/solidity.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/solidity.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/solidity.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sql.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sql.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sql.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/sql.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/swift.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/swift.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/swift.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/swift.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/vb.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/vb.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/vb.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/vb.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/xml.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/xml.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/xml.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/xml.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/yaml.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/yaml.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/yaml.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/basic-languages/src/yaml.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_16x.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/contrib/suggest/browser/media/String_inverse_16x.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.de.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.de.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.de.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.de.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.es.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.es.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.es.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.es.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.fr.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.fr.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.fr.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.fr.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.hu.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.hu.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.hu.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.hu.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.it.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.it.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.it.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.it.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ja.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ja.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ja.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ja.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ko.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ko.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ko.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ko.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.pt-br.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.pt-br.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.pt-br.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.pt-br.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ru.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ru.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ru.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.ru.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.tr.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.tr.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.tr.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.tr.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-cn.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-cn.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-cn.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-cn.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-tw.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-tw.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-tw.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/editor.main.nls.zh-tw.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/editor/standalone/browser/quickOpen/symbol-sprite.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssMode.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssMode.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssMode.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssMode.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssWorker.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssWorker.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssWorker.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/css/cssWorker.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlMode.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlMode.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlMode.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlMode.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlWorker.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlWorker.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlWorker.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/html/htmlWorker.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonMode.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonMode.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonMode.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonMode.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonWorker.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonWorker.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonWorker.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/json/jsonWorker.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/lib/typescriptServices.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/lib/typescriptServices.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/lib/typescriptServices.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/lib/typescriptServices.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/mode.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/mode.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/mode.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/mode.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/worker.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/worker.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/worker.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/language/typescript/src/worker.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/loader.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/loader.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/vs/loader.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/vs/loader.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/xml.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/xml.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/console-ui/public/js/xml.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/console-ui/public/js/xml.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/css/main.css b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/css/main.css similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/css/main.css rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/css/main.css diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/black_dot.png b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/black_dot.png similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/black_dot.png rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/black_dot.png diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/logo-2000-390.svg b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/logo-2000-390.svg similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/logo-2000-390.svg rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/logo-2000-390.svg diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/nacos.png b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/nacos.png similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/img/nacos.png rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/img/nacos.png diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/index.html b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/index.html similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/index.html rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/index.html diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/js/main.js b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/js/main.js similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/js/main.js rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/js/main.js diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/static/login.html b/stwzhj-visual/stwzhj-nacos/src/main/resources/static/login.html similarity index 100% rename from ruoyi-visual/ruoyi-nacos/src/main/resources/static/login.html rename to stwzhj-visual/stwzhj-nacos/src/main/resources/static/login.html diff --git a/ruoyi-visual/ruoyi-seata-server/Dockerfile b/stwzhj-visual/stwzhj-seata-server/Dockerfile similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/Dockerfile rename to stwzhj-visual/stwzhj-seata-server/Dockerfile diff --git a/ruoyi-visual/ruoyi-seata-server/pom.xml b/stwzhj-visual/stwzhj-seata-server/pom.xml similarity index 97% rename from ruoyi-visual/ruoyi-seata-server/pom.xml rename to stwzhj-visual/stwzhj-seata-server/pom.xml index 3660f26e..31815f6f 100644 --- a/ruoyi-visual/ruoyi-seata-server/pom.xml +++ b/stwzhj-visual/stwzhj-seata-server/pom.xml @@ -19,11 +19,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-visual + stwzhj-visual ${revision} 4.0.0 - ruoyi-seata-server + stwzhj-seata-server jar diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/SeataServerApplication.java b/stwzhj-visual/stwzhj-seata-server/src/main/java/io/seata/server/SeataServerApplication.java similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/src/main/java/io/seata/server/SeataServerApplication.java rename to stwzhj-visual/stwzhj-seata-server/src/main/java/io/seata/server/SeataServerApplication.java diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml b/stwzhj-visual/stwzhj-seata-server/src/main/resources/application.yml similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/src/main/resources/application.yml rename to stwzhj-visual/stwzhj-seata-server/src/main/resources/application.yml diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/banner.txt b/stwzhj-visual/stwzhj-seata-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/src/main/resources/banner.txt rename to stwzhj-visual/stwzhj-seata-server/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-common.xml b/stwzhj-visual/stwzhj-seata-server/src/main/resources/logback-common.xml similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-common.xml rename to stwzhj-visual/stwzhj-seata-server/src/main/resources/logback-common.xml diff --git a/ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml b/stwzhj-visual/stwzhj-seata-server/src/main/resources/logback-spring.xml similarity index 100% rename from ruoyi-visual/ruoyi-seata-server/src/main/resources/logback-spring.xml rename to stwzhj-visual/stwzhj-seata-server/src/main/resources/logback-spring.xml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile b/stwzhj-visual/stwzhj-sentinel-dashboard/Dockerfile similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile rename to stwzhj-visual/stwzhj-sentinel-dashboard/Dockerfile diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml b/stwzhj-visual/stwzhj-sentinel-dashboard/pom.xml similarity index 97% rename from ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml rename to stwzhj-visual/stwzhj-sentinel-dashboard/pom.xml index 3b064aa4..87edbf5e 100644 --- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml +++ b/stwzhj-visual/stwzhj-sentinel-dashboard/pom.xml @@ -5,11 +5,11 @@ org.dromara - ruoyi-visual + stwzhj-visual ${revision} - ruoyi-sentinel-dashboard + stwzhj-sentinel-dashboard jar @@ -51,7 +51,7 @@ org.dromara - ruoyi-common-nacos + stwzhj-common-nacos diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/DashboardApplication.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthAction.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthService.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/AuthorizationInterceptor.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultAuthorizationInterceptor.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultAuthorizationInterceptor.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultAuthorizationInterceptor.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultAuthorizationInterceptor.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultLoginAuthenticationFilter.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultLoginAuthenticationFilter.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultLoginAuthenticationFilter.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/DefaultLoginAuthenticationFilter.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/FakeAuthServiceImpl.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/LoginAuthenticationFilter.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/auth/SimpleWebAuthServiceImpl.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandFailedException.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/CommandNotFoundException.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/client/SentinelApiClient.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthConfiguration.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthConfiguration.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthConfiguration.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthConfiguration.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthProperties.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthProperties.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthProperties.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/AuthProperties.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/DashboardConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/config/WebConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AppController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/AuthorityRuleController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DegradeController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/DemoController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/FlowControllerV1.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MetricController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ParamFlowRuleController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/ResourceController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/SystemController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/VersionController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterAssignController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/cluster/ClusterConfigController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayApiController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/gateway/GatewayFlowRuleController.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/v2/FlowControllerV2.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/ApplicationEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MachineEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/MetricPositionEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/SentinelVersion.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiDefinitionEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/ApiPredicateItemEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayFlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/gateway/GatewayParamFlowItemEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AbstractRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/AuthorityRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/DegradeRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/FlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/ParamFlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/RuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/datasource/entity/rule/SystemRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppInfo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/AppManagement.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineDiscovery.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/MachineInfo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/discovery/SimpleMachineDiscovery.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/ResourceTreeNode.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/Result.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppAssignResultVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppFullAssignRequest.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterAppSingleServerAssignRequest.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterClientInfoVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterGroupEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ClusterStateSingleVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionDescriptorVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/ConnectionGroupVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ClusterClientConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerFlowConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/config/ServerTransportConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterAppAssignMap.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterClientModifyRequest.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterModifyRequest.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/request/ClusterServerModifyRequest.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterClientStateWrapVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/AppClusterServerStateWrapVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterClientStateVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterRequestLimitVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterServerStateVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterStateSimpleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStatePairVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/cluster/state/ClusterUniversalStateVO.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MachineInfoVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/MetricVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/ResourceVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/AddApiReqVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/ApiPredicateItemVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/api/UpdateApiReqVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/AddFlowRuleReqVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/GatewayParamFlowItemVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/domain/vo/gateway/rule/UpdateFlowRuleReqVo.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/ApplicationEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/ApplicationEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/ApplicationEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/ApplicationEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MachineEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MachineEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MachineEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MachineEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricPositionEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricPositionEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricPositionEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/MetricPositionEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/SentinelVersion.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/SentinelVersion.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/SentinelVersion.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/SentinelVersion.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiDefinitionEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiDefinitionEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiDefinitionEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiDefinitionEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiPredicateItemEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiPredicateItemEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiPredicateItemEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/ApiPredicateItemEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayFlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayFlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayFlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayFlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayParamFlowItemEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayParamFlowItemEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayParamFlowItemEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/gateway/GatewayParamFlowItemEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AbstractRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AbstractRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AbstractRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AbstractRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AuthorityRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AuthorityRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AuthorityRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/AuthorityRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/DegradeRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/DegradeRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/DegradeRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/DegradeRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/FlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/FlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/FlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/FlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/ParamFlowRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/ParamFlowRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/ParamFlowRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/ParamFlowRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/RuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/RuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/RuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/RuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/SystemRuleEntity.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/SystemRuleEntity.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/SystemRuleEntity.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/entity/rule/SystemRuleEntity.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/ActuatorAuthFilter.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/filter/SecurityConfig.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/metric/MetricFetcher.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemApiDefinitionStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/gateway/InMemGatewayFlowRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/InMemoryMetricsRepository.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/metric/MetricsRepository.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemAuthorityRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemDegradeRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemFlowRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemParamFlowRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemSystemRuleStore.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/InMemoryRuleRepositoryAdapter.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/repository/rule/RuleRepository.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRuleProvider.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/DynamicRulePublisher.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiProvider.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/rule/FlowRuleApiPublisher.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignService.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterAssignServiceImpl.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/service/ClusterConfigService.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/AsyncUtils.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/ClusterEntityUtils.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/MachineUtils.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/util/VersionUtils.java diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/application.yml similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/application.yml rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/application.yml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/banner.txt b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/banner.txt rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-common.xml b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/logback-common.xml similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-common.xml rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/logback-common.xml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-plus.xml b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/resources/logback-plus.xml rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/resources/logback-plus.xml diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/.gitignore b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/.gitignore similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/.gitignore rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/.gitignore diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/.jshintrc b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/.jshintrc similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/.jshintrc rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/.jshintrc diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/README.md b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/README.md similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/README.md rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/README.md diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/README_zh.md b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/README_zh.md similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/README_zh.md rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/README_zh.md diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/app.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/authority.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_assign_manage.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_list.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_manage.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_server_monitor.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_app_token_client_list.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/cluster_single.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/degrade.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v1.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/flow_v2.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/api.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/flow.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/gateway/identity.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/home.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/home.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/home.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/home.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/identity.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/login.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/machine.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/machine.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/machine.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/machine.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/main.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/main.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/main.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/main.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/metric.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/param_flow.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/controllers/system.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/header/header.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar-search/sidebar-search.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/directives/sidebar/sidebar.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/filters/filters.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/filters/filters.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/filters/filters.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/filters/filters.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/libs/treeTable.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/libs/treeTable.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/libs/treeTable.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/libs/treeTable.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/appservice.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/appservice.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/appservice.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/appservice.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/auth_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/authority_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/cluster_state_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/degrade_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v1.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v1.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v1.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v1.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v2.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v2.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v2.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/flow_service_v2.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/api_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/gateway/flow_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/identityservice.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/identityservice.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/identityservice.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/identityservice.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/machineservice.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/machineservice.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/machineservice.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/machineservice.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/metricservice.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/metricservice.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/metricservice.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/metricservice.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/param_flow_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/systemservice.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/systemservice.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/systemservice.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/systemservice.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/scripts/services/version_service.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/main.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/main.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/main.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/main.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/page.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/page.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/page.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/page.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/timeline.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/timeline.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/styles/timeline.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/styles/timeline.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/authority.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/client.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster/server.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_assign_manage.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_client_list.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_list.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_app_server_overview.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_single_config.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_single_config.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_single_config.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/cluster_single_config.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/home.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/home.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/home.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/home.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/main.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/main.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/main.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dashboard/main.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/degrade.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/authority-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-client-config-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-client-config-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-client-config-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-client-config-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-assign-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/cluster/cluster-server-connection-detail-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/confirm-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/confirm-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/confirm-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/confirm-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/degrade-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/flow-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/api-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/gateway/flow-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/param-flow-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/param-flow-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/param-flow-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/param-flow-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/system-rule-dialog.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/system-rule-dialog.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/system-rule-dialog.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/dialog/system-rule-dialog.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v1.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v1.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v1.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v1.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v2.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v2.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v2.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/flow_v2.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/api.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/api.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/api.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/api.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/flow.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/flow.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/flow.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/flow.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/identity.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/identity.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/identity.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/gateway/identity.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/identity.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/identity.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/identity.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/identity.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/login.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/login.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/login.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/login.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/machine.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/machine.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/machine.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/machine.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/metric.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/metric.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/metric.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/metric.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/pagination.tpl.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/pagination.tpl.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/pagination.tpl.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/pagination.tpl.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/param_flow.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/param_flow.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/param_flow.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/param_flow.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/system.html b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/system.html similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/app/views/system.html rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/app/views/system.html diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/assets/img/sentinel-logo.png b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/assets/img/sentinel-logo.png similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/assets/img/sentinel-logo.png rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/assets/img/sentinel-logo.png diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/css/app.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/css/app.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/css/app.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/css/app.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/js/app.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/js/app.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/js/app.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/js/app.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/js/app.vendor.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/js/app.vendor.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/dist/js/app.vendor.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/dist/js/app.vendor.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/gulpfile.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/gulpfile.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/gulpfile.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/gulpfile.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/index.htm b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/index.htm similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/index.htm rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/index.htm diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/index_dev.htm b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/index_dev.htm similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/index_dev.htm rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/index_dev.htm diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/css/bootstrap.min.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/css/bootstrap.min.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/css/bootstrap.min.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/css/bootstrap.min.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/css/font-awesome.min.css b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/css/font-awesome.min.css similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/css/font-awesome.min.css rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/css/font-awesome.min.css diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.ttf b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.ttf similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.ttf rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.ttf diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff2 b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff2 similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff2 rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/fontawesome-webfont.woff2 diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.ttf b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.ttf rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.ttf diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.woff b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.woff rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/fonts/glyphicons-halflings-regular.woff diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/angular.min.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/angular.min.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/angular.min.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/angular.min.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/bootstrap.min.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/bootstrap.min.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/bootstrap.min.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/bootstrap.min.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/g2.min.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/g2.min.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/g2.min.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/g2.min.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/jquery.min.js b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/jquery.min.js similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/lib/js/jquery.min.js rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/lib/js/jquery.min.js diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/license-stat.csv b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/license-stat.csv similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/license-stat.csv rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/license-stat.csv diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package-lock.json b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/package-lock.json similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package-lock.json rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/package-lock.json diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/package.json similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/package.json diff --git a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/static/favicon.ico b/stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/static/favicon.ico similarity index 100% rename from ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/static/favicon.ico rename to stwzhj-visual/stwzhj-sentinel-dashboard/src/main/webapp/resources/static/favicon.ico diff --git a/ruoyi-visual/ruoyi-snailjob-server/Dockerfile b/stwzhj-visual/stwzhj-snailjob-server/Dockerfile similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/Dockerfile rename to stwzhj-visual/stwzhj-snailjob-server/Dockerfile diff --git a/ruoyi-visual/ruoyi-snailjob-server/pom.xml b/stwzhj-visual/stwzhj-snailjob-server/pom.xml similarity index 92% rename from ruoyi-visual/ruoyi-snailjob-server/pom.xml rename to stwzhj-visual/stwzhj-snailjob-server/pom.xml index 0cdaa547..f99f443e 100644 --- a/ruoyi-visual/ruoyi-snailjob-server/pom.xml +++ b/stwzhj-visual/stwzhj-snailjob-server/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-visual + stwzhj-visual ${revision} 4.0.0 jar - ruoyi-snailjob-server + stwzhj-snailjob-server @@ -32,7 +32,7 @@ org.dromara - ruoyi-common-nacos + stwzhj-common-nacos diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/ActuatorAuthFilter.java b/stwzhj-visual/stwzhj-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/ActuatorAuthFilter.java similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/ActuatorAuthFilter.java rename to stwzhj-visual/stwzhj-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/ActuatorAuthFilter.java diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/SecurityConfig.java b/stwzhj-visual/stwzhj-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/SecurityConfig.java similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/SecurityConfig.java rename to stwzhj-visual/stwzhj-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/config/SecurityConfig.java diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/stwzhj-visual/stwzhj-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java rename to stwzhj-visual/stwzhj-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/resources/application.yml b/stwzhj-visual/stwzhj-snailjob-server/src/main/resources/application.yml similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/resources/application.yml rename to stwzhj-visual/stwzhj-snailjob-server/src/main/resources/application.yml diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/resources/banner.txt b/stwzhj-visual/stwzhj-snailjob-server/src/main/resources/banner.txt similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/resources/banner.txt rename to stwzhj-visual/stwzhj-snailjob-server/src/main/resources/banner.txt diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-common.xml b/stwzhj-visual/stwzhj-snailjob-server/src/main/resources/logback-common.xml similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-common.xml rename to stwzhj-visual/stwzhj-snailjob-server/src/main/resources/logback-common.xml diff --git a/ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/stwzhj-visual/stwzhj-snailjob-server/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-visual/ruoyi-snailjob-server/src/main/resources/logback-plus.xml rename to stwzhj-visual/stwzhj-snailjob-server/src/main/resources/logback-plus.xml