lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-02 02:43:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

3.0.0-RC-SNAPSHOT

Browse Source
This commit is contained in:
zhou-hao
2018-06-02 00:14:39 +08:00
parent 504f366730
commit 177112a961
221 changed files with 252 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hsweb-authorization/hsweb-authorization-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-basic/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-cloud/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-jwt/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-ldap/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-auth-server/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-authorization-oauth2</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-client/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-authorization-oauth2</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-core/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-authorization-oauth2</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<!--<relativePath>../../pom.xml</relativePath>-->
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/hsweb-authorization-oauth2/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-authorization/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/hsweb-boost-aop/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-boost</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/hsweb-boost-ftp/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-boost</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-api/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-boost-validator</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/hsweb-boost-validator/hsweb-boost-validator-group/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-boost-validator</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/hsweb-boost-validator/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-boost</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-boost/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-commons/hsweb-commons-bean/pom.xml
View File

@@ -5,13 +5,15 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hsweb-commons-bean</artifactId>
<dependencies>
<dependency>
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-core</artifactId>

3
hsweb-commons/hsweb-commons-controller/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-api/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/hsweb-commons-dao/hsweb-commons-dao-mybatis/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/hsweb-commons-dao/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-commons/hsweb-commons-entity/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-commons/hsweb-commons-model/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/hsweb-commons-service/hsweb-commons-service-api/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-commons/hsweb-commons-service/hsweb-commons-service-oauth2/pom.xml
View File

@@ -5,7 +5,9 @@
<parent>
<artifactId>hsweb-commons-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/pom.xml
View File

@@ -23,7 +23,9 @@
<parent>
<artifactId>hsweb-commons-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-commons/hsweb-commons-service/pom.xml
View File

@@ -23,7 +23,9 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/hsweb-commons-utils/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-commons</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-commons/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-async-job/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-concurrent</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-cache/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-concurrent</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-api/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-concurrent-counter</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-counter/hsweb-concurrent-counter-redis/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-concurrent-counter</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-counter/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-concurrent</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-concurrent-lock</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-redis/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-concurrent-lock</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-lock/hsweb-concurrent-lock-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-concurrent-lock</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/hsweb-concurrent-lock/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-concurrent</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-concurrent/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-core/pom.xml
View File

@@ -5,7 +5,8 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-datasource/hsweb-datasource-api/pom.xml
View File

@@ -5,7 +5,9 @@
<parent>
<artifactId>hsweb-datasource</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-datasource/hsweb-datasource-jta/pom.xml
View File

@@ -5,7 +5,9 @@
<parent>
<artifactId>hsweb-datasource</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-datasource/hsweb-datasource-web/pom.xml
View File

@@ -5,7 +5,9 @@
<parent>
<artifactId>hsweb-datasource</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-datasource/pom.xml
View File

@@ -5,7 +5,9 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-gateway/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples-cloud</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-service01/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples-cloud</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hsweb-examples/hsweb-examples-cloud/hsweb-examples-cloud-user-center/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples-cloud</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-spring-boot-starter</artifactId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

2
hsweb-examples/hsweb-examples-cloud/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/hsweb-examples-custom-entity/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
hsweb-examples/hsweb-examples-custom-entity/src/main/resources/custom/mappers/UserMapper.xml
View File

@@ -20,8 +20,8 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://www.mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.hswebframework.web.dao.authorization.UserDao">
<resultMap id="UserResultMap" type="org.hswebframework.web.entity.authorization.UserEntity">
<mapper namespace="UserDao">
<resultMap id="UserResultMap" type="UserEntity">
<id property="id" column="u_id" javaType="string" jdbcType="VARCHAR"/>
<result property="name" column="name" javaType="string" jdbcType="VARCHAR"/>
<result property="username" column="username" javaType="string" jdbcType="VARCHAR"/>
@@ -40,7 +40,7 @@
<bind name="tableName" value="'s_user'"/>
</sql>
<insert id="insert" parameterType="org.hswebframework.web.entity.authorization.UserEntity">
<insert id="insert" parameterType="UserEntity">
<include refid="config"/>
<include refid="BasicMapper.buildInsertSql"/>
</insert>

2
hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-client/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-examples-oauth2</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-examples-oauth2</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

