省厅位置汇聚初次上传

pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.dromara</groupId>
-    <artifactId>ruoyi-cloud-plus</artifactId>
+    <artifactId>stwzhj-cloud-plus</artifactId>
     <version>${revision}</version>
 
-    <name>RuoYi-Cloud-Plus</name>
+    <name>Stwzhj-Cloud-Plus</name>
-    <url>https://gitee.com/dromara/RuoYi-Cloud-Plus</url>
+    <url>https://gitee.com/dromara/stwzhj-Cloud-Plus</url>
-    <description>RuoYi-Cloud-Plus微服务系统</description>
+    <description>Stwzhj-Cloud-Plus微服务系统</description>
 
     <properties>
         <revision>2.2.2</revision>
@@ -115,7 +115,7 @@
             <!-- SpringCloud Alibaba 微服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-alibaba-bom</artifactId>
+                <artifactId>stwzhj-common-alibaba-bom</artifactId>
                 <version>${revision}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -149,7 +149,7 @@
             <!-- common 的依赖配置-->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-bom</artifactId>
+                <artifactId>stwzhj-common-bom</artifactId>
                 <version>${revision}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -158,7 +158,7 @@
             <!-- api 的依赖配置-->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-api-bom</artifactId>
+                <artifactId>stwzhj-api-bom</artifactId>
                 <version>${revision}</version>
                 <type>pom</type>
                 <scope>import</scope>
@@ -375,13 +375,13 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-auth</module>
+        <module>stwzhj-auth</module>
-        <module>ruoyi-gateway</module>
+        <module>stwzhj-gateway</module>
-        <module>ruoyi-visual</module>
+        <module>stwzhj-visual</module>
-        <module>ruoyi-modules</module>
+        <module>stwzhj-modules</module>
-        <module>ruoyi-api</module>
+        <module>stwzhj-api</module>
-        <module>ruoyi-common</module>
+        <module>stwzhj-common</module>
-        <module>ruoyi-example</module>
+        <module>stwzhj-example</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-common/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <modules>
-        <module>ruoyi-common-bom</module>
-        <module>ruoyi-common-alibaba-bom</module>
-        <module>ruoyi-common-log</module>
-        <module>ruoyi-common-dict</module>
-        <module>ruoyi-common-excel</module>
-        <module>ruoyi-common-core</module>
-        <module>ruoyi-common-redis</module>
-        <module>ruoyi-common-doc</module>
-        <module>ruoyi-common-security</module>
-        <module>ruoyi-common-satoken</module>
-        <module>ruoyi-common-web</module>
-        <module>ruoyi-common-mybatis</module>
-        <module>ruoyi-common-job</module>
-        <module>ruoyi-common-dubbo</module>
-        <module>ruoyi-common-seata</module>
-        <module>ruoyi-common-loadbalancer</module>
-        <module>ruoyi-common-oss</module>
-        <module>ruoyi-common-ratelimiter</module>
-        <module>ruoyi-common-idempotent</module>
-        <module>ruoyi-common-mail</module>
-        <module>ruoyi-common-sms</module>
-        <module>ruoyi-common-logstash</module>
-        <module>ruoyi-common-elasticsearch</module>
-        <module>ruoyi-common-sentinel</module>
-        <module>ruoyi-common-skylog</module>
-        <module>ruoyi-common-prometheus</module>
-        <module>ruoyi-common-translation</module>
-        <module>ruoyi-common-sensitive</module>
-        <module>ruoyi-common-json</module>
-        <module>ruoyi-common-encrypt</module>
-        <module>ruoyi-common-tenant</module>
-        <module>ruoyi-common-websocket</module>
-        <module>ruoyi-common-social</module>
-        <module>ruoyi-common-nacos</module>
-        <module>ruoyi-common-bus</module>
-        <module>ruoyi-common-sse</module>
-    </modules>
-
-    <artifactId>ruoyi-common</artifactId>
-    <packaging>pom</packaging>
-
-    <description>
-        ruoyi-common通用模块
-    </description>
-
-</project>

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.system.mapper.SysDeptMapper">
-
-    <resultMap type="org.dromara.system.domain.vo.SysDeptVo" id="SysDeptResult">
-    </resultMap>
-
-    <select id="selectDeptList" resultMap="SysDeptResult">
-        select
-        <if test="ew.getSqlSelect != null">
-            ${ew.getSqlSelect}
-        </if>
-        <if test="ew.getSqlSelect == null">
-            *
-        </if>
-        from sys_dept ${ew.getCustomSqlSegment}
-    </select>
-
-    <select id="countDeptById" resultType="Long">
-        select count(*) from sys_dept where del_flag = '0' and dept_id = #{deptId}
-    </select>
-
-    <select id="selectDeptListByRoleId" resultType="Long">
-        select d.dept_id
-        from sys_dept d
-            left join sys_role_dept rd on d.dept_id = rd.dept_id
-        where rd.role_id = #{roleId}
-            <if test="deptCheckStrictly">
-                and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
-            </if>
-        order by d.parent_id, d.order_num
-    </select>
-
-</mapper>

ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/ActuatorAuthFilter.java

