Skip to content

Administrator / framework-tools

Go to a project
Commit 669bf3fd by henry
Options

修改配置

1 parent 0a6dfc0b
Expand all
Inline Side-by-side
Showing with 308 additions and 73 deletions
arch-base/pom.xml
......@@ -10,6 +10,8 @@
</parent>
<artifactId>arch-base</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>org.arch.base</groupId>
<name>基础功能公共服务</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
......@@ -17,39 +19,276 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<!--引入AOP -->
<!-- Shiro安全认证 -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
</dependency>
<!--nacos client-->
<!--SpringBoot2.4.x之后默认不加载bootstrap.yml文件，需要在pom里加上依赖-->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>
<!--openfeign-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!--sentinel依赖-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
</dependency>
<dependency>
<groupId>com.github.davidfantasy</groupId>
<artifactId>mybatis-plus-generator-ui</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<!-- druid数据源驱动 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<!--FTP包-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<!--jwt-->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<!-- mapstruct -->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
</dependency>
<!--redis-->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<!-- pdf -->
<dependency>
<groupId>com.itextpdf</groupId>
<artifactId>html2pdf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
<!-- webservice 缺少的依赖 -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
<version>3.2.4</version>
<exclusions>
<exclusion>
<artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
</dependency>
<!-- isc 缺少的依赖 -->
<dependency>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
<version>1.1.3.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20180130</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<!-- 代码生成器使用模版 -->
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.30</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<!--velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</dependency>
<!-- mxgraph -->
<dependency>
<groupId>org.nasdanika.core</groupId>
<artifactId>mxgraph</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-boot-starter-actuator</artifactId>
<groupId>org.springframework.boot</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
</dependency>
<!--密码工具类-->
<dependency>
<groupId>com.github.ulisesbocchio</groupId>
<artifactId>jasypt-spring-boot</artifactId>
</dependency>
<!--单元测试-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.5.0</version>
<scope>compile</scope>
</dependency>
<!--引入AOP -->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
<!--SM4-CBC加密需要-->
<!-- https://mvnrepository.com/artifact/org.bouncycastle/bcprov-jdk15on -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</dependency>
<!-- oss 多平台 -->
<dependency>
<groupId>org.dromara.x-file-storage</groupId>
<artifactId>x-file-storage-spring</artifactId>
<exclusions>
<exclusion>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- minio -->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
<groupId>org.apache.tika</groupId>
<artifactId>tika-parser-pdf-module</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
......
arch-clouds/attach/pom.xml
......@@ -4,13 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<groupId>org.arch.clouds</groupId>
<artifactId>arch-clouds</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<version>1.0-SNAPSHOT</version>
<name>文件存储</name>
<artifactId>attach</artifactId>
<groupId>org.arch.attach</groupId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
......
arch-clouds/log/pom.xml
......@@ -4,14 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<groupId>org.arch.clouds</groupId>
<artifactId>arch-clouds</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<version>1.0-SNAPSHOT</version>
<name>日志模块</name>
<artifactId>log</artifactId>
<groupId>org.arch.log</groupId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
......@@ -19,18 +20,9 @@
</properties>
<dependencies>
<dependency>
<groupId>org.arch</groupId>
<groupId>org.arch.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.arch</groupId>
<artifactId>arch-base</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
arch-clouds/log/src/main/java/org/arch/log/config/LogAutoConfiguration.java
......@@ -17,11 +17,11 @@ import org.springframework.beans.factory.annotation.Value;
@Configuration
@ComponentScan("org.arch.log")
public class LogAutoConfiguration {
//@Value("${log.enable.flag}")
@Value("${log.enable.flag}")
private boolean logFlag;
//@Value("${sql.enable.flag}")
@Value("${sql.enable.flag}")
private boolean sqlFlag;
//@Value("${xss.enable.flag}")
@Value("${xss.enable.flag}")
private boolean xssFlag;
public LogAutoConfiguration() {
log.info("加载logging配置...");
......
arch-clouds/mybatis/pom.xml
......@@ -4,13 +4,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<groupId>org.arch.clouds</groupId>
<artifactId>arch-clouds</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mybatis</artifactId>
<groupId>org.arch.mybatis</groupId>
<name>mybatis组件</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
......@@ -18,29 +19,23 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-extension</artifactId>
</dependency>
<!--数据源驱动-->
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<scope>runtime</scope>
</dependency>
<!-- druid数据源驱动 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper-spring-boot-starter -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
......@@ -56,5 +51,6 @@
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
\ No newline at end of file
arch-clouds/mybatis/src/main/java/org/arch/config/MybatisConfig.java
......@@ -16,12 +16,14 @@ package org.arch.config;
import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
@Slf4j
@Configuration
@MapperScan(basePackages = {"org.arch.*.mapper","org.arch.**.mapper"})
public class MybatisConfig {
public MybatisConfig() {
log.info("加载MybatisPlus配置...");
......
arch-clouds/nacos/pom.xml
......@@ -4,12 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<groupId>org.arch.clouds</groupId>
<artifactId>arch-clouds</artifactId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>nacos</artifactId>
<groupId>org.arch.nacos</groupId>
<name>注册中心</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
......
arch-clouds/office/pom.xml
......@@ -4,12 +4,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.arch</groupId>
<groupId>org.arch.clouds</groupId>
<artifactId>arch-clouds</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
<artifactId>office</artifactId>
<groupId>org.arch.office</groupId>
<name>在线文档</name>
<properties>
<maven.compiler.source>8</maven.compiler.source>
......
arch-clouds/pom.xml
......@@ -11,6 +11,7 @@
<name>微服务组件</name>
<packaging>pom</packaging>
<artifactId>arch-clouds</artifactId>
<groupId>org.arch.clouds</groupId>
<modules>
<module>log</module>
<module>office</module>
......
arch-gateway/pom.xml
......@@ -38,7 +38,7 @@
<artifactId>spring-cloud-starter-gateway</artifactId>
</dependency>
<dependency>
<groupId>org.arch</groupId>
<groupId>org.arch.nacos</groupId>
<artifactId>nacos</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
......
arch-overall/pom.xml
......@@ -18,21 +18,23 @@
</properties>
<dependencies>
<dependency>
<groupId>org.arch</groupId>
<artifactId>nacos</artifactId>
<version>1.0-SNAPSHOT</version>
<groupId>com.github.davidfantasy</groupId>
<artifactId>mybatis-plus-generator-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<groupId>org.arch.log</groupId>
<artifactId>log</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-loadbalancer</artifactId>
<groupId>org.arch.nacos</groupId>
<artifactId>nacos</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.arch</groupId>
<artifactId>log</artifactId>
<groupId>org.arch.base</groupId>
<artifactId>arch-base</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
......
arch-overall/src/main/java/org/arch/modules/ArchOverallApp.java
package org.arch.modules;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
import org.mybatis.spring.annotation.MapperScan;
import org.dromara.x.file.storage.spring.EnableFileStorage;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication(exclude= MybatisPlusAutoConfiguration.class)
@SpringBootApplication
@EnableDiscoveryClient
@MapperScan(basePackages = {"org.arch.*.mapper","org.arch.**.mapper"})
@EnableTransactionManagement
@EnableFileStorage
public class ArchOverallApp {
public static void main(String[] args) {
SpringApplication.run(ArchOverallApp.class, args);
......
arch-overall/src/main/java/org/arch/modules/design/controller/ArchiElementController.java
......@@ -5,17 +5,17 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.arch.Result;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO;
import org.arch.modules.design.entity.ArchiElement;
import org.arch.modules.design.service.ArchiElementService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.arch.log.annotation.OperLog;
@Api(tags = {"元素管理"})
@RestController
......
arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElePropertyDTO.java → arch-overall/src/main/java/org/arch/modules/design/dto/ArchiElePropertyDTO.java
package org.arch.modules.archoverall.dto;
package org.arch.modules.design.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
arch-base/src/main/java/org/arch/modules/archoverall/dto/ArchiElementDTO.java → arch-overall/src/main/java/org/arch/modules/design/dto/ArchiElementDTO.java
package org.arch.modules.archoverall.dto;
package org.arch.modules.design.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.arch.modules.base.dto.BasePageEntity;
import java.util.List;
......
arch-base/src/main/java/org/arch/modules/base/dto/BasePageEntity.java → arch-overall/src/main/java/org/arch/modules/design/dto/BasePageEntity.java
package org.arch.modules.base.dto;
package org.arch.modules.design.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElementMapper.java
......@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.dto.ArchiElementDTO;
import org.arch.modules.design.entity.ArchiElement;
import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/service/ArchiElementService.java
......@@ -2,8 +2,8 @@ package org.arch.modules.design.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO;
import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.entity.ArchiElement;
......
arch-overall/src/main/java/org/arch/modules/design/service/impl/ArchiElementImpl.java
......@@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.dto.BatchUpdateDTO;
import org.arch.modules.design.dto.ArchiElementDTO;
import org.arch.modules.design.mapper.ArchiElePropertyMapper;
import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.entity.ArchiElement;
......
logs/eadc-architecture_info.log
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!