客户端

src/main/java/com/kingkong/bljs/dao/ClientMapper.java

@@ -0,0 +1,97 @@
+package com.kingkong.bljs.dao;
+
+import com.kingkong.bljs.entity.Client;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
+
+public interface ClientMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    @Delete({
+        "delete from K_USER.K_CLIENT",
+        "where CLIENT_ID = #{clientId,jdbcType=VARCHAR}"
+    })
+    int deleteByPrimaryKey(String clientId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    @Insert({
+        "insert into K_USER.K_CLIENT (CLIENT_ID, ID, ",
+        "NAME, CLIENT_SECRET, ",
+        "REDIRECT_URI, CREATED_AT, ",
+        "UPDATED_AT, DELETED_AT, ",
+        "APP_ID)",
+        "values (#{clientId,jdbcType=VARCHAR}, #{id,jdbcType=DECIMAL}, ",
+        "#{name,jdbcType=VARCHAR}, #{clientSecret,jdbcType=VARCHAR}, ",
+        "#{redirectUri,jdbcType=VARCHAR}, #{createdAt,jdbcType=DATE}, ",
+        "#{updatedAt,jdbcType=DATE}, #{deletedAt,jdbcType=DATE}, ",
+        "#{appId,jdbcType=DECIMAL})"
+    })
+    int insert(Client record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    int insertSelective(Client record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    @Select({
+        "select",
+        "CLIENT_ID, ID, NAME, CLIENT_SECRET, REDIRECT_URI, CREATED_AT, UPDATED_AT, DELETED_AT, ",
+        "APP_ID",
+        "from K_USER.K_CLIENT",
+        "where CLIENT_ID = #{clientId,jdbcType=VARCHAR}"
+    })
+    @ResultMap("com.kingkong.bljs.dao.ClientMapper.BaseResultMap")
+    Client selectByPrimaryKey(String clientId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    int updateByPrimaryKeySelective(Client record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    @Update({
+        "update K_USER.K_CLIENT",
+        "set ID = #{id,jdbcType=DECIMAL},",
+          "NAME = #{name,jdbcType=VARCHAR},",
+          "CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},",
+          "REDIRECT_URI = #{redirectUri,jdbcType=VARCHAR},",
+          "CREATED_AT = #{createdAt,jdbcType=DATE},",
+          "UPDATED_AT = #{updatedAt,jdbcType=DATE},",
+          "DELETED_AT = #{deletedAt,jdbcType=DATE},",
+          "APP_ID = #{appId,jdbcType=DECIMAL}",
+        "where CLIENT_ID = #{clientId,jdbcType=VARCHAR}"
+    })
+    int updateByPrimaryKey(Client record);
+
+    @Select({"select * from k_client where client_id=#{clientId}"})
+    Client selectByClientId(String clientId);
+}

src/main/java/com/kingkong/bljs/entity/Client.java

@@ -0,0 +1,212 @@
+package com.kingkong.bljs.entity;
+
+import java.util.Date;
+
+public class Client {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.CLIENT_ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private String clientId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.NAME
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.CLIENT_SECRET
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private String clientSecret;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.REDIRECT_URI
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private String redirectUri;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.CREATED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private Date createdAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.UPDATED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private Date updatedAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.DELETED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private Date deletedAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.APP_ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    private Integer appId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_CLIENT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Client(String clientId, Integer id, String name, String clientSecret, String redirectUri, Date createdAt, Date updatedAt, Date deletedAt, Integer appId) {
+        this.clientId = clientId;
+        this.id = id;
+        this.name = name;
+        this.clientSecret = clientSecret;
+        this.redirectUri = redirectUri;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+        this.deletedAt = deletedAt;
+        this.appId = appId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.CLIENT_ID
+     *
+     * @return the value of K_USER.K_CLIENT.CLIENT_ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public String getClientId() {
+        return clientId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.ID
+     *
+     * @return the value of K_USER.K_CLIENT.ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.NAME
+     *
+     * @return the value of K_USER.K_CLIENT.NAME
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.CLIENT_SECRET
+     *
+     * @return the value of K_USER.K_CLIENT.CLIENT_SECRET
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.REDIRECT_URI
+     *
+     * @return the value of K_USER.K_CLIENT.REDIRECT_URI
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public String getRedirectUri() {
+        return redirectUri;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.CREATED_AT
+     *
+     * @return the value of K_USER.K_CLIENT.CREATED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.UPDATED_AT
+     *
+     * @return the value of K_USER.K_CLIENT.UPDATED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Date getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.DELETED_AT
+     *
+     * @return the value of K_USER.K_CLIENT.DELETED_AT
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Date getDeletedAt() {
+        return deletedAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.APP_ID
+     *
+     * @return the value of K_USER.K_CLIENT.APP_ID
+     *
+     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     */
+    public Integer getAppId() {
+        return appId;
+    }
+}

src/main/java/com/kingkong/bljs/security/CustomClientDetailService.java

@@ -1,7 +1,9 @@
 package com.kingkong.bljs.security;
 
 import com.kingkong.bljs.dao.AppMapper;
+import com.kingkong.bljs.dao.ClientMapper;
 import com.kingkong.bljs.entity.App;
+import com.kingkong.bljs.entity.Client;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.provider.ClientDetails;
 import org.springframework.security.oauth2.provider.ClientDetailsService;
@@ -15,23 +17,23 @@ import java.util.Set;
 public class CustomClientDetailService implements ClientDetailsService {
 
     @Autowired
-    private AppMapper appMapper;
+    private ClientMapper clientMapper;
 
     @Override
     public ClientDetails loadClientByClientId(String s) throws ClientRegistrationException {
 
-        App app = appMapper.selectByClientId(s);
+        Client client = clientMapper.selectByClientId(s);
 
-        if(null == app)
+        if(null == client)
             throw new ClientRegistrationException("incorrect client id");
 
         BaseClientDetails clientDetails = new BaseClientDetails();
         clientDetails.setClientId(s);
-        clientDetails.setClientSecret("{noop}" + app.getClientSecret());
+        clientDetails.setClientSecret("{noop}" + client.getClientId());
         clientDetails.setAuthorizedGrantTypes(Arrays.asList("authorization_code","client_credentials", "refresh_token", "password", "implicit"));
         clientDetails.setScope(Arrays.asList("*","all"));
         Set<String> uris = new HashSet<>();
-        uris.add(app.getRedirectUri());
+        uris.add(client.getRedirectUri());
         clientDetails.setRegisteredRedirectUri(uris);
         clientDetails.setAccessTokenValiditySeconds(3600*24);
         return clientDetails;

src/main/resources/generatorConfig.xml

@@ -87,7 +87,7 @@
 
 
 
-        <table tableName="k_three_login" schema="k_user" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
+        <table tableName="k_client" schema="k_user" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
                enableSelectByExample="false" selectByExampleQueryId="false">
 
             <!-- optional   , only for mybatis3 runtime

src/main/resources/mapper/ClientMapper.xml

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.kingkong.bljs.dao.ClientMapper">
+  <resultMap id="BaseResultMap" type="com.kingkong.bljs.entity.Client">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon May 27 16:39:18 CST 2019.
+    -->
+    <constructor>
+      <idArg column="CLIENT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
+      <arg column="NAME" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="CLIENT_SECRET" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="REDIRECT_URI" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="CREATED_AT" javaType="java.util.Date" jdbcType="DATE" />
+      <arg column="UPDATED_AT" javaType="java.util.Date" jdbcType="DATE" />
+      <arg column="DELETED_AT" javaType="java.util.Date" jdbcType="DATE" />
+      <arg column="APP_ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
+    </constructor>
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon May 27 16:39:18 CST 2019.
+    -->
+    CLIENT_ID, ID, NAME, CLIENT_SECRET, REDIRECT_URI, CREATED_AT, UPDATED_AT, DELETED_AT, 
+    APP_ID
+  </sql>
+  <insert id="insertSelective" parameterType="com.kingkong.bljs.entity.Client">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon May 27 16:39:18 CST 2019.
+    -->
+    insert into K_USER.K_CLIENT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="clientId != null">
+        CLIENT_ID,
+      </if>
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="name != null">
+        NAME,
+      </if>
+      <if test="clientSecret != null">
+        CLIENT_SECRET,
+      </if>
+      <if test="redirectUri != null">
+        REDIRECT_URI,
+      </if>
+      <if test="createdAt != null">
+        CREATED_AT,
+      </if>
+      <if test="updatedAt != null">
+        UPDATED_AT,
+      </if>
+      <if test="deletedAt != null">
+        DELETED_AT,
+      </if>
+      <if test="appId != null">
+        APP_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="clientId != null">
+        #{clientId,jdbcType=VARCHAR},
+      </if>
+      <if test="id != null">
+        #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSecret != null">
+        #{clientSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="redirectUri != null">
+        #{redirectUri,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=DATE},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=DATE},
+      </if>
+      <if test="deletedAt != null">
+        #{deletedAt,jdbcType=DATE},
+      </if>
+      <if test="appId != null">
+        #{appId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.kingkong.bljs.entity.Client">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon May 27 16:39:18 CST 2019.
+    -->
+    update K_USER.K_CLIENT
+    <set>
+      <if test="id != null">
+        ID = #{id,jdbcType=DECIMAL},
+      </if>
+      <if test="name != null">
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSecret != null">
+        CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="redirectUri != null">
+        REDIRECT_URI = #{redirectUri,jdbcType=VARCHAR},
+      </if>
+      <if test="createdAt != null">
+        CREATED_AT = #{createdAt,jdbcType=DATE},
+      </if>
+      <if test="updatedAt != null">
+        UPDATED_AT = #{updatedAt,jdbcType=DATE},
+      </if>
+      <if test="deletedAt != null">
+        DELETED_AT = #{deletedAt,jdbcType=DATE},
+      </if>
+      <if test="appId != null">
+        APP_ID = #{appId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where CLIENT_ID = #{clientId,jdbcType=VARCHAR}
+  </update>
+</mapper>