@@ -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() {
-    }
-
-}

ruoyi-visual/ruoyi-nacos/src/main/java/com/alibaba/nacos/config/SecurityConfig.java

@@ -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<ActuatorAuthFilter> actuatorFilterRegistrationBean() {
-        FilterRegistrationBean<ActuatorAuthFilter> registrationBean = new FilterRegistrationBean<>();
-        registrationBean.setFilter(new ActuatorAuthFilter(username, password));
-        registrationBean.addUrlPatterns("/actuator", "/actuator/**");
-        return registrationBean;
-    }
-
-}

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-cloud-plus</artifactId>
+        <artifactId>stwzhj-cloud-plus</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <modules>
-        <module>ruoyi-api-bom</module>
+        <module>stwzhj-api-bom</module>
-        <module>ruoyi-api-system</module>
+        <module>stwzhj-api-system</module>
-        <module>ruoyi-api-resource</module>
+        <module>stwzhj-api-resource</module>
-        <module>ruoyi-api-workflow</module>
+        <module>stwzhj-api-workflow</module>
+        <module>stwzhj-api-data2es</module>
     </modules>
 
-    <artifactId>ruoyi-api</artifactId>
+    <artifactId>stwzhj-api</artifactId>
     <packaging>pom</packaging>
 
     <description>
-        ruoyi-api系统接口
+        stwzhj-api系统接口
     </description>
 
 </project>

stwzhj-api/stwzhj-api-bom/pom.xml

@@ -6,12 +6,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.dromara</groupId>
-    <artifactId>ruoyi-api-bom</artifactId>
+    <artifactId>stwzhj-api-bom</artifactId>
     <packaging>pom</packaging>
     <version>${revision}</version>
 
     <description>
-        ruoyi-api-bom api依赖项
+        stwzhj-api-bom api依赖项
     </description>
 
     <properties>
@@ -23,21 +23,27 @@
             <!-- 系统接口 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-api-system</artifactId>
+                <artifactId>stwzhj-api-system</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 资源服务接口 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-api-resource</artifactId>
+                <artifactId>stwzhj-api-resource</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- workflow接口 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-api-workflow</artifactId>
+                <artifactId>stwzhj-api-workflow</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>stwzhj-api-data2es</artifactId>
                 <version>${revision}</version>
             </dependency>
 

