add grant_type

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

@@ -31,6 +31,7 @@
         <result property="createTime" column="create_time" javaType="Long" jdbcType="NUMERIC"/>
         <result property="updateTime" column="update_time" javaType="Long" jdbcType="NUMERIC"/>
         <result property="scope" column="scope" javaType="java.util.Set" jdbcType="VARCHAR"/>
+        <result property="grantType" column="grant_type" javaType="String" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--用于动态生成sql所需的配置-->

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-entity/src/main/java/org/hswebframework/web/authorization/oauth2/server/entity/SimpleOAuth2AccessEntity.java

@@ -18,15 +18,21 @@
 
 package org.hswebframework.web.authorization.oauth2.server.entity;
 
+import lombok.Builder;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Set;
 
 /**
- * TODO 完成注释
  *
  * @author zhouhao
  */
+@Getter
+@Setter
 public class SimpleOAuth2AccessEntity implements OAuth2AccessEntity {
 
+    private static final long serialVersionUID = 2090466474249489203L;
     private String clientId;
 
     private String ownerId;
@@ -45,93 +51,4 @@ public class SimpleOAuth2AccessEntity implements OAuth2AccessEntity {
 
     private String grantType;
 
-    @Override
-    public String getClientId() {
-        return clientId;
-    }
-
-    @Override
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
-
-    @Override
-    public String getOwnerId() {
-        return ownerId;
-    }
-
-    @Override
-    public void setOwnerId(String ownerId) {
-        this.ownerId = ownerId;
-    }
-
-    @Override
-    public String getAccessToken() {
-        return accessToken;
-    }
-
-    @Override
-    public void setAccessToken(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    @Override
-    public String getRefreshToken() {
-        return refreshToken;
-    }
-
-    @Override
-    public void setRefreshToken(String refreshToken) {
-        this.refreshToken = refreshToken;
-    }
-
-    @Override
-    public Integer getExpiresIn() {
-        return expiresIn;
-    }
-
-    @Override
-    public void setExpiresIn(Integer expiresIn) {
-        this.expiresIn = expiresIn;
-    }
-
-    @Override
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-
-    @Override
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    @Override
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    @Override
-    public Set<String> getScope() {
-        return scope;
-    }
-
-    @Override
-    public void setScope(Set<String> scope) {
-        this.scope = scope;
-    }
-
-    @Override
-    public String getGrantType() {
-        return grantType;
-    }
-
-    @Override
-    public void setGrantType(String grantType) {
-        this.grantType = grantType;
-    }
 }

hsweb-system/hsweb-system-oauth2-server/hsweb-system-oauth2-server-starter/src/main/resources/hsweb-starter.js

@@ -35,6 +35,7 @@ var versions = [
     // }
 ];
 var JDBCType = java.sql.JDBCType;
+
 function install(context) {
     var database = context.database;
     database.createOrAlter("s_oauth2_client")
@@ -44,7 +45,7 @@ function install(context) {
         .addColumn().name("describe").varchar(256).comment("备注").commit()
         .addColumn().name("type").varchar(128).notNull().comment("客户端类型").commit()
         .addColumn().name("owner_id").varchar(32).notNull().comment("绑定的用户ID").commit()
-        .addColumn().name("creator_id").varchar(32).notNull().comment("创建者ID").commit()
+        .addColumn().name("creator_id").varchar(32).comment("创建者ID").commit()
         .addColumn().name("redirect_uri").varchar(1024).notNull().comment("redirect_uri").commit()
         .addColumn().name("create_time").number(32).notNull().comment("创建时间").commit()
         .addColumn().name("support_grant_types").varchar(2048).comment("支持的授权列表").commit()
@@ -62,6 +63,7 @@ function install(context) {
         .addColumn().name("create_time").number(32).notNull().comment("创建时间").commit()
         .addColumn().name("update_time").number(32).comment("更新时间").commit()
         .addColumn().name("scope").clob().comment("授权范围").commit()
+        .addColumn().name("grant_type").varchar(32).comment("授权类型").commit()
         .comment("OAuth2授权认证信息").commit();
 
     database.createOrAlter("s_oauth2_auth_code")