oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. system 提供新的 Resource 相关接口

Browse Source 
2. admin-web 接入新的 Resource 相关接口
This commit is contained in:
YunaiV
2020-04-27 22:40:12 +08:00
parent f7157d283c
commit a279495936
44 changed files with 277 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
common/common-dependencies/pom.xml
View File

@@ -1,80 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>cn.iocoder.mall</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>common-dependencies</artifactId>
<packaging>pom</packaging>
<name>Onemall Dependencies</name>
<description>Maven Bom，定义 Onemall 项目的所有依赖的版本</description>
<!-- 属性 -->
<properties>
<!-- TODO Spring Boot && Spring Cloud && Spring Cloud Alibaba -->
<spring.boot.version>2.2.4.RELEASE</spring.boot.version>
<spring.cloud.version>Hoxton.SR1</spring.cloud.version>
<spring.cloud.alibaba.version>2.2.0.RELEASE</spring.cloud.alibaba.version>
<!-- RPC 相关 -->
<dubbo.version>2.7.1</dubbo.version>
<!-- Transaction 相关 -->
<seata.version>1.1.0</seata.version>
<!-- 监控相关 -->
<skywalking.version>7.0.0</skywalking.version>
</properties>
<!-- 依赖管理 -->
<dependencyManagement>
<!-- TODO Spring Boot && Spring Cloud && Spring Cloud Alibaba -->
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring.cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${spring.cloud.alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- RPC 相关 -->
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo</artifactId>
<version>${dubbo.version}</version>
</dependency>
<!-- Transaction 相关 -->
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-spring-boot-starter</artifactId>
<version>${seata.version}</version>
</dependency>
<!-- 监控相关 -->
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
<version>${skywalking.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

20
common/common-framework/pom.xml
View File

@@ -32,21 +32,6 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
<!-- DB 相关 -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-annotation</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-core</artifactId>
</dependency>
<!-- RPC 相关 -->
<dependency>
<groupId>org.apache.dubbo</groupId>
@@ -71,11 +56,6 @@
<artifactId>hibernate-validator</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>

41
common/mall-spring-boot-starter-mybatis/pom.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>common</artifactId>
<groupId>cn.iocoder.mall</groupId>
<version>1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>mall-spring-boot-starter-mybatis</artifactId>
<dependencies>
<!-- DB 相关 -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-core</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<!-- 工具相关 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

4
common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/BaseDO.java → common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/BaseDO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.common.framework.dataobject;
package cn.iocoder.mall.mybatis.dataobject;
import java.io.Serializable;
import java.util.Date;
@@ -42,4 +42,4 @@ public class BaseDO implements Serializable {
this.updateTime = updateTime;
return this;
}
}
}

2
common/common-framework/src/main/java/cn/iocoder/common/framework/dataobject/DeletableDO.java → common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/dataobject/DeletableDO.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.common.framework.dataobject;
package cn.iocoder.mall.mybatis.dataobject;
import com.baomidou.mybatisplus.annotation.TableLogic;

4
common/common-framework/src/main/java/cn/iocoder/common/framework/constant/DeletedStatusEnum.java → common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/enums/DeletedStatusEnum.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.common.framework.constant;
package cn.iocoder.mall.mybatis.enums;
import cn.iocoder.common.framework.dataobject.DeletableDO;
import cn.iocoder.mall.mybatis.dataobject.DeletableDO;
/**
* {@link DeletableDO#getDeleted()} delete 状态

9
common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/QueryWrapperX.java → common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/query/QueryWrapperX.java
View File

@@ -1,7 +1,8 @@
package cn.iocoder.common.framework.mybatis;
package cn.iocoder.mall.mybatis.query;
import cn.iocoder.common.framework.util.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ArrayUtils;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.Collection;
@@ -23,14 +24,14 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
}
public QueryWrapperX<T> inIfPresent(String column, Collection<?> values) {
if (!CollectionUtil.isEmpty(values)) {
if (!CollectionUtils.isEmpty(values)) {
return (QueryWrapperX<T>) super.in(column, values);
}
return this;
}
public QueryWrapperX<T> inIfPresent(String column, Object... values) {
if (!CollectionUtil.isEmpty(values)) {
if (!ArrayUtils.isEmpty(values)) {
return (QueryWrapperX<T>) super.in(column, values);
}
return this;

2
common/common-framework/src/main/java/cn/iocoder/common/framework/mybatis/JSONTypeHandler.java → common/mall-spring-boot-starter-mybatis/src/main/java/cn/iocoder/mall/mybatis/type/JSONTypeHandler.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.common.framework.mybatis;
package cn.iocoder.mall.mybatis.type;
import com.alibaba.fastjson.JSON;
import org.apache.ibatis.type.BaseTypeHandler;

2
common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/config/CommonWebAutoConfiguration.java
View File

@@ -1,6 +1,6 @@
package cn.iocoder.mall.web.config;
import cn.iocoder.common.framework.servlet.CorsFilter;
import cn.iocoder.mall.web.core.servlet.CorsFilter;
import cn.iocoder.mall.web.core.constant.CommonMallConstants;
import cn.iocoder.mall.web.core.handler.GlobalExceptionHandler;
import cn.iocoder.mall.web.core.handler.GlobalResponseBodyHandler;

2
common/common-framework/src/main/java/cn/iocoder/common/framework/servlet/CorsFilter.java → common/mall-spring-boot-starter-web/src/main/java/cn/iocoder/mall/web/core/servlet/CorsFilter.java
View File

@@ -1,4 +1,4 @@
package cn.iocoder.common.framework.servlet;
package cn.iocoder.mall.web.core.servlet;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;

2
common/pom.xml
View File

@@ -14,10 +14,10 @@
<modules>
<module>common-framework</module>
<module>mall-spring-boot</module>
<module>common-dependencies</module>
<module>mall-spring-boot-starter-swagger</module>
<module>mall-spring-boot-starter-web</module>
<module>mall-spring-boot-starter-security</module>
<module>mall-spring-boot-starter-mybatis</module>
</modules>
<dependencyManagement>