stwzhj-api/stwzhj-api-data2es/pom.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>stwzhj-api</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>stwzhj-api-data2es</artifactId>
+
+    <description>
+        stwzhj-api-data2es数据处理接口模块
+    </description>
+
+    <dependencies>
+
+        <!-- stwzhj Common Core-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>stwzhj-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>stwzhj-common-excel</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

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<RemoteGpsInfo> gpsInfoList);
+}

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;
+
+/**
+ * <p>description: </p>
+ *
+ * @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;
+}

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-api</artifactId>
+        <artifactId>stwzhj-api</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-api-resource</artifactId>
+    <artifactId>stwzhj-api-resource</artifactId>
 
     <description>
-        ruoyi-api-resource 资源服务接口模块
+        stwzhj-api-resource 资源服务接口模块
     </description>
 
     <dependencies>
 
-        <!-- RuoYi Common Core-->
+        <!-- stwzhj Common Core-->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <artifactId>stwzhj-common-core</artifactId>
         </dependency>
 
     </dependencies>

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-api</artifactId>
+        <artifactId>stwzhj-api</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-api-system</artifactId>
+    <artifactId>stwzhj-api-system</artifactId>
 
     <description>
-        ruoyi-api-system系统接口模块
+        stwzhj-api-system系统接口模块
     </description>
 
     <dependencies>
 
-        <!-- RuoYi Common Core-->
+        <!-- stwzhj Common Core-->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <artifactId>stwzhj-common-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-excel</artifactId>
+            <artifactId>stwzhj-common-excel</artifactId>
         </dependency>
 
     </dependencies>

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);
 
 }

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<RemoteDeviceBo> boList);
+
+    R pageDeviceList(RemoteDeviceBo bo);
+
+    List<RemoteDeviceVo> deviceList(RemoteDeviceBo bo);
+
+    R saveDeviceToSt(String infoSource, List<RemoteDeviceBo> list);
+
+}

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;
+
+}

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<RemoteDeviceBo> deviceBoList;
+
+}

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;
+}

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;
 
     /**
      * 部门类别编码

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-api</artifactId>
+        <artifactId>stwzhj-api</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-api-workflow</artifactId>
+    <artifactId>stwzhj-api-workflow</artifactId>
 
     <description>
-        ruoyi-api-workflow 工作流接口模块
+        stwzhj-api-workflow 工作流接口模块
     </description>
 
     <dependencies>
 
-        <!-- RuoYi Common Core-->
+        <!-- stwzhj Common Core-->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <artifactId>stwzhj-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-bus</artifactId>
+            <artifactId>stwzhj-common-bus</artifactId>
         </dependency>
 
     </dependencies>

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-cloud-plus</artifactId>
+        <artifactId>stwzhj-cloud-plus</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-auth</artifactId>
+    <artifactId>stwzhj-auth</artifactId>
 
     <description>
-        ruoyi-auth 认证授权中心
+        stwzhj-auth 认证授权中心
     </description>
 
     <dependencies>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-nacos</artifactId>
+            <artifactId>stwzhj-common-nacos</artifactId>
         </dependency>
 
         <dependency>
@@ -28,86 +28,86 @@
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-sentinel</artifactId>
+            <artifactId>stwzhj-common-sentinel</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Security-->
+        <!-- stwzhj Common Security-->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-security</artifactId>
+            <artifactId>stwzhj-common-security</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-social</artifactId>
+            <artifactId>stwzhj-common-social</artifactId>
         </dependency>
 
-        <!-- RuoYi Common Log -->
+        <!-- stwzhj Common Log -->
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-log</artifactId>
+            <artifactId>stwzhj-common-log</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-doc</artifactId>
+            <artifactId>stwzhj-common-doc</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-web</artifactId>
+            <artifactId>stwzhj-common-web</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-ratelimiter</artifactId>
+            <artifactId>stwzhj-common-ratelimiter</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-encrypt</artifactId>
+            <artifactId>stwzhj-common-encrypt</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-dubbo</artifactId>
+            <artifactId>stwzhj-common-dubbo</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-seata</artifactId>
+            <artifactId>stwzhj-common-seata</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-common-tenant</artifactId>
+            <artifactId>stwzhj-common-tenant</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
-            <artifactId>ruoyi-api-resource</artifactId>
+            <artifactId>stwzhj-api-resource</artifactId>
         </dependency>
 
         <!-- 自定义负载均衡(多团队开发使用) -->
 <!--        <dependency>-->
 <!--            <groupId>org.dromara</groupId>-->
-<!--            <artifactId>ruoyi-common-loadbalancer</artifactId>-->
+<!--            <artifactId>stwzhj-common-loadbalancer</artifactId>-->
 <!--        </dependency>-->
 
         <!-- ELK 日志收集 -->
 <!--        <dependency>-->
 <!--            <groupId>org.dromara</groupId>-->
-<!--            <artifactId>ruoyi-common-logstash</artifactId>-->
+<!--            <artifactId>stwzhj-common-logstash</artifactId>-->
 <!--        </dependency>-->
 
         <!-- skywalking 日志收集 -->
 <!--        <dependency>-->
 <!--            <groupId>org.dromara</groupId>-->
-<!--            <artifactId>ruoyi-common-skylog</artifactId>-->
+<!--            <artifactId>stwzhj-common-skylog</artifactId>-->
 <!--        </dependency>-->
 
         <!-- prometheus 监控 -->
 <!--        <dependency>-->
 <!--            <groupId>org.dromara</groupId>-->
-<!--            <artifactId>ruoyi-common-prometheus</artifactId>-->
+<!--            <artifactId>stwzhj-common-prometheus</artifactId>-->
 <!--        </dependency>-->
 
     </dependencies>

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<LoginVo> 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);
+    }
+
+
+
     /**
      * 第三方登录请求
      *

stwzhj-auth/src/main/resources/application.yml

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: ruoyi-auth
+    name: stwzhj-auth
   profiles:
     # 环境配置
     active: @profiles.active@

stwzhj-auth/src/main/resources/banner.txt

@@ -1,10 +1,10 @@
-Spring Boot Version: ${spring-boot.version}
+Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
+Spring Application Name: ${spring.application.name}
-                            _                        _    _     
+                            _                        _    _     
-                           (_)                      | |  | |    
+                           (_)                      | |  | |    
- _ __  _   _   ___   _   _  _  ______   __ _  _   _ | |_ | |__  
+ _ __  _   _   ___   _   _  _  ______   __ _  _   _ | |_ | |__  
-| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ 
+| '__|| | | | / _ \ | | | || ||______| / _` || | | || __|| '_ \ 
-| |   | |_| || (_) || |_| || |        | (_| || |_| || |_ | | | |
+| |   | |_| || (_) || |_| || |        | (_| || |_| || |_ | | | |
-|_|    \__,_| \___/  \__, ||_|         \__,_| \__,_| \__||_| |_|
+|_|    \__,_| \___/  \__, ||_|         \__,_| \__,_| \__||_| |_|
-                      __/ |                                     
+                      __/ |                                     
                      |___/                                      

stwzhj-common/pom.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>stwzhj-cloud-plus</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+        <module>stwzhj-common-bom</module>
+        <module>stwzhj-common-alibaba-bom</module>
+        <module>stwzhj-common-log</module>
+        <module>stwzhj-common-dict</module>
+        <module>stwzhj-common-excel</module>
+        <module>stwzhj-common-core</module>
+        <module>stwzhj-common-redis</module>
+        <module>stwzhj-common-doc</module>
+        <module>stwzhj-common-security</module>
+        <module>stwzhj-common-satoken</module>
+        <module>stwzhj-common-web</module>
+        <module>stwzhj-common-mybatis</module>
+        <module>stwzhj-common-job</module>
+        <module>stwzhj-common-dubbo</module>
+        <module>stwzhj-common-seata</module>
+        <module>stwzhj-common-loadbalancer</module>
+        <module>stwzhj-common-oss</module>
+        <module>stwzhj-common-ratelimiter</module>
+        <module>stwzhj-common-idempotent</module>
+        <module>stwzhj-common-mail</module>
+        <module>stwzhj-common-sms</module>
+        <module>stwzhj-common-logstash</module>
+        <module>stwzhj-common-elasticsearch</module>
+        <module>stwzhj-common-sentinel</module>
+        <module>stwzhj-common-skylog</module>
+        <module>stwzhj-common-prometheus</module>
+        <module>stwzhj-common-translation</module>
+        <module>stwzhj-common-sensitive</module>
+        <module>stwzhj-common-json</module>
+        <module>stwzhj-common-encrypt</module>
+        <module>stwzhj-common-tenant</module>
+        <module>stwzhj-common-websocket</module>
+        <module>stwzhj-common-social</module>
+        <module>stwzhj-common-nacos</module>
+        <module>stwzhj-common-bus</module>
+        <module>stwzhj-common-sse</module>
+    </modules>
+
+    <artifactId>stwzhj-common</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        stwzhj-common通用模块
+    </description>
+
+</project>

stwzhj-common/stwzhj-common-alibaba-bom/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.dromara</groupId>
-    <artifactId>ruoyi-common-alibaba-bom</artifactId>
+    <artifactId>stwzhj-common-alibaba-bom</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
     <description>
-        ruoyi-common-alibaba-bom alibaba依赖项
+        stwzhj-common-alibaba-bom alibaba依赖项
     </description>
 
     <properties>

stwzhj-common/stwzhj-common-bom/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.dromara</groupId>
-    <artifactId>ruoyi-common-bom</artifactId>
+    <artifactId>stwzhj-common-bom</artifactId>
     <version>${revision}</version>
     <packaging>pom</packaging>
 
     <description>
-        ruoyi-common-bom common依赖项
+        stwzhj-common-bom common依赖项
     </description>
 
     <properties>
@@ -22,238 +22,238 @@
             <!-- 核心模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-core</artifactId>
+                <artifactId>stwzhj-common-core</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 接口模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-doc</artifactId>
+                <artifactId>stwzhj-common-doc</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 安全模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-security</artifactId>
+                <artifactId>stwzhj-common-security</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 权限认证服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-satoken</artifactId>
+                <artifactId>stwzhj-common-satoken</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 日志记录 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-log</artifactId>
+                <artifactId>stwzhj-common-log</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 字典 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-dict</artifactId>
+                <artifactId>stwzhj-common-dict</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- excel -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-excel</artifactId>
+                <artifactId>stwzhj-common-excel</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 缓存服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-redis</artifactId>
+                <artifactId>stwzhj-common-redis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- web服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-web</artifactId>
+                <artifactId>stwzhj-common-web</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据库服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-mybatis</artifactId>
+                <artifactId>stwzhj-common-mybatis</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 定时任务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-job</artifactId>
+                <artifactId>stwzhj-common-job</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- RPC服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-dubbo</artifactId>
+                <artifactId>stwzhj-common-dubbo</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 分布式事务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-seata</artifactId>
+                <artifactId>stwzhj-common-seata</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 自定义负载均衡 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-loadbalancer</artifactId>
+                <artifactId>stwzhj-common-loadbalancer</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- oss服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-oss</artifactId>
+                <artifactId>stwzhj-common-oss</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 限流功能 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-ratelimiter</artifactId>
+                <artifactId>stwzhj-common-ratelimiter</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 幂等功能 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-idempotent</artifactId>
+                <artifactId>stwzhj-common-idempotent</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 邮件模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-mail</artifactId>
+                <artifactId>stwzhj-common-mail</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 短信模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sms</artifactId>
+                <artifactId>stwzhj-common-sms</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- logstash日志推送模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-logstash</artifactId>
+                <artifactId>stwzhj-common-logstash</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- ES搜索引擎服务 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-elasticsearch</artifactId>
+                <artifactId>stwzhj-common-elasticsearch</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 限流模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sentinel</artifactId>
+                <artifactId>stwzhj-common-sentinel</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- skywalking日志收集模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-skylog</artifactId>
+                <artifactId>stwzhj-common-skylog</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- prometheus监控 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-prometheus</artifactId>
+                <artifactId>stwzhj-common-prometheus</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 通用翻译功能 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-translation</artifactId>
+                <artifactId>stwzhj-common-translation</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 脱敏模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sensitive</artifactId>
+                <artifactId>stwzhj-common-sensitive</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 序列化模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-json</artifactId>
+                <artifactId>stwzhj-common-json</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 数据加解密模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-encrypt</artifactId>
+                <artifactId>stwzhj-common-encrypt</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 租户模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-tenant</artifactId>
+                <artifactId>stwzhj-common-tenant</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- websocket模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-websocket</artifactId>
+                <artifactId>stwzhj-common-websocket</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 授权认证 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-social</artifactId>
+                <artifactId>stwzhj-common-social</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 配置中心 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-nacos</artifactId>
+                <artifactId>stwzhj-common-nacos</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- 消息总线模块 -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-bus</artifactId>
+                <artifactId>stwzhj-common-bus</artifactId>
                 <version>${revision}</version>
             </dependency>
 
             <!-- sse -->
             <dependency>
                 <groupId>org.dromara</groupId>
-                <artifactId>ruoyi-common-sse</artifactId>
+                <artifactId>stwzhj-common-sse</artifactId>
                 <version>${revision}</version>
             </dependency>
 

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-common</artifactId>
+        <artifactId>stwzhj-common</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common-bus</artifactId>
+    <artifactId>stwzhj-common-bus</artifactId>
 
     <description>
-        ruoyi-common-bus 消息总线模块
+        stwzhj-common-bus 消息总线模块
     </description>
 
     <dependencies>

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">
     <parent>
         <groupId>org.dromara</groupId>
-        <artifactId>ruoyi-common</artifactId>
+        <artifactId>stwzhj-common</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-common-core</artifactId>
+    <artifactId>stwzhj-common-core</artifactId>
 
     <description>
-        ruoyi-common-core 核心模块
+        stwzhj-common-core 核心模块
     </description>
 
     <dependencies>

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";
 
 }