三方登录等

facade/src/app/routes/passport/login/login.component.ts

@@ -116,8 +116,8 @@ export class UserLoginComponent implements OnDestroy {
 
     const data = {
         grant_type: 'password',
-        client_id: this.settingsService.app.clientId || environment.client_id,
-        client_secret: this.settingsService.app.clientSecret || environment.client_secret,
+        client_id: this.settingsService.user.client.clientId || environment.client_id,
+        client_secret: this.settingsService.user.client.clientSecret || environment.client_secret,
         scope: '*',
         username: this.userName.value,
         password: this.password.value,

src/main/java/com/kingkong/bljs/api/IndexController.java

@@ -3,6 +3,7 @@ package com.kingkong.bljs.api;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.kingkong.bljs.dao.AppMapper;
+import com.kingkong.bljs.dao.ClientMapper;
 import com.kingkong.bljs.dao.ThreeloginMapper;
 import com.kingkong.bljs.entity.App;
 import com.kingkong.bljs.security.CustomUser;
@@ -61,6 +62,9 @@ public class IndexController extends ApiController {
     @Autowired
     private ThreeloginMapper threeloginMapper;
 
+    @Autowired
+    private  ClientMapper clientMapper;
+
 
     @GetMapping("app")
     public Map app(@RequestParam("app_id") String app_id) throws Exception{
@@ -72,6 +76,8 @@ public class IndexController extends ApiController {
         Map user = new HashMap();
         user.put("threeLogin", threeloginMapper.selectByAppId(app_id));
 
+        user.put("client" , clientMapper.selectDefaultClient(app_id));
+
         result.put("user",user);
 
         return result;
@@ -88,6 +94,8 @@ public class IndexController extends ApiController {
         Map user = userService.getCurrentUser();
         user.put("threeLogin", threeloginMapper.selectByAppId(app_id));
 
+        user.put("client" , clientMapper.selectDefaultClient(app_id));
+
         result.put("app",appInfo(app_id));
         if(null == user){
             result.put("user",new HashMap<>());

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

@@ -12,7 +12,7 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     @Delete({
         "delete from K_USER.K_APP",
@@ -24,19 +24,17 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     @Insert({
         "insert into K_USER.K_APP (ID, NAME, ",
         "NOTE, STATUS, ICON, ",
         "CREATED_AT, UPDATED_AT, ",
-        "DELETED_AT, CLIENT_ID, ",
-        "CLIENT_SECRET, REDIRECT_URI)",
+        "DELETED_AT)",
         "values (#{id,jdbcType=DECIMAL}, #{name,jdbcType=VARCHAR}, ",
         "#{note,jdbcType=VARCHAR}, #{status,jdbcType=DECIMAL}, #{icon,jdbcType=VARCHAR}, ",
         "#{createdAt,jdbcType=DATE}, #{updatedAt,jdbcType=DATE}, ",
-        "#{deletedAt,jdbcType=DATE}, #{clientId,jdbcType=VARCHAR}, ",
-        "#{clientSecret,jdbcType=VARCHAR}, #{redirectUri,jdbcType=VARCHAR})"
+        "#{deletedAt,jdbcType=DATE})"
     })
     int insert(App record);
 
@@ -44,7 +42,7 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     int insertSelective(App record);
 
@@ -52,12 +50,11 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     @Select({
         "select",
-        "ID, NAME, NOTE, STATUS, ICON, CREATED_AT, UPDATED_AT, DELETED_AT, CLIENT_ID, ",
-        "CLIENT_SECRET, REDIRECT_URI",
+        "ID, NAME, NOTE, STATUS, ICON, CREATED_AT, UPDATED_AT, DELETED_AT",
         "from K_USER.K_APP",
         "where ID = #{id,jdbcType=DECIMAL}"
     })
@@ -68,7 +65,7 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     int updateByPrimaryKeySelective(App record);
 
@@ -76,7 +73,7 @@ public interface AppMapper {
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     @Update({
         "update K_USER.K_APP",
@@ -86,15 +83,8 @@ public interface AppMapper {
           "ICON = #{icon,jdbcType=VARCHAR},",
           "CREATED_AT = #{createdAt,jdbcType=DATE},",
           "UPDATED_AT = #{updatedAt,jdbcType=DATE},",
-          "DELETED_AT = #{deletedAt,jdbcType=DATE},",
-          "CLIENT_ID = #{clientId,jdbcType=VARCHAR},",
-          "CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},",
-          "REDIRECT_URI = #{redirectUri,jdbcType=VARCHAR}",
+          "DELETED_AT = #{deletedAt,jdbcType=DATE}",
         "where ID = #{id,jdbcType=DECIMAL}"
     })
     int updateByPrimaryKey(App record);
-
-
-    @Select({"select * from k_app where client_id=#{clientId}"})
-    App selectByClientId(String clientId);
 }

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

@@ -12,7 +12,7 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     @Delete({
         "delete from K_USER.K_CLIENT",
@@ -24,19 +24,19 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 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)",
+        "APP_ID, TYPE)",
         "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})"
+        "#{appId,jdbcType=DECIMAL}, #{type,jdbcType=DECIMAL})"
     })
     int insert(Client record);
 
@@ -44,7 +44,7 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     int insertSelective(Client record);
 
@@ -52,12 +52,12 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     @Select({
         "select",
         "CLIENT_ID, ID, NAME, CLIENT_SECRET, REDIRECT_URI, CREATED_AT, UPDATED_AT, DELETED_AT, ",
-        "APP_ID",
+        "APP_ID, TYPE",
         "from K_USER.K_CLIENT",
         "where CLIENT_ID = #{clientId,jdbcType=VARCHAR}"
     })
@@ -68,7 +68,7 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     int updateByPrimaryKeySelective(Client record);
 
@@ -76,7 +76,7 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     @Update({
         "update K_USER.K_CLIENT",
@@ -87,11 +87,20 @@ public interface ClientMapper {
           "CREATED_AT = #{createdAt,jdbcType=DATE},",
           "UPDATED_AT = #{updatedAt,jdbcType=DATE},",
           "DELETED_AT = #{deletedAt,jdbcType=DATE},",
-          "APP_ID = #{appId,jdbcType=DECIMAL}",
+          "APP_ID = #{appId,jdbcType=DECIMAL},",
+          "TYPE = #{type,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);
+
+    @Select({
+            "select",
+            "CLIENT_ID, ID, NAME, CLIENT_SECRET, REDIRECT_URI, CREATED_AT, UPDATED_AT, DELETED_AT, ",
+            "APP_ID, TYPE",
+            "from K_USER.K_CLIENT",
+            "where app_id = #{appId,jdbcType=DECIMAL} and type=1"
+    })
+    @ResultMap("com.kingkong.bljs.dao.ClientMapper.BaseResultMap")
+    Client selectDefaultClient(String appId);
 }

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

@@ -8,7 +8,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.ID
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private Integer id;
 
@@ -17,7 +17,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.NAME
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private String name;
 
@@ -26,7 +26,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.NOTE
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private String note;
 
@@ -35,7 +35,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.STATUS
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private Short status;
 
@@ -44,7 +44,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.ICON
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private String icon;
 
@@ -53,7 +53,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.CREATED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private Date createdAt;
 
@@ -62,7 +62,7 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.UPDATED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private Date updatedAt;
 
@@ -71,44 +71,17 @@ public class App {
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column K_USER.K_APP.DELETED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     private Date deletedAt;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column K_USER.K_APP.CLIENT_ID
-     *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
-     */
-    private String clientId;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column K_USER.K_APP.CLIENT_SECRET
-     *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
-     */
-    private String clientSecret;
-
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column K_USER.K_APP.REDIRECT_URI
-     *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
-     */
-    private String redirectUri;
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table K_USER.K_APP
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
-    public App(Integer id, String name, String note, Short status, String icon, Date createdAt, Date updatedAt, Date deletedAt, String clientId, String clientSecret, String redirectUri) {
+    public App(Integer id, String name, String note, Short status, String icon, Date createdAt, Date updatedAt, Date deletedAt) {
         this.id = id;
         this.name = name;
         this.note = note;
@@ -117,9 +90,6 @@ public class App {
         this.createdAt = createdAt;
         this.updatedAt = updatedAt;
         this.deletedAt = deletedAt;
-        this.clientId = clientId;
-        this.clientSecret = clientSecret;
-        this.redirectUri = redirectUri;
     }
 
     /**
@@ -128,7 +98,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.ID
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public Integer getId() {
         return id;
@@ -140,7 +110,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.NAME
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public String getName() {
         return name;
@@ -152,7 +122,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.NOTE
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public String getNote() {
         return note;
@@ -164,7 +134,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.STATUS
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public Short getStatus() {
         return status;
@@ -176,7 +146,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.ICON
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public String getIcon() {
         return icon;
@@ -188,7 +158,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.CREATED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public Date getCreatedAt() {
         return createdAt;
@@ -200,7 +170,7 @@ public class App {
      *
      * @return the value of K_USER.K_APP.UPDATED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 CST 2019
      */
     public Date getUpdatedAt() {
         return updatedAt;
@@ -212,45 +182,9 @@ public class App {
      *
      * @return the value of K_USER.K_APP.DELETED_AT
      *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     * @mbg.generated Mon May 27 17:44:13 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_APP.CLIENT_ID
-     *
-     * @return the value of K_USER.K_APP.CLIENT_ID
-     *
-     * @mbg.generated Fri May 24 16:36:22 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_APP.CLIENT_SECRET
-     *
-     * @return the value of K_USER.K_APP.CLIENT_SECRET
-     *
-     * @mbg.generated Fri May 24 16:36:22 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_APP.REDIRECT_URI
-     *
-     * @return the value of K_USER.K_APP.REDIRECT_URI
-     *
-     * @mbg.generated Fri May 24 16:36:22 CST 2019
-     */
-    public String getRedirectUri() {
-        return redirectUri;
-    }
 }

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

@@ -8,7 +8,7 @@ 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private String clientId;
 
@@ -17,7 +17,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private Integer id;
 
@@ -26,7 +26,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private String name;
 
@@ -35,7 +35,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private String clientSecret;
 
@@ -44,7 +44,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private String redirectUri;
 
@@ -53,7 +53,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private Date createdAt;
 
@@ -62,7 +62,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private Date updatedAt;
 
@@ -71,7 +71,7 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private Date deletedAt;
 
@@ -80,17 +80,26 @@ public class Client {
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     private Integer appId;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_CLIENT.TYPE
+     *
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
+     */
+    private Short type;
+
     /**
      * 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
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
-    public Client(String clientId, Integer id, String name, String clientSecret, String redirectUri, Date createdAt, Date updatedAt, Date deletedAt, Integer appId) {
+    public Client(String clientId, Integer id, String name, String clientSecret, String redirectUri, Date createdAt, Date updatedAt, Date deletedAt, Integer appId, Short type) {
         this.clientId = clientId;
         this.id = id;
         this.name = name;
@@ -100,6 +109,7 @@ public class Client {
         this.updatedAt = updatedAt;
         this.deletedAt = deletedAt;
         this.appId = appId;
+        this.type = type;
     }
 
     /**
@@ -108,7 +118,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.CLIENT_ID
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public String getClientId() {
         return clientId;
@@ -120,7 +130,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.ID
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public Integer getId() {
         return id;
@@ -132,7 +142,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.NAME
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public String getName() {
         return name;
@@ -144,7 +154,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.CLIENT_SECRET
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public String getClientSecret() {
         return clientSecret;
@@ -156,7 +166,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.REDIRECT_URI
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public String getRedirectUri() {
         return redirectUri;
@@ -168,7 +178,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.CREATED_AT
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public Date getCreatedAt() {
         return createdAt;
@@ -180,7 +190,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.UPDATED_AT
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public Date getUpdatedAt() {
         return updatedAt;
@@ -192,7 +202,7 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.DELETED_AT
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public Date getDeletedAt() {
         return deletedAt;
@@ -204,9 +214,21 @@ public class Client {
      *
      * @return the value of K_USER.K_CLIENT.APP_ID
      *
-     * @mbg.generated Mon May 27 16:39:18 CST 2019
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
      */
     public Integer getAppId() {
         return appId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_CLIENT.TYPE
+     *
+     * @return the value of K_USER.K_CLIENT.TYPE
+     *
+     * @mbg.generated Mon May 27 17:34:01 CST 2019
+     */
+    public Short getType() {
+        return type;
+    }
 }

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

@@ -22,14 +22,14 @@ public class CustomClientDetailService implements ClientDetailsService {
     @Override
     public ClientDetails loadClientByClientId(String s) throws ClientRegistrationException {
 
-        Client client = clientMapper.selectByClientId(s);
+        Client client = clientMapper.selectByPrimaryKey(s);
 
         if(null == client)
             throw new ClientRegistrationException("incorrect client id");
 
         BaseClientDetails clientDetails = new BaseClientDetails();
         clientDetails.setClientId(s);
-        clientDetails.setClientSecret("{noop}" + client.getClientId());
+        clientDetails.setClientSecret("{noop}" + client.getClientSecret());
         clientDetails.setAuthorizedGrantTypes(Arrays.asList("authorization_code","client_credentials", "refresh_token", "password", "implicit"));
         clientDetails.setScope(Arrays.asList("*","all"));
         Set<String> uris = new HashSet<>();

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

@@ -39,6 +39,9 @@ public class CustomUserDetailsService implements UserDetailsService {
     @Value("${app.default.app_id}")
     private String default_app_id;
 
+    @Autowired
+    private CustomAuthenticationDetailsSource customAuthenticationDetailsSource;
+
 
 
     @Override

src/main/resources/generatorConfig.xml

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

src/main/resources/mapper/AppMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 24 16:36:22 CST 2019.
+      This element was generated on Mon May 27 17:44:13 CST 2019.
     -->
     <constructor>
       <idArg column="ID" javaType="java.lang.Integer" jdbcType="DECIMAL" />
@@ -16,25 +16,21 @@
       <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="CLIENT_ID" 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" />
     </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 Fri May 24 16:36:22 CST 2019.
+      This element was generated on Mon May 27 17:44:13 CST 2019.
     -->
-    ID, NAME, NOTE, STATUS, ICON, CREATED_AT, UPDATED_AT, DELETED_AT, CLIENT_ID, CLIENT_SECRET, 
-    REDIRECT_URI
+    ID, NAME, NOTE, STATUS, ICON, CREATED_AT, UPDATED_AT, DELETED_AT
   </sql>
   <insert id="insertSelective" parameterType="com.kingkong.bljs.entity.App">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 24 16:36:22 CST 2019.
+      This element was generated on Mon May 27 17:44:13 CST 2019.
     -->
     insert into K_USER.K_APP
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -62,15 +58,6 @@
       <if test="deletedAt != null">
         DELETED_AT,
       </if>
-      <if test="clientId != null">
-        CLIENT_ID,
-      </if>
-      <if test="clientSecret != null">
-        CLIENT_SECRET,
-      </if>
-      <if test="redirectUri != null">
-        REDIRECT_URI,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -97,22 +84,13 @@
       <if test="deletedAt != null">
         #{deletedAt,jdbcType=DATE},
       </if>
-      <if test="clientId != null">
-        #{clientId,jdbcType=VARCHAR},
-      </if>
-      <if test="clientSecret != null">
-        #{clientSecret,jdbcType=VARCHAR},
-      </if>
-      <if test="redirectUri != null">
-        #{redirectUri,jdbcType=VARCHAR},
-      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.kingkong.bljs.entity.App">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 24 16:36:22 CST 2019.
+      This element was generated on Mon May 27 17:44:13 CST 2019.
     -->
     update K_USER.K_APP
     <set>
@@ -137,15 +115,6 @@
       <if test="deletedAt != null">
         DELETED_AT = #{deletedAt,jdbcType=DATE},
       </if>
-      <if test="clientId != null">
-        CLIENT_ID = #{clientId,jdbcType=VARCHAR},
-      </if>
-      <if test="clientSecret != null">
-        CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},
-      </if>
-      <if test="redirectUri != null">
-        REDIRECT_URI = #{redirectUri,jdbcType=VARCHAR},
-      </if>
     </set>
     where ID = #{id,jdbcType=DECIMAL}
   </update>

src/main/resources/mapper/ClientMapper.xml

@@ -5,7 +5,7 @@
     <!--
       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.
+      This element was generated on Mon May 27 17:34:01 CST 2019.
     -->
     <constructor>
       <idArg column="CLIENT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
@@ -17,22 +17,23 @@
       <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" />
+      <arg column="TYPE" javaType="java.lang.Short" 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.
+      This element was generated on Mon May 27 17:34:01 CST 2019.
     -->
     CLIENT_ID, ID, NAME, CLIENT_SECRET, REDIRECT_URI, CREATED_AT, UPDATED_AT, DELETED_AT, 
-    APP_ID
+    APP_ID, TYPE
   </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.
+      This element was generated on Mon May 27 17:34:01 CST 2019.
     -->
     insert into K_USER.K_CLIENT
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -63,6 +64,9 @@
       <if test="appId != null">
         APP_ID,
       </if>
+      <if test="type != null">
+        TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="clientId != null">
@@ -92,13 +96,16 @@
       <if test="appId != null">
         #{appId,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        #{type,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.
+      This element was generated on Mon May 27 17:34:01 CST 2019.
     -->
     update K_USER.K_CLIENT
     <set>
@@ -126,6 +133,9 @@
       <if test="appId != null">
         APP_ID = #{appId,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        TYPE = #{type,jdbcType=DECIMAL},
+      </if>
     </set>
     where CLIENT_ID = #{clientId,jdbcType=VARCHAR}
   </update>