1
hsweb-examples/hsweb-examples-oauth2/hsweb-examples-oauth2-server/src/main/java/org/hswebframework/web/example/oauth2/OAuth2ServerApplication.java
View File

@@ -21,6 +21,7 @@ package org.hswebframework.web.example.oauth2;
import com.alibaba.fastjson.JSON;
import org.hswebframework.web.authorization.Permission;
import org.hswebframework.web.authorization.access.DataAccessConfig;
import org.hswebframework.web.authorization.entity.*;
import org.hswebframework.web.authorization.oauth2.server.entity.OAuth2ClientEntity;
import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
import org.hswebframework.web.commons.entity.DataStatus;

2
hsweb-examples/hsweb-examples-oauth2/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-examples</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/hsweb-examples-simple/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-examples</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/SpringBootExample.java
View File

@@ -22,10 +22,9 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
import org.hswebframework.web.authorization.Authentication;
import org.hswebframework.web.authorization.Permission;
import org.hswebframework.web.authorization.access.DataAccessConfig;
import org.hswebframework.web.authorization.basic.aop.AopMethodAuthorizeDefinitionCustomizerParser;
import org.hswebframework.web.authorization.basic.configuration.EnableAopAuthorize;
import org.hswebframework.web.authorization.basic.define.EmptyAuthorizeDefinition;
import org.hswebframework.web.authorization.define.AuthorizeDefinitionInitializedEvent;
import org.hswebframework.web.authorization.entity.*;
import org.hswebframework.web.authorization.simple.SimpleFieldFilterDataAccessConfig;
import org.hswebframework.web.commons.entity.DataStatus;
import org.hswebframework.web.commons.entity.factory.EntityFactory;

2
hsweb-examples/hsweb-examples-simple/src/main/java/org/hswebframework/web/example/simple/TestController.java
View File

@@ -1,7 +1,6 @@
package org.hswebframework.web.example.simple;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.hswebframework.web.authorization.Authentication;
import org.hswebframework.web.authorization.Permission;
import org.hswebframework.web.authorization.annotation.Authorize;
@@ -21,7 +20,6 @@ import org.hswebframework.web.service.QueryByEntityService;
import org.hswebframework.web.service.QueryService;
import org.springframework.web.bind.annotation.*;
import java.util.Base64;
import java.util.List;

2
hsweb-examples/hsweb-examples-workflow/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-examples</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-examples/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

33
hsweb-i18n/hsweb-i18n-cn/pom.xml
View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ /*
~ * Copyright 2016 http://www.hswebframework.org
~ *
~ * Licensed under the Apache License, Version 2.0 (the "License");
~ * you may not use this file except in compliance with the License.
~ * You may obtain a copy of the License at
~ *
~ * http://www.apache.org/licenses/LICENSE-2.0
~ *
~ * Unless required by applicable law or agreed to in writing, software
~ * distributed under the License is distributed on an "AS IS" BASIS,
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ * See the License for the specific language governing permissions and
~ * limitations under the License.
~ */
-->
<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>hsweb-i18n</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hsweb-i18n-cn</artifactId>
</project>

24
hsweb-i18n/hsweb-i18n-cn/src/main/resources/messages_zh_CN.properties
View File

@@ -1,24 +0,0 @@
#
# /*
# * Copyright 2016 http://www.hswebframework.org
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# */
#
error=错误
decrypt_param_error=解密参数错误
user_not_exists=用户不存在
user_is_disabled=用户已禁用
password_error=密码错误
private_key_is_null=私钥为空
verify_code_error=验证码错误

33
hsweb-i18n/hsweb-i18n-en/pom.xml
View File

@@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ /*
~ * Copyright 2016 http://www.hswebframework.org
~ *
~ * Licensed under the Apache License, Version 2.0 (the "License");
~ * you may not use this file except in compliance with the License.
~ * You may obtain a copy of the License at
~ *
~ * http://www.apache.org/licenses/LICENSE-2.0
~ *
~ * Unless required by applicable law or agreed to in writing, software
~ * distributed under the License is distributed on an "AS IS" BASIS,
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ * See the License for the specific language governing permissions and
~ * limitations under the License.
~ */
-->
<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>hsweb-i18n</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hsweb-i18n-en</artifactId>
</project>

