Skip to content

Administrator / framework-tools

Go to a project
Commit 1842f403 by henry
Options

优化目录结构

1 parent efeba8b5
Expand all
Inline Side-by-side
Showing with 159 additions and 156 deletions
README.md
# 1.微服务 # 1.微服务
## 1.1 arch-overall 总体架构微服务 ## 1.1 arch-overall 总体架构微服务
## 1.2 arch-clouds （微服务组件-在线文档、文件存储、日志管理等） ## 1.2 arch-clouds （微服务组件-在线文档、文件存储、日志管理等）
### 1.2.1 log （记录日志微服务） ### 1.2.1 common（数据传输对象dto、视图对象vo）
### 1.2.2 mybatis (mybatis相关配置) ### 1.2.2 filter (过滤器-处理sql注入、xss跨站脚本攻击)
### 1.2.3 office (在线文档编辑) ### 1.2.3 log （记录日志微服务）
### 1.2.4 mybatis (mybatis相关配置)
### 1.2.5 office (在线文档编辑)
### 1.2.6 storage (对象存储服务)
### 1.2.7 nacos (nacos组件，后期可对nacos账号进行加密)
### 1.2.X （其他组件可在改包下面添加） ### 1.2.X （其他组件可在改包下面添加）
## 1.3 arch-system （系统架构微服务） ## 1.3 arch-system （系统架构微服务）
## 1.4 arch-overall （总体架构微服务） ## 1.4 arch-analysis （综合分析）
## 1.5 arch-analysis （综合分析） ## 1.5 system-manage 系统管理微服务（字典管理、菜单管理、用户及组织管理）
## 1.6 system-manage 系统管理微服务（字典管理、菜单管理、用户及组织管理） ## 1.6 arch-gateway
## 1.7 arch-gateway ## 1.7 arch-base 基础服务-包括工具类、枚举类
## 1.8 arch-base 基础服务-包括工具类-及对象实体
# <span style="color: red;">*************重要***********</span> # <span style="color: red;">*************重要***********</span>
## vo（View Object）：视图对象，用于展示层 ## vo（View Object）：视图对象，用于展示层
## dto（Data Transfer Object）：数据传输对象 ## dto（Data Transfer Object）：数据传输对象
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AdsParserContentDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AdsParserContentDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiConRequireDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppArchiConRequireDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiConRequireReviewDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppArchiConRequireReviewDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppArchiPostilReqDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppArchiPostilReqDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/AppInfoDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/AppInfoDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityAssetsDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsQryReqDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityAssetsQryReqDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityAssetsReqDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityAssetsReqDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInveStatReqDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInveStatReqDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInveStatResDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInveStatResDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryAppDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryAppDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryBusDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryBusDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryDataDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryDataDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryReqDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryReqDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryResDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryResDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAbilityInventoryTecDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAbilityInventoryTecDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetCommonDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetCommonDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEleRelaAddAndUpdateDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetEleRelaAddAndUpdateDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEleRelaQueryDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetEleRelaQueryDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetEvolutionRoadmapDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetEvolutionRoadmapDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetExtendDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetExtendDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetFrameworkDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetFrameworkDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetInfoDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetInfoDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetNowDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetNowDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetVisalDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetVisalDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetsRelationDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetsRelationDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiAssetsRelationQueryDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiAssetsRelationQueryDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiCommonDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiCommonDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiElePropertyDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiElePropertyDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiEleRelaConstrainDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiEleRelaConstrainDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiEleRelaDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiEleRelaDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiElementDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiElementDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiMetaModelDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiMetaModelDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiRelaSatePostDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiRelaSatePostDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiTreeDto.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiTreeDto.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/ArchiViewDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiViewDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BasePageEntity.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/BasePageEntity.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BatchRemoveDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/BatchRemoveDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/BatchUpdateDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/BatchUpdateDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/DelDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/DelDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/DocMarkTag.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/DocMarkTag.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/NeedInfoDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/NeedInfoDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/OnlineReviewCountQueryDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/OnlineReviewCountQueryDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/OnlineReviewWriteDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/OnlineReviewWriteDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/dto/WordContentDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/WordContentDTO.java
package org.arch.common.archoverall.dto; package org.arch.common.modules.archoverall.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchVisualVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchVisualVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAbilityAssetsRelationQueryVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiAbilityAssetsRelationQueryVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetEleRelaVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiAssetEleRelaVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiAssetVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiAssetViewVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiAssetViewVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiEleRelaNameVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiEleRelaNameVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiEleRelaVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiEleRelaVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiVersionVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiVersionVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/ArchiViewVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiViewVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxCellTreeVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/MxCellTreeVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxCellVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/MxCellVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/MxFileVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/MxFileVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/NeedReviewVo.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/NeedReviewVo.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
arch-clouds/common/src/main/java/org/arch/common/archoverall/vo/OnlineReviewCountVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/OnlineReviewCountVO.java
package org.arch.common.archoverall.vo; package org.arch.common.modules.archoverall.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/base/dto/DelDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/base/dto/DelDTO.java
package org.arch.common.base.dto; package org.arch.common.modules.base.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/base/dto/DictDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/base/dto/DictDTO.java
package org.arch.common.base.dto; package org.arch.common.modules.base.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/base/dto/DownloadObjectDTO.java → arch-clouds/common/src/main/java/org/arch/common/modules/base/dto/DownloadObjectDTO.java
package org.arch.common.base.dto; package org.arch.common.modules.base.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/base/vo/UpLoadVO.java → arch-clouds/common/src/main/java/org/arch/common/modules/base/vo/UpLoadVO.java
package org.arch.common.base.vo; package org.arch.common.modules.base.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/user/dto/DeptSmallDto.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/dto/DeptSmallDto.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* 注意： * 注意：
* 本软件为www.yixiang.co开发研制 * 本软件为www.yixiang.co开发研制
*/ */
package org.arch.common.user.dto; package org.arch.common.modules.sysmange.dto;
import lombok.Data; import lombok.Data;
......
arch-clouds/common/src/main/java/org/arch/common/user/dto/MenuDto.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/dto/MenuDto.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* 注意： * 注意：
* 本软件为www.yixiang.co开发研制 * 本软件为www.yixiang.co开发研制
*/ */
package org.arch.common.user.dto; package org.arch.common.modules.sysmange.dto;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
......
arch-clouds/common/src/main/java/org/arch/common/user/dto/RoleSmallDto.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/dto/RoleSmallDto.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* 注意： * 注意：
* 本软件为www.yixiang.co开发研制 * 本软件为www.yixiang.co开发研制
*/ */
package org.arch.common.user.dto; package org.arch.common.modules.sysmange.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
arch-clouds/common/src/main/java/org/arch/common/user/dto/UserDto.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/dto/UserDto.java
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
* 注意： * 注意：
* 本软件为www.yixiang.co开发研制 * 本软件为www.yixiang.co开发研制
*/ */
package org.arch.common.user.dto; package org.arch.common.modules.sysmange.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.arch.common.user.entity.Menu; import org.arch.common.modules.sysmange.entity.Menu;
import org.arch.common.user.entity.Org; import org.arch.common.modules.sysmange.entity.Org;
import java.io.Serializable; import java.io.Serializable;
import java.sql.Timestamp; import java.sql.Timestamp;
......
arch-clouds/common/src/main/java/org/arch/common/user/entity/Menu.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/entity/Menu.java
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* 注意： * 注意：
* 本软件为www.yixiang.co开发研制 * 本软件为www.yixiang.co开发研制
*/ */
package org.arch.common.user.entity; package org.arch.common.modules.sysmange.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-clouds/common/src/main/java/org/arch/common/user/entity/Org.java → arch-clouds/common/src/main/java/org/arch/common/modules/sysmange/entity/Org.java
package org.arch.common.user.entity; package org.arch.common.modules.sysmange.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-clouds/common/src/main/java/org/arch/common/redis/service/RedisService.java → arch-clouds/common/src/main/java/org/arch/common/redis/RedisService.java
package org.arch.common.redis.service; package org.arch.common.redis;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
......
arch-clouds/filters/src/main/java/org/arch/filter/sqlFilter/SqlFilter.java
...@@ -121,10 +121,10 @@ public class SqlFilter implements Filter{ ...@@ -121,10 +121,10 @@ public class SqlFilter implements Filter{
str = str.toLowerCase();//统一转为小写 str = str.toLowerCase();//统一转为小写
//过滤掉的sql关键字，可以手动添加 //过滤掉的sql关键字，可以手动添加
String badStr = "'|and|exec|execute|insert|select | update |drop|" + String badStr = "'|and|exec|execute|insert|select | update |drop|" +
"char |declare|sitename|net user|xp_cmdshell|;| - | + |and|exec|execute|insert|create |" + "char |declare|sitename|net sysmange|xp_cmdshell|;| - | + |and|exec|execute|insert|create |" +
"table|from|grant| use |group_concat|column_name|" + "table|from|grant| use |group_concat|column_name|" +
"information_schema.columns|table_schema|union|where| delete| update|order | by | count |*|" + "information_schema.columns|table_schema|union|where| delete| update|order | by | count |*|" +
"alert|alter | \\ |asc |substring|restore|backup|net +user|net +localgroup +administrators|" + "alert|alter | \\ |asc |substring|restore|backup|net +sysmange|net +localgroup +administrators|" +
"%|netlocalgroup administrators|like|join|into|substr|ascii|having|`|@ |~|!|$|"+ "%|netlocalgroup administrators|like|join|into|substr|ascii|having|`|@ |~|!|$|"+
"^|&|=|<|>|?|！|#|￥|……|&|——|【|】|‘|；|：|”|“| 、|‘|，|。|. | }|\\|、|"+ "^|&|=|<|>|?|！|#|￥|……|&|——|【|】|‘|；|：|”|“| 、|‘|，|。|. | }|\\|、|"+
"chr| mid |master|truncate|;| or | or|or |--| + | // | / | # ";//过滤掉的sql关键字，可以手动添加 "chr| mid |master|truncate|;| or | or|or |--| + | // | / | # ";//过滤掉的sql关键字，可以手动添加
......
arch-clouds/log/src/main/java/org/arch/log/service/SysEventLogService.java
package org.arch.log.service; package org.arch.log.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.user.dto.UserDto; import org.arch.common.modules.sysmange.dto.UserDto;
import org.arch.log.entity.SysEventLog; import org.arch.log.entity.SysEventLog;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.PageRequest;
......
arch-clouds/log/src/main/java/org/arch/log/service/impl/SysEventLogServiceImpl.java
...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.arch.common.user.dto.UserDto; import org.arch.common.modules.sysmange.dto.UserDto;
import org.arch.log.entity.SysEventLog; import org.arch.log.entity.SysEventLog;
import org.arch.log.mapper.SysEventLogMapper; import org.arch.log.mapper.SysEventLogMapper;
import org.arch.log.service.SysEventLogService; import org.arch.log.service.SysEventLogService;
......
arch-clouds/storage/src/main/java/org/arch/storage/service/OssService.java
package org.arch.storage.service; package org.arch.storage.service;
import org.arch.common.base.dto.DelDTO; import org.arch.common.modules.base.dto.DelDTO;
import org.arch.common.base.dto.DownloadObjectDTO; import org.arch.common.modules.base.dto.DownloadObjectDTO;
import org.arch.common.base.vo.UpLoadVO; import org.arch.common.modules.base.vo.UpLoadVO;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
arch-clouds/storage/src/main/java/org/arch/storage/service/impl/OssServiceImpl.java
...@@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor; ...@@ -6,9 +6,9 @@ import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.arch.storage.entity.File; import org.arch.storage.entity.File;
import org.arch.common.base.dto.DelDTO; import org.arch.common.modules.base.dto.DelDTO;
import org.arch.common.base.dto.DownloadObjectDTO; import org.arch.common.modules.base.dto.DownloadObjectDTO;
import org.arch.common.base.vo.UpLoadVO; import org.arch.common.modules.base.vo.UpLoadVO;
import org.arch.storage.mapper.FileMapper; import org.arch.storage.mapper.FileMapper;
import org.arch.storage.service.OssService; import org.arch.storage.service.OssService;
import org.arch.utils.FileUtils; import org.arch.utils.FileUtils;
......
arch-gateway/src/main/java/org/arch/config/LoginFilter.java
...@@ -3,7 +3,7 @@ package org.arch.config; ...@@ -3,7 +3,7 @@ package org.arch.config;
import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.cloud.commons.lang.StringUtils;
import net.minidev.json.JSONObject; import net.minidev.json.JSONObject;
import org.arch.common.redis.service.RedisService; import org.arch.common.redis.RedisService;
import org.arch.utils.JwtUtil; import org.arch.utils.JwtUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -289,11 +289,11 @@ public class LoginFilter implements GlobalFilter, Ordered { ...@@ -289,11 +289,11 @@ public class LoginFilter implements GlobalFilter, Ordered {
//// ////
//// xmlResponse = sv.getResponse(); //// xmlResponse = sv.getResponse();
//// if(sv.isAuthenticationSuccesful()) { //// if(sv.isAuthenticationSuccesful()) {
//// user = sv.getUser(); //// sysmange = sv.getUser();
//// IscSSOUserBean iscSSOUserBean = null; //// IscSSOUserBean iscSSOUserBean = null;
//// try { //// try {
//// /*获取当前用户登录信息*/ //// /*获取当前用户登录信息*/
//// iscSSOUserBean = IscSSOResourceUtil.transferIscUserBean(user); //// iscSSOUserBean = IscSSOResourceUtil.transferIscUserBean(sysmange);
//// /*当前登录用户ID*/ //// /*当前登录用户ID*/
//// userid = iscSSOUserBean.getIscUserId(); //// userid = iscSSOUserBean.getIscUserId();
//// //***************获取用户部门组织信息 //// //***************获取用户部门组织信息
...@@ -305,7 +305,7 @@ public class LoginFilter implements GlobalFilter, Ordered { ...@@ -305,7 +305,7 @@ public class LoginFilter implements GlobalFilter, Ordered {
//// String loginName = iscSSOUserBean.getIscUserSourceId(); //// String loginName = iscSSOUserBean.getIscUserSourceId();
////// System.out.println(loginName); ////// System.out.println(loginName);
//// exchange.getRequest().getHeaders().add("iscUser", userid); //// exchange.getRequest().getHeaders().add("iscUser", userid);
//// logger.info("userinfo >>>>>>>>>>>> "+user); //// logger.info("userinfo >>>>>>>>>>>> "+sysmange);
//// } catch (Exception e) { //// } catch (Exception e) {
//// // TODO Auto-generated catch block //// // TODO Auto-generated catch block
//// e.printStackTrace(); //// e.printStackTrace();
......
arch-overall/src/main/java/org/arch/overall/controller/ArchiAssetInfoController.java
...@@ -9,8 +9,8 @@ import org.arch.log.annotation.OperLog; ...@@ -9,8 +9,8 @@ import org.arch.log.annotation.OperLog;
import org.arch.log.entity.DescContent; import org.arch.log.entity.DescContent;
import org.arch.log.logenum.LogOperTypeEnum; import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum; import org.arch.log.logenum.LogTypeEnum;
import org.arch.common.archoverall.dto.ArchiAssetInfoDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetInfoDTO;
import org.arch.common.archoverall.dto.DelDTO; import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.overall.dto.ArchiDto; import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiElementNestRelation; import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
......
arch-overall/src/main/java/org/arch/overall/controller/ArchiEleRelaController.java
...@@ -3,8 +3,8 @@ package org.arch.overall.controller; ...@@ -3,8 +3,8 @@ package org.arch.overall.controller;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.arch.Result; import org.arch.Result;
import org.arch.log.entity.DescContent; import org.arch.log.entity.DescContent;
import org.arch.common.archoverall.dto.ArchiEleRelaDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaDTO;
import org.arch.common.archoverall.dto.BatchUpdateRelaDTO; import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.overall.entity.ArchiEleRela; import org.arch.overall.entity.ArchiEleRela;
import org.arch.overall.service.ArchiElePropertyService; import org.arch.overall.service.ArchiElePropertyService;
import org.arch.overall.service.ArchiEleRelaService; import org.arch.overall.service.ArchiEleRelaService;
......
arch-overall/src/main/java/org/arch/overall/controller/ArchiElementController.java
...@@ -8,8 +8,8 @@ import org.arch.Result; ...@@ -8,8 +8,8 @@ import org.arch.Result;
import org.arch.log.annotation.OperLog; import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum; import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum; import org.arch.log.logenum.LogTypeEnum;
import org.arch.common.archoverall.dto.ArchiElementDTO; import org.arch.common.modules.archoverall.dto.ArchiElementDTO;
import org.arch.common.archoverall.dto.BatchUpdateDTO; import org.arch.common.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.overall.entity.ArchiElement; import org.arch.overall.entity.ArchiElement;
import org.arch.overall.service.ArchiElementService; import org.arch.overall.service.ArchiElementService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
arch-overall/src/main/java/org/arch/overall/dto/ArchiAssetDesignedInfoDTO.java
...@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel; ...@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.arch.common.archoverall.dto.BasePageEntity; import org.arch.common.modules.archoverall.dto.BasePageEntity;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/entity/ArchiEleRela.java
...@@ -9,7 +9,7 @@ import lombok.Data; ...@@ -9,7 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.arch.common.BaseEntity; import org.arch.common.BaseEntity;
import org.arch.common.archoverall.dto.ArchiEleRelaConstrainDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaConstrainDTO;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiAbilityAssetsRelationMapper.java
...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiAbilityInventoryDataDTO; import org.arch.common.modules.archoverall.dto.ArchiAbilityInventoryDataDTO;
import org.arch.common.archoverall.dto.ArchiAssetsRelationQueryDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetsRelationQueryDTO;
import org.arch.common.archoverall.vo.ArchiAbilityAssetsRelationQueryVO; import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
import org.arch.overall.entity.ArchiAbilityAssetsRelation; import org.arch.overall.entity.ArchiAbilityAssetsRelation;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiAssertMapper.java
...@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -5,12 +5,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiAssetInfoDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetInfoDTO;
import org.arch.common.archoverall.dto.NeedInfoDTO; import org.arch.common.modules.archoverall.dto.NeedInfoDTO;
import org.arch.common.archoverall.dto.OnlineReviewCountQueryDTO; import org.arch.common.modules.archoverall.dto.OnlineReviewCountQueryDTO;
import org.arch.common.archoverall.dto.OnlineReviewWriteDTO; import org.arch.common.modules.archoverall.dto.OnlineReviewWriteDTO;
import org.arch.common.archoverall.vo.NeedReviewVo; import org.arch.common.modules.archoverall.vo.NeedReviewVo;
import org.arch.common.archoverall.vo.OnlineReviewCountVO; import org.arch.common.modules.archoverall.vo.OnlineReviewCountVO;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
import org.arch.overall.entity.OnlineReviewWrite; import org.arch.overall.entity.OnlineReviewWrite;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiAssetInfoMapper.java
...@@ -6,9 +6,9 @@ import com.github.yulichang.base.MPJBaseMapper; ...@@ -6,9 +6,9 @@ import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import org.arch.common.archoverall.dto.ArchiAssetInfoDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetInfoDTO;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
import org.arch.common.archoverall.dto.WordContentDTO; import org.arch.common.modules.archoverall.dto.WordContentDTO;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiEleRelaConstrainMapper.java
...@@ -2,7 +2,7 @@ package org.arch.overall.mapper; ...@@ -2,7 +2,7 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.common.archoverall.vo.ArchiEleRelaVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRelaConstrain; import org.arch.overall.entity.ArchiEleRelaConstrain;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiEleRelaMapper.java
...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; ...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiEleRelaDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaDTO;
import org.arch.common.archoverall.vo.ArchiEleRelaNameVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.overall.entity.ArchiEleRela; import org.arch.overall.entity.ArchiEleRela;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiElementMapper.java
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiElementDTO; import org.arch.common.modules.archoverall.dto.ArchiElementDTO;
import org.arch.overall.entity.ArchiElement; import org.arch.overall.entity.ArchiElement;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiMetaModelMapper.java
...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiMetaModelDTO; import org.arch.common.modules.archoverall.dto.ArchiMetaModelDTO;
import org.arch.overall.entity.ArchiMetaModel; import org.arch.overall.entity.ArchiMetaModel;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/mapper/ArchiTotalAssertMapper.java
...@@ -3,11 +3,11 @@ package org.arch.overall.mapper; ...@@ -3,11 +3,11 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.archoverall.dto.ArchiAssetDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetDTO;
import org.arch.common.archoverall.dto.ArchiViewDTO; import org.arch.common.modules.archoverall.dto.ArchiViewDTO;
import org.arch.common.archoverall.vo.ArchiAssetVO; import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.archoverall.vo.ArchiVersionVO; import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.archoverall.vo.ArchiViewVO; import org.arch.common.modules.archoverall.vo.ArchiViewVO;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/service/ArchiAssetInfoService.java
...@@ -2,10 +2,10 @@ package org.arch.overall.service; ...@@ -2,10 +2,10 @@ package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.archoverall.dto.ArchiAssetInfoDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetInfoDTO;
import org.arch.common.archoverall.dto.ArchiAssetVisalDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetVisalDTO;
import org.arch.common.archoverall.dto.DelDTO; import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.common.archoverall.vo.ArchVisualVO; import org.arch.common.modules.archoverall.vo.ArchVisualVO;
import org.arch.overall.dto.ArchiDto; import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiElementNestRelation; import org.arch.overall.entity.ArchiElementNestRelation;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
......
arch-overall/src/main/java/org/arch/overall/service/ArchiAssetService.java
...@@ -2,11 +2,11 @@ package org.arch.overall.service; ...@@ -2,11 +2,11 @@ package org.arch.overall.service;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.arch.common.archoverall.dto.*; import org.arch.common.modules.archoverall.dto.*;
import org.arch.common.archoverall.vo.ArchiAbilityAssetsRelationQueryVO; import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
import org.arch.common.archoverall.vo.ArchiAssetVO; import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.archoverall.vo.ArchiVersionVO; import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.archoverall.vo.MxCellVO; import org.arch.common.modules.archoverall.vo.MxCellVO;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/service/ArchiEleRelaService.java
...@@ -2,11 +2,11 @@ package org.arch.overall.service; ...@@ -2,11 +2,11 @@ package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.archoverall.dto.ArchiEleRelaConstrainDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaConstrainDTO;
import org.arch.common.archoverall.dto.ArchiEleRelaDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaDTO;
import org.arch.common.archoverall.dto.BatchUpdateRelaDTO; import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.common.archoverall.vo.ArchiEleRelaNameVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.common.archoverall.vo.ArchiEleRelaVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRela; import org.arch.overall.entity.ArchiEleRela;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/overall/service/ArchiElementService.java
...@@ -2,8 +2,8 @@ package org.arch.overall.service; ...@@ -2,8 +2,8 @@ package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.archoverall.dto.ArchiElementDTO; import org.arch.common.modules.archoverall.dto.ArchiElementDTO;
import org.arch.common.archoverall.dto.BatchUpdateDTO; import org.arch.common.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.overall.entity.ArchiEleProperty; import org.arch.overall.entity.ArchiEleProperty;
import org.arch.overall.entity.ArchiElement; import org.arch.overall.entity.ArchiElement;
......
arch-overall/src/main/java/org/arch/overall/service/impl/ArchiAssertServiceImpl.java
...@@ -19,11 +19,11 @@ import com.mxgraph.util.mxXmlUtils; ...@@ -19,11 +19,11 @@ import com.mxgraph.util.mxXmlUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.arch.common.archoverall.dto.*; import org.arch.common.modules.archoverall.dto.*;
import org.arch.common.archoverall.vo.ArchiAbilityAssetsRelationQueryVO; import org.arch.common.modules.archoverall.vo.ArchiAbilityAssetsRelationQueryVO;
import org.arch.common.archoverall.vo.ArchiAssetVO; import org.arch.common.modules.archoverall.vo.ArchiAssetVO;
import org.arch.common.archoverall.vo.ArchiVersionVO; import org.arch.common.modules.archoverall.vo.ArchiVersionVO;
import org.arch.common.archoverall.vo.MxCellVO; import org.arch.common.modules.archoverall.vo.MxCellVO;
import org.arch.enums.ArchiStateEnum; import org.arch.enums.ArchiStateEnum;
import org.arch.overall.entity.ArchiAbilityAssetsRelation; import org.arch.overall.entity.ArchiAbilityAssetsRelation;
import org.arch.overall.entity.AssetInfo; import org.arch.overall.entity.AssetInfo;
......
arch-overall/src/main/java/org/arch/overall/service/impl/ArchiAssetInfoServiceImpl.java
...@@ -14,10 +14,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -14,10 +14,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.arch.common.archoverall.dto.ArchiAssetInfoDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetInfoDTO;
import org.arch.common.archoverall.dto.ArchiAssetVisalDTO; import org.arch.common.modules.archoverall.dto.ArchiAssetVisalDTO;
import org.arch.common.archoverall.vo.ArchVisualVO; import org.arch.common.modules.archoverall.vo.ArchVisualVO;
import org.arch.common.archoverall.dto.DelDTO; import org.arch.common.modules.archoverall.dto.DelDTO;
import org.arch.overall.dto.ArchiDto; import org.arch.overall.dto.ArchiDto;
import org.arch.overall.entity.ArchiAssetSystem; import org.arch.overall.entity.ArchiAssetSystem;
import org.arch.overall.entity.ArchiElementNestRelation; import org.arch.overall.entity.ArchiElementNestRelation;
......
arch-overall/src/main/java/org/arch/overall/service/impl/ArchiEleRelaImpl.java
...@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; ...@@ -10,11 +10,11 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.arch.common.archoverall.dto.ArchiEleRelaConstrainDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaConstrainDTO;
import org.arch.common.archoverall.dto.ArchiEleRelaDTO; import org.arch.common.modules.archoverall.dto.ArchiEleRelaDTO;
import org.arch.common.archoverall.dto.BatchUpdateRelaDTO; import org.arch.common.modules.archoverall.dto.BatchUpdateRelaDTO;
import org.arch.common.archoverall.vo.ArchiEleRelaNameVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaNameVO;
import org.arch.common.archoverall.vo.ArchiEleRelaVO; import org.arch.common.modules.archoverall.vo.ArchiEleRelaVO;
import org.arch.overall.entity.ArchiEleRela; import org.arch.overall.entity.ArchiEleRela;
import org.arch.overall.entity.ArchiEleRelaConstrain; import org.arch.overall.entity.ArchiEleRelaConstrain;
import org.arch.overall.entity.ArchiElement; import org.arch.overall.entity.ArchiElement;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!