diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml
similarity index 76%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml
index 052c38cd2..92833a069 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/pom.xml
@@ -21,13 +21,13 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system-oauth2-server</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-controller</artifactId>
+    <artifactId>hsweb-system-oauth2-server-controller</artifactId>
 
     <dependencies>
         <dependency>
@@ -37,18 +37,18 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-model</artifactId>
+            <artifactId>hsweb-system-oauth2-server-model</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-api</artifactId>
+            <artifactId>hsweb-authorization-oauth2-server</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.oltu.oauth2</groupId>
-            <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
-            <version>1.0.2</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.oltu.oauth2</groupId>-->
+            <!--<artifactId>org.apache.oltu.oauth2.authzserver</artifactId>-->
+            <!--<version>1.0.2</version>-->
+        <!--</dependency>-->
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java
similarity index 96%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java
index 0a07db186..940b77b06 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-controller/src/main/java/org/hswebframework/web/authorization/oauth2/controller/OAuth2AuthorizationController.java
@@ -25,10 +25,10 @@ import org.hswebframework.web.AuthorizeException;
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.authorization.oauth2.api.OAuth2ServerService;
-import org.hswebframework.web.authorization.oauth2.model.AccessTokenModel;
-import org.hswebframework.web.authorization.oauth2.model.AuthorizationCodeModel;
-import org.hswebframework.web.authorization.oauth2.model.ImplicitAccessTokenModel;
-import org.hswebframework.web.entity.authorization.oauth2.OAuth2AccessEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.OAuth2AccessEntity;
+import org.hswebframework.web.oauth2.model.AccessTokenModel;
+import org.hswebframework.web.oauth2.model.AuthorizationCodeModel;
+import org.hswebframework.web.oauth2.model.ImplicitAccessTokenModel;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -75,7 +75,6 @@ public class OAuth2AuthorizationController {
 
         // OAuth2ClientEntity clientEntity = oAuth2ServerService.getClient(client_id);
         // TODO: 17-3-6  validate redirect_uri
-
         OAuth2AccessEntity accessEntity = oAuth2ServerService.requestTokenByImplicit(client_id, scope);
         ImplicitAccessTokenModel model = new ImplicitAccessTokenModel();
         model.setState(state);
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml
similarity index 87%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml
index eb87af40a..eb0d2d38a 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/pom.xml
@@ -21,13 +21,13 @@
          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-authorization-oauth2-server-dao</artifactId>
+        <artifactId>hsweb-system-oauth2-server-dao</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-dao-api</artifactId>
+    <artifactId>hsweb-system-oauth2-server-dao-api</artifactId>
 
     <dependencies>
         <dependency>
@@ -37,7 +37,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-entity</artifactId>
+            <artifactId>hsweb-authorization-oauth2-server</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/AuthorizationCodeDao.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/AuthorizationCodeDao.java
similarity index 85%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/AuthorizationCodeDao.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/AuthorizationCodeDao.java
index 886759ceb..a9e6896a7 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/AuthorizationCodeDao.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/AuthorizationCodeDao.java
@@ -16,16 +16,14 @@
  *
  */
 
-package org.hswebframework.web.dao.authorization.oauth2;
+package org.hswebframework.web.dao.oauth2;
 
-import org.hswebframework.web.entity.authorization.oauth2.AuthorizationCodeEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.AuthorizationCodeEntity;
 import org.hswebframework.web.dao.InsertDao;
 import org.hswebframework.web.dao.dynamic.DeleteByEntityDao;
 import org.hswebframework.web.dao.dynamic.QueryByEntityDao;
 
 /**
- * TODO 完成注释
- *
  * @author zhouhao
  */
 public interface AuthorizationCodeDao extends
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2AccessDao.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2AccessDao.java
similarity index 88%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2AccessDao.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2AccessDao.java
index 2f5e4eeb9..e230212b5 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2AccessDao.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2AccessDao.java
@@ -16,9 +16,9 @@
  *
  */
 
-package org.hswebframework.web.dao.authorization.oauth2;
+package org.hswebframework.web.dao.oauth2;
 
-import org.hswebframework.web.entity.authorization.oauth2.OAuth2AccessEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.OAuth2AccessEntity;
 import org.hswebframework.web.dao.InsertDao;
 import org.hswebframework.web.dao.dynamic.DeleteByEntityDao;
 import org.hswebframework.web.dao.dynamic.QueryByEntityDao;
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2ClientDao.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2ClientDao.java
similarity index 83%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2ClientDao.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2ClientDao.java
index 78fdc0c30..04cb3e1c5 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/authorization/oauth2/OAuth2ClientDao.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-api/src/main/java/org/hswebframework/web/dao/oauth2/OAuth2ClientDao.java
@@ -16,13 +16,13 @@
  *
  */
 
-package org.hswebframework.web.dao.authorization.oauth2;
+package org.hswebframework.web.dao.oauth2;
 
-import org.hswebframework.web.entity.authorization.oauth2.OAuth2ClientEntity;
+
+import org.hswebframework.web.authorization.oauth2.api.entity.OAuth2ClientEntity;
 import org.hswebframework.web.dao.CrudDao;
 
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml
similarity index 86%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml
index 0b7848366..9ff9c6311 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/pom.xml
@@ -21,18 +21,18 @@
          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-authorization-oauth2-server-dao</artifactId>
+        <artifactId>hsweb-system-oauth2-server-dao</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-dao-mybatis</artifactId>
+    <artifactId>hsweb-system-oauth2-server-dao-mybatis</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-dao-api</artifactId>
+            <artifactId>hsweb-system-oauth2-server-dao-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2AccessMapper.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2AccessMapper.xml
similarity index 91%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2AccessMapper.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2AccessMapper.xml
index f6dffee0f..0058608b1 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2AccessMapper.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2AccessMapper.xml
@@ -21,8 +21,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.oauth2.OAuth2AccessDao">
-    <resultMap id="OAuth2AccessResultMap" type="org.hswebframework.web.entity.authorization.oauth2.SimpleOAuth2AccessEntity">
+<mapper namespace="org.hswebframework.web.dao.oauth2.OAuth2AccessDao">
+    <resultMap id="OAuth2AccessResultMap" type="org.hswebframework.web.authorization.oauth2.api.entity.SimpleOAuth2AccessEntity">
         <result property="clientId" column="client_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="accessToken" column="access_token" javaType="String" jdbcType="VARCHAR"/>
@@ -39,7 +39,7 @@
         <bind name="tableName" value="'s_oauth2_access'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hswebframework.web.entity.authorization.oauth2.SimpleOAuth2ClientEntity">
+    <insert id="insert" parameterType="org.hswebframework.web.authorization.oauth2.api.entity.SimpleOAuth2ClientEntity">
         <include refid="config"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2ClientMapper.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2ClientMapper.xml
similarity index 92%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2ClientMapper.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2ClientMapper.xml
index 182f1ef9f..1eaaa94cf 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2ClientMapper.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2ClientMapper.xml
@@ -21,8 +21,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.oauth2.OAuth2ClientDao">
-    <resultMap id="OAuth2ClientResultMap" type="org.hswebframework.web.entity.authorization.oauth2.SimpleOAuth2ClientEntity">
+<mapper namespace="org.hswebframework.web.dao.oauth2.OAuth2ClientDao">
+    <resultMap id="OAuth2ClientResultMap" type="org.hswebframework.web.authorization.oauth2.api.entity.SimpleOAuth2ClientEntity">
         <id property="id" column="u_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="secret" column="secret" javaType="String" jdbcType="VARCHAR"/>
         <result property="name" column="name" javaType="String" jdbcType="VARCHAR"/>
@@ -41,7 +41,7 @@
         <bind name="tableName" value="'s_oauth2_client'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hswebframework.web.entity.authorization.oauth2.SimpleOAuth2ClientEntity">
+    <insert id="insert" parameterType="org.hswebframework.web.authorization.oauth2.api.entity.SimpleOAuth2ClientEntity">
         <include refid="config"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2CodeMapper.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2CodeMapper.xml
similarity index 89%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2CodeMapper.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2CodeMapper.xml
index 760291f44..84651f9db 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/hsweb-authorization-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/authorization/oauth2/OAuth2CodeMapper.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/hsweb-system-oauth2-server-dao-mybatis/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/oauth2/OAuth2CodeMapper.xml
@@ -21,8 +21,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.oauth2.AuthorizationCodeDao">
-    <resultMap id="AuthorizationCodeResultMap" type="org.hswebframework.web.entity.authorization.oauth2.SimpleAuthorizationCodeEntity">
+<mapper namespace="org.hswebframework.web.dao.oauth2.AuthorizationCodeDao">
+    <resultMap id="AuthorizationCodeResultMap" type="org.hswebframework.web.authorization.oauth2.api.entity.SimpleAuthorizationCodeEntity">
         <result property="clientId" column="client_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" javaType="String" jdbcType="VARCHAR"/>
         <result property="code" column="code" javaType="String" jdbcType="VARCHAR"/>
@@ -36,7 +36,7 @@
         <bind name="tableName" value="'s_oauth2_auth_code'"/>
     </sql>
 
-    <insert id="insert" parameterType="org.hswebframework.web.entity.authorization.oauth2.SimpleOAuth2ClientEntity">
+    <insert id="insert" parameterType="org.hswebframework.web.authorization.oauth2.api.entity.SimpleOAuth2ClientEntity">
         <include refid="config"/>
         <include refid="BasicMapper.buildInsertSql"/>
     </insert>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml
similarity index 80%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml
index 25d9e87c8..2ee857d71 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-dao/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-dao/pom.xml
@@ -21,17 +21,17 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system-oauth2-server</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-dao</artifactId>
+    <artifactId>hsweb-system-oauth2-server-dao</artifactId>
     <packaging>pom</packaging>
     <modules>
-        <module>hsweb-authorization-oauth2-server-dao-api</module>
-        <module>hsweb-authorization-oauth2-server-dao-mybatis</module>
+        <module>hsweb-system-oauth2-server-dao-api</module>
+        <module>hsweb-system-oauth2-server-dao-mybatis</module>
     </modules>
 
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml
similarity index 90%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml
index e74b1ed3a..f766170fe 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/pom.xml
@@ -21,13 +21,13 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system-oauth2-server</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-model</artifactId>
+    <artifactId>hsweb-system-oauth2-server-model</artifactId>
 
     <dependencies>
         <dependency>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AccessTokenModel.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AccessTokenModel.java
similarity index 96%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AccessTokenModel.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AccessTokenModel.java
index fb99029ab..fc7cb7799 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AccessTokenModel.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AccessTokenModel.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.authorization.oauth2.model;
+package org.hswebframework.web.oauth2.model;
 
 import org.hswebframework.web.commons.model.Model;
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AuthorizationCodeModel.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AuthorizationCodeModel.java
similarity index 95%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AuthorizationCodeModel.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AuthorizationCodeModel.java
index 9fbdf7f47..a4245413c 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/AuthorizationCodeModel.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/AuthorizationCodeModel.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.authorization.oauth2.model;
+package org.hswebframework.web.oauth2.model;
 
 import org.hswebframework.web.commons.model.Model;
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/ImplicitAccessTokenModel.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/ImplicitAccessTokenModel.java
similarity index 96%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/ImplicitAccessTokenModel.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/ImplicitAccessTokenModel.java
index 4c137f0df..bc5a9193c 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-model/src/main/java/org/hswebframework/web/authorization/oauth2/model/ImplicitAccessTokenModel.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-model/src/main/java/org/hswebframework/web/oauth2/model/ImplicitAccessTokenModel.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.authorization.oauth2.model;
+package org.hswebframework.web.oauth2.model;
 
 import org.hswebframework.web.commons.model.Model;
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml
similarity index 79%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml
index eaa3f0688..3da9362f0 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/pom.xml
@@ -21,21 +21,16 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system-oauth2-server</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-simple</artifactId>
+    <artifactId>hsweb-system-oauth2-server-simple</artifactId>
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
             <artifactId>hsweb-commons-service-simple</artifactId>
@@ -48,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-dao-api</artifactId>
+            <artifactId>hsweb-system-oauth2-server-dao-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/src/main/java/org/hswebframework/web/authorization/oauth2/simple/SimpleOAuth2ServerService.java b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/oauth2/service/SimpleOAuth2ServerService.java
similarity index 95%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/src/main/java/org/hswebframework/web/authorization/oauth2/simple/SimpleOAuth2ServerService.java
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/oauth2/service/SimpleOAuth2ServerService.java
index a6bca8865..dc7d219be 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-simple/src/main/java/org/hswebframework/web/authorization/oauth2/simple/SimpleOAuth2ServerService.java
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-simple/src/main/java/org/hswebframework/web/oauth2/service/SimpleOAuth2ServerService.java
@@ -16,17 +16,17 @@
  *
  */
 
-package org.hswebframework.web.authorization.oauth2.simple;
+package org.hswebframework.web.oauth2.service;
 
 import org.hswebframework.web.AuthorizeForbiddenException;
 import org.hswebframework.web.NotFoundException;
 import org.hswebframework.web.authorization.oauth2.api.OAuth2ServerService;
-import org.hswebframework.web.dao.authorization.oauth2.AuthorizationCodeDao;
-import org.hswebframework.web.dao.authorization.oauth2.OAuth2AccessDao;
-import org.hswebframework.web.dao.authorization.oauth2.OAuth2ClientDao;
-import org.hswebframework.web.entity.authorization.oauth2.AuthorizationCodeEntity;
-import org.hswebframework.web.entity.authorization.oauth2.OAuth2AccessEntity;
-import org.hswebframework.web.entity.authorization.oauth2.OAuth2ClientEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.AuthorizationCodeEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.OAuth2AccessEntity;
+import org.hswebframework.web.authorization.oauth2.api.entity.OAuth2ClientEntity;
+import org.hswebframework.web.dao.oauth2.AuthorizationCodeDao;
+import org.hswebframework.web.dao.oauth2.OAuth2AccessDao;
+import org.hswebframework.web.dao.oauth2.OAuth2ClientDao;
 import org.hswebframework.web.commons.entity.GenericEntity;
 import org.hswebframework.web.commons.entity.factory.EntityFactory;
 import org.hswebframework.web.entity.authorization.UserEntity;
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-starter/pom.xml b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml
similarity index 84%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-starter/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml
index b99f16ecf..0a5db08c8 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-starter/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/pom.xml
@@ -21,13 +21,13 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system-oauth2-server</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-starter</artifactId>
+    <artifactId>hsweb-system-oauth2-server-starter</artifactId>
 
     <build>
         <resources>
@@ -40,17 +40,17 @@
     <dependencies>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-simple</artifactId>
+            <artifactId>hsweb-system-oauth2-server-simple</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-dao-mybatis</artifactId>
+            <artifactId>hsweb-system-oauth2-server-dao-mybatis</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-controller</artifactId>
+            <artifactId>hsweb-system-oauth2-server-controller</artifactId>
             <version>${project.version}</version>
         </dependency>
 
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-starter/src/main/resources/hsweb-starter.js b/hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/resources/hsweb-starter.js
similarity index 100%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-starter/src/main/resources/hsweb-starter.js
rename to hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/resources/hsweb-starter.js
diff --git a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-api/pom.xml b/hsweb-system/hsweb-system-oauth2-server/pom.xml
similarity index 70%
rename from hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-api/pom.xml
rename to hsweb-system/hsweb-system-oauth2-server/pom.xml
index 9cf897825..30a730e90 100644
--- a/hsweb-authorization/hsweb-authorization-oauth2/hsweb-authorization-oauth2-server/hsweb-authorization-oauth2-server-api/pom.xml
+++ b/hsweb-system/hsweb-system-oauth2-server/pom.xml
@@ -21,19 +21,21 @@
          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-authorization-oauth2-server</artifactId>
+        <artifactId>hsweb-system</artifactId>
         <groupId>org.hswebframework.web</groupId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>hsweb-authorization-oauth2-server-api</artifactId>
+    <modules>
+        <module>hsweb-system-oauth2-server-controller</module>
+        <module>hsweb-system-oauth2-server-simple</module>
+        <module>hsweb-system-oauth2-server-starter</module>
+        <module>hsweb-system-oauth2-server-dao</module>
+        <module>hsweb-system-oauth2-server-model</module>
+    </modules>
+    <packaging>pom</packaging>
+    <artifactId>hsweb-system-oauth2-server</artifactId>
+
 
-    <dependencies>
-        <dependency>
-            <groupId>org.hswebframework.web</groupId>
-            <artifactId>hsweb-authorization-oauth2-server-entity</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
 </project>
\ No newline at end of file