24
hsweb-i18n/hsweb-i18n-en/src/main/resources/messages_en_US.properties
View File

@@ -1,24 +0,0 @@
#
# /*
# * Copyright 2016 http://www.hswebframework.org
# *
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# */
#
error=Error
decrypt_param_error=Error in decrypting parameters
user_not_exists=The user does not exist
user_is_disabled=The user is disabled
password_error=Wrong password
private_key_is_null=Private key is empty
verify_code_error=Wrong verification code

38
hsweb-i18n/pom.xml
View File

@@ -1,38 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ /*
~ * Copyright 2016 http://www.hswebframework.org
~ *
~ * Licensed under the Apache License, Version 2.0 (the "License");
~ * you may not use this file except in compliance with the License.
~ * You may obtain a copy of the License at
~ *
~ * http://www.apache.org/licenses/LICENSE-2.0
~ *
~ * Unless required by applicable law or agreed to in writing, software
~ * distributed under the License is distributed on an "AS IS" BASIS,
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ * See the License for the specific language governing permissions and
~ * limitations under the License.
~ */
-->
<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>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>hsweb-i18n</artifactId>
<packaging>pom</packaging>
<modules>
<module>hsweb-i18n-cn</module>
<module>hsweb-i18n-en</module>
</modules>
</project>

3
hsweb-logging/hsweb-access-logging-aop/pom.xml
View File

@@ -5,7 +5,8 @@
<parent>
<artifactId>hsweb-logging</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-logging/hsweb-access-logging-api/pom.xml
View File

@@ -5,7 +5,8 @@
<parent>
<artifactId>hsweb-logging</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

3
hsweb-logging/pom.xml
View File

@@ -23,7 +23,8 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-message/hsweb-message-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-message</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-message/hsweb-message-jms/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-message</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-message/hsweb-message-redis/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-message</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-message/hsweb-message-websocket/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-message</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-message/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-starter/hsweb-spring-boot-starter/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-starter</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-framework</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-local/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/pom.xml
View File

@@ -22,7 +22,7 @@
<parent>
<artifactId>hsweb-system-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

7
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-web/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-authorization</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,10 +29,5 @@
<artifactId>hsweb-commons-controller</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.hswebframework.web</groupId>
<artifactId>hsweb-system-authorization-model</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</project>

2
hsweb-system/hsweb-system-authorization/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-controller/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-api/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-dao/hsweb-system-config-dao-mybatis/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config-dao</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-dao/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-entity/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-api/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-service/hsweb-system-config-service-simple/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config-service</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-service/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system-config</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/hsweb-system-config-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-config</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-config/pom.xml
View File

@@ -23,7 +23,7 @@
<parent>
<artifactId>hsweb-system</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-dashboard</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-local/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-dashboard</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-dashboard</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-dashboard</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

8
hsweb-system/hsweb-system-dashboard/hsweb-system-dashboard-web/src/main/java/org/hswebframework/web/controller/dashboard/DashBoardUserConfigController.java
View File

@@ -11,20 +11,16 @@ import org.hswebframework.web.controller.dashboard.model.UserDashBoardResponse;
import org.hswebframework.web.controller.message.ResponseMessage;
import org.hswebframework.web.dashboard.DashBoardConfigEntity;
import org.hswebframework.web.dashboard.DashBoardService;
import org.hswebframework.web.dashboard.executor.DashBoardExecutor;
import org.hswebframework.web.entity.authorization.UserSettingEntity;
import org.hswebframework.web.service.authorization.UserSettingService;
import org.hswebframework.web.authorization.entity.UserSettingEntity;
import org.hswebframework.web.authorization.service.UserSettingService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.PostConstruct;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
/**

2
hsweb-system/hsweb-system-dashboard/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-database-manager</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-simple/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-database-manager</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-database-manager</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-database-manager/hsweb-system-database-manager-web/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system-database-manager</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
hsweb-system/hsweb-system-database-manager/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>hsweb-system</artifactId>
<groupId>org.hswebframework.web</groupId>
<version>3.0-SNAPSHOT</version>
<version>3.0.0-RC-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Some files were not shown because too many files have changed in this diff Show More