三方登录

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

@@ -41,7 +41,7 @@
 </form>
 <div class="other">
   {{ 'app.login.sign-in-with' | translate }}
-  <i nz-tooltip="使用中联HIS登录" (click)="open('zlhis', 'window')" nz-icon type="alipay-circle" class="icon"></i>
+  <i *ngFor="let item of threeLogin" [nz-tooltip]="item.name" (click)="open(item, 'window')" nz-icon type="alipay-circle" class="icon"></i>
   <!-- <i nz-tooltip="in fact Github via redirect" (click)="open('github')" nz-icon type="taobao-circle" class="icon"></i>
   <i (click)="open('weibo', 'window')" nz-icon type="weibo-circle" class="icon"></i> -->
   <a class="register" routerLink="/passport/register">{{ 'app.login.signup' | translate }}</a>

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

@@ -27,6 +27,7 @@ export class UserLoginComponent implements OnDestroy {
   form: FormGroup;
   error = '';
   type = 0;
+  threeLogin: any[] = [];
 
   constructor(
     fb: FormBuilder,
@@ -50,6 +51,7 @@ export class UserLoginComponent implements OnDestroy {
       remember: [true],
     });
     modalSrv.closeAll();
+    this.threeLogin = this.settingsService.user.threeLogin || [];
   }
 
   // #region fields
@@ -164,36 +166,40 @@ export class UserLoginComponent implements OnDestroy {
 
   // #region social
 
-  open(type: string, openType: SocialOpenType = 'href') {
+  open(item: object, openType: SocialOpenType = 'href') {
     let url = ``;
     let callback = ``;
-    if (environment.production) {
-      callback = 'https://ng-alain.github.io/ng-alain/#/callback/' + type;
-    } else {
-      callback = 'http://localhost:4200/#/callback/' + type;
-    }
-    switch (type) {
-      case 'auth0':
-        url = `//cipchk.auth0.com/login?client=8gcNydIDzGBYxzqV0Vm1CX_RXH-wsWo5&redirect_uri=${decodeURIComponent(
-          callback,
-        )}`;
-        break;
-      case 'github':
-        url = `//github.com/login/oauth/authorize?client_id=9d6baae4b04a23fcafa2&response_type=code&redirect_uri=${decodeURIComponent(
-          callback,
-        )}`;
-        break;
-      case 'weibo':
-        url = `https://api.weibo.com/oauth2/authorize?client_id=1239507802&response_type=code&redirect_uri=${decodeURIComponent(
-          callback,
-        )}`;
-        break;
-      case 'zlhis':
-        url = `https://api.weibo.com/oauth2/authorize?client_id=1239507802&response_type=code&redirect_uri=${decodeURIComponent(
+    const type = item['code'];
+    //if (environment.production) {
+    //  callback = 'https://ng-alain.github.io/ng-alain/#/callback/' + type;
+    //} else {
+     callback = 'http://localhost:4200/#/callback/' + type;
+    //}
+    url = `${item['uri']}?client_id=${item['clientId']}&response_type=code&redirect_uri=${decodeURIComponent(
           callback,
         )}`;
-        break;
-    }
+    // switch (type) {
+    //   case 'auth0':
+    //     url = `//cipchk.auth0.com/login?client=8gcNydIDzGBYxzqV0Vm1CX_RXH-wsWo5&redirect_uri=${decodeURIComponent(
+    //       callback,
+    //     )}`;
+    //     break;
+    //   case 'github':
+    //     url = `//github.com/login/oauth/authorize?client_id=9d6baae4b04a23fcafa2&response_type=code&redirect_uri=${decodeURIComponent(
+    //       callback,
+    //     )}`;
+    //     break;
+    //   case 'weibo':
+    //     url = `https://api.weibo.com/oauth2/authorize?client_id=1239507802&response_type=code&redirect_uri=${decodeURIComponent(
+    //       callback,
+    //     )}`;
+    //     break;
+    //   case 'zlhis':
+    //     url = `https://api.weibo.com/oauth2/authorize?client_id=1239507802&response_type=code&redirect_uri=${decodeURIComponent(
+    //       callback,
+    //     )}`;
+    //     break;
+    // }
     if (openType === 'window') {
       this.socialService
         .login(url, '/', {

pom.xml

@@ -137,11 +137,11 @@
 						<artifactId>ojdbc6</artifactId>
 						<version>11.2.0</version>
 					</dependency>
-					<dependency>
-						<groupId>org.mybatis.generator</groupId>
-						<artifactId>mybatis-generator-core</artifactId>
-						<version>1.3.7</version>
-					</dependency>
+					<!--<dependency>-->
+						<!--<groupId>org.mybatis.generator</groupId>-->
+						<!--<artifactId>mybatis-generator-core</artifactId>-->
+						<!--<version>1.3.7</version>-->
+					<!--</dependency>-->
 				</dependencies>
 			</plugin>
 			<plugin>

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.ThreeloginMapper;
 import com.kingkong.bljs.entity.App;
 import com.kingkong.bljs.security.CustomUser;
 import com.kingkong.bljs.service.*;
@@ -57,6 +58,9 @@ public class IndexController extends ApiController {
     @Autowired
     private AppMapper appMapper;
 
+    @Autowired
+    private ThreeloginMapper threeloginMapper;
+
 
     @GetMapping("app")
     public Map app(@RequestParam("app_id") String app_id) throws Exception{
@@ -64,7 +68,11 @@ public class IndexController extends ApiController {
         List<Map> menu = new ArrayList<Map>();
         result.put("app",appInfo(app_id));
         result.put("menu",null);
-        result.put("user",new HashMap());
+
+        Map user = new HashMap();
+        user.put("threeLogin", threeloginMapper.selectByAppId(app_id));
+
+        result.put("user",user);
 
         return result;
     }
@@ -78,7 +86,7 @@ public class IndexController extends ApiController {
         //先清除缓存
         userService.clearUser(customUser.getUsername(),customUser.getAppid());
         Map user = userService.getCurrentUser();
-
+        user.put("threeLogin", threeloginMapper.selectByAppId(app_id));
 
         result.put("app",appInfo(app_id));
         if(null == user){
@@ -92,7 +100,8 @@ public class IndexController extends ApiController {
     }
 
     private App appInfo(String appid) throws Exception{
-        App app = appMapper.get(appid);
+
+        App app = appMapper.selectByPrimaryKey(Integer.parseInt(appid));
         if(null == app)
             throw new Exception("系统不存在！");
         if(app.getStatus() != 1)

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

@@ -1,15 +1,100 @@
 package com.kingkong.bljs.dao;
 
 import com.kingkong.bljs.entity.App;
-import com.kingkong.bljs.entity.UserApi;
-import org.apache.ibatis.annotations.Param;
+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 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
+     */
+    @Delete({
+        "delete from K_USER.K_APP",
+        "where ID = #{id,jdbcType=DECIMAL}"
+    })
+    int deleteByPrimaryKey(Integer id);
 
-    @Select("select * from k_app where client_id=#{client_id}")
-    App getByClientId(String client_id);
+    /**
+     * 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
+     */
+    @Insert({
+        "insert into K_USER.K_APP (ID, NAME, ",
+        "NOTE, STATUS, ICON, ",
+        "CREATED_AT, UPDATED_AT, ",
+        "DELETED_AT, CLIENT_ID, ",
+        "CLIENT_SECRET, REDIRECT_URI)",
+        "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})"
+    })
+    int insert(App record);
 
-    @Select("select * from   where id=#{id}")
-    App get(String id);
-}
+    /**
+     * 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
+     */
+    int insertSelective(App record);
+
+    /**
+     * 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
+     */
+    @Select({
+        "select",
+        "ID, NAME, NOTE, STATUS, ICON, CREATED_AT, UPDATED_AT, DELETED_AT, CLIENT_ID, ",
+        "CLIENT_SECRET, REDIRECT_URI",
+        "from K_USER.K_APP",
+        "where ID = #{id,jdbcType=DECIMAL}"
+    })
+    @ResultMap("com.kingkong.bljs.dao.AppMapper.BaseResultMap")
+    App selectByPrimaryKey(Integer id);
+
+    /**
+     * 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
+     */
+    int updateByPrimaryKeySelective(App record);
+
+    /**
+     * 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
+     */
+    @Update({
+        "update K_USER.K_APP",
+        "set NAME = #{name,jdbcType=VARCHAR},",
+          "NOTE = #{note,jdbcType=VARCHAR},",
+          "STATUS = #{status,jdbcType=DECIMAL},",
+          "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}",
+        "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/ThreeloginMapper.java

@@ -0,0 +1,96 @@
+package com.kingkong.bljs.dao;
+
+import com.kingkong.bljs.entity.Threelogin;
+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;
+
+import java.util.List;
+
+public interface ThreeloginMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    @Delete({
+        "delete from K_USER.K_THREE_LOGIN",
+        "where CODE = #{code,jdbcType=VARCHAR}"
+    })
+    int deleteByPrimaryKey(String code);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    @Insert({
+        "insert into K_USER.K_THREE_LOGIN (CODE, CLIENT_ID, ",
+        "CLIENT_SECRET, NAME, ",
+        "CREATED_AT, UPDATED_AT, ",
+        "DELETED_AT, APP_ID)",
+        "values (#{code,jdbcType=VARCHAR}, #{clientId,jdbcType=VARCHAR}, ",
+        "#{clientSecret,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
+        "#{createdAt,jdbcType=DATE}, #{updatedAt,jdbcType=DATE}, ",
+        "#{deletedAt,jdbcType=DATE}, #{appId,jdbcType=DECIMAL})"
+    })
+    int insert(Threelogin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    int insertSelective(Threelogin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    @Select({
+        "select",
+        "CODE, CLIENT_ID, CLIENT_SECRET, NAME, CREATED_AT, UPDATED_AT, DELETED_AT, APP_ID",
+        "from K_USER.K_THREE_LOGIN",
+        "where CODE = #{code,jdbcType=VARCHAR}"
+    })
+    @ResultMap("com.kingkong.bljs.dao.ThreeloginMapper.BaseResultMap")
+    Threelogin selectByPrimaryKey(String code);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    int updateByPrimaryKeySelective(Threelogin record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    @Update({
+        "update K_USER.K_THREE_LOGIN",
+        "set CLIENT_ID = #{clientId,jdbcType=VARCHAR},",
+          "CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},",
+          "NAME = #{name,jdbcType=VARCHAR},",
+          "CREATED_AT = #{createdAt,jdbcType=DATE},",
+          "UPDATED_AT = #{updatedAt,jdbcType=DATE},",
+          "DELETED_AT = #{deletedAt,jdbcType=DATE},",
+          "APP_ID = #{appId,jdbcType=DECIMAL}",
+        "where CODE = #{code,jdbcType=VARCHAR}"
+    })
+    int updateByPrimaryKey(Threelogin record);
+
+
+    @Select({"select * from k_three_login where app_id=#{appid}"})
+    List<Threelogin> selectByAppId(String appid);
+}

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

@@ -1,88 +1,256 @@
 package com.kingkong.bljs.entity;
 
+import java.util.Date;
+
 public class App {
-    private int id;
+    /**
+     *
+     * 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
+     */
+    private Integer id;
+
+    /**
+     *
+     * 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
+     */
     private String name;
+
+    /**
+     *
+     * 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
+     */
     private String note;
-    private int status;
+
+    /**
+     *
+     * 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
+     */
+    private Short status;
+
+    /**
+     *
+     * 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
+     */
     private String icon;
-    private String client_id;
-    private String client_secret;
-    private String redirect_uri;
 
+    /**
+     *
+     * 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
+     */
+    private Date createdAt;
 
-    public int getId() {
-        return id;
-    }
+    /**
+     *
+     * 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
+     */
+    private Date updatedAt;
+
+    /**
+     *
+     * 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
+     */
+    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;
 
-    public void setId(int id) {
+    /**
+     *
+     * 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
+     */
+    public App(Integer id, String name, String note, Short status, String icon, Date createdAt, Date updatedAt, Date deletedAt, String clientId, String clientSecret, String redirectUri) {
         this.id = id;
+        this.name = name;
+        this.note = note;
+        this.status = status;
+        this.icon = icon;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+        this.deletedAt = deletedAt;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.redirectUri = redirectUri;
     }
 
-    public String getName() {
-        return name;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.ID
+     *
+     * @return the value of K_USER.K_APP.ID
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
+    public Integer getId() {
+        return id;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.NAME
+     *
+     * @return the value of K_USER.K_APP.NAME
+     *
+     * @mbg.generated Fri May 24 16:36:22 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_APP.NOTE
+     *
+     * @return the value of K_USER.K_APP.NOTE
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
     public String getNote() {
         return note;
     }
 
-    public void setNote(String note) {
-        this.note = note;
-    }
-
-    public int getStatus() {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.STATUS
+     *
+     * @return the value of K_USER.K_APP.STATUS
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
+    public Short getStatus() {
         return status;
     }
 
-    public void setStatus(int status) {
-        this.status = status;
-    }
-
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.ICON
+     *
+     * @return the value of K_USER.K_APP.ICON
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
     public String getIcon() {
         return icon;
     }
 
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getClient_id() {
-        return client_id;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.CREATED_AT
+     *
+     * @return the value of K_USER.K_APP.CREATED_AT
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
+    public Date getCreatedAt() {
+        return createdAt;
     }
 
-    public void setClient_id(String client_id) {
-        this.client_id = client_id;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.UPDATED_AT
+     *
+     * @return the value of K_USER.K_APP.UPDATED_AT
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
+    public Date getUpdatedAt() {
+        return updatedAt;
     }
 
-    public String getClient_secret() {
-        return client_secret;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_APP.DELETED_AT
+     *
+     * @return the value of K_USER.K_APP.DELETED_AT
+     *
+     * @mbg.generated Fri May 24 16:36:22 CST 2019
+     */
+    public Date getDeletedAt() {
+        return deletedAt;
     }
 
-    public void setClient_secret(String client_secret) {
-        this.client_secret = client_secret;
+    /**
+     * 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;
     }
 
-    public String getRedirect_uri() {
-        return redirect_uri;
+    /**
+     * 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;
     }
 
-    public void setRedirect_uri(String redirect_uri) {
-        this.redirect_uri = redirect_uri;
-    }
-
-    public App(int id, String name, String note, int status, String icon, String client_id, String client_secret, String redirect_uri) {
-        this.id = id;
-        this.name = name;
-        this.note = note;
-        this.status = status;
-        this.icon = icon;
-        this.client_id = client_id;
-        this.client_secret = client_secret;
-        this.redirect_uri = redirect_uri;
+    /**
+     * 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/Threelogin.java

@@ -0,0 +1,198 @@
+package com.kingkong.bljs.entity;
+
+import java.util.Date;
+
+public class Threelogin {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.CODE
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private String code;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.CLIENT_ID
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private String clientId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.CLIENT_SECRET
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private String clientSecret;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.NAME
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.CREATED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private Date createdAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.UPDATED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private Date updatedAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.DELETED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private Date deletedAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column K_USER.K_THREE_LOGIN.APP_ID
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    private Integer appId;
+
+
+    private String uri;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table K_USER.K_THREE_LOGIN
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    public Threelogin(String code, String clientId, String clientSecret, String name, Date createdAt, Date updatedAt, Date deletedAt, Integer appId,String uri) {
+        this.code = code;
+        this.clientId = clientId;
+        this.clientSecret = clientSecret;
+        this.name = name;
+        this.createdAt = createdAt;
+        this.updatedAt = updatedAt;
+        this.deletedAt = deletedAt;
+        this.appId = appId;
+        this.uri = uri;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_THREE_LOGIN.CODE
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.CODE
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    public String getCode() {
+        return code;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column K_USER.K_THREE_LOGIN.CLIENT_ID
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.CLIENT_ID
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.CLIENT_SECRET
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.CLIENT_SECRET
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.NAME
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.NAME
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.CREATED_AT
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.CREATED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.UPDATED_AT
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.UPDATED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.DELETED_AT
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.DELETED_AT
+     *
+     * @mbg.generated Fri May 24 17:01:32 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_THREE_LOGIN.APP_ID
+     *
+     * @return the value of K_USER.K_THREE_LOGIN.APP_ID
+     *
+     * @mbg.generated Fri May 24 17:01:32 CST 2019
+     */
+    public Integer getAppId() {
+        return appId;
+    }
+
+    public String getUri(){
+        return this.uri;
+    }
+}

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

@@ -20,18 +20,18 @@ public class CustomClientDetailService implements ClientDetailsService {
     @Override
     public ClientDetails loadClientByClientId(String s) throws ClientRegistrationException {
 
-        App app = appMapper.getByClientId(s);
+        App app = appMapper.selectByClientId(s);
 
         if(null == app)
             throw new ClientRegistrationException("incorrect client id");
 
         BaseClientDetails clientDetails = new BaseClientDetails();
         clientDetails.setClientId(s);
-        clientDetails.setClientSecret("{noop}" + app.getClient_secret());
+        clientDetails.setClientSecret("{noop}" + app.getClientSecret());
         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.getRedirect_uri());
+        uris.add(app.getRedirectUri());
         clientDetails.setRegisteredRedirectUri(uris);
         clientDetails.setAccessTokenValiditySeconds(3600*24);
         return clientDetails;

src/main/resources/application-c.properties

@@ -1,4 +1,4 @@
-spring.datasource.url=jdbc:oracle:thin:@192.168.1.150:1521:es
+spring.datasource.url=jdbc:oracle:thin:@127.0.0.1:1521:test2
 spring.datasource.username=k_user
 spring.datasource.password=123
 spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver

src/main/resources/application.properties

@@ -1 +1 @@
-spring.profiles.active=his
+spring.profiles.active=c

src/main/resources/generatorConfig.xml

@@ -14,12 +14,12 @@
 
         <!-- optional，旨在创建class时，对注释进行控制 -->
         <commentGenerator>
-            <property name="suppressDate" value="true" />
+            <property name="suppressAllComments" value="false" />
         </commentGenerator>
 
 
         <!--jdbc的数据库连接 -->
-        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@127.0.0.1:1521:orcl" userId="k_user" password="123">
+        <jdbcConnection driverClass="oracle.jdbc.driver.OracleDriver" connectionURL="jdbc:oracle:thin:@127.0.0.1:1521:test2" userId="k_user" password="123">
         </jdbcConnection>
 
 
@@ -51,7 +51,7 @@
         </javaModelGenerator>
 
         <!--Mapper映射文件生成所在的目录 为每一个数据库的表生成对应的SqlMap文件 -->
-        <sqlMapGenerator targetPackage="com.kingkong.bljs.dao" targetProject="src/main/java">
+        <sqlMapGenerator targetPackage="mapper" targetProject="src/main/resources">
             <property name="enableSubPackages" value="false"/>
         </sqlMapGenerator>
 
@@ -87,7 +87,8 @@
 
 
 
-        <table tableName="k_dictionary" schema="k_user">
+        <table tableName="k_three_login" schema="k_user" enableCountByExample="false" enableUpdateByExample="false" enableDeleteByExample="false"
+               enableSelectByExample="false" selectByExampleQueryId="false">
 
             <!-- optional   , only for mybatis3 runtime
                  自动生成的键值（identity,或者序列值）
@@ -127,7 +128,7 @@
                     delimitedColumnName:true ,匹配column的值和数据库列的名称 大小写完全匹配，false 忽略大小写匹配
                     是否限定表的列名，即固定表列在Model中的名称
             -->
-            <ignoreColumn column="PLAN_ID"  delimitedColumnName="true" />
+            <!--<ignoreColumn column="PLAN_ID"  delimitedColumnName="true" />-->
 
 
             <!--optional.覆盖MBG对Model 的生成规则

src/main/resources/mapper/ThreeloginMapper.xml

@@ -0,0 +1,121 @@
+<?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.ThreeloginMapper">
+  <resultMap id="BaseResultMap" type="com.kingkong.bljs.entity.Threelogin">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 24 17:01:32 CST 2019.
+    -->
+    <constructor>
+      <idArg column="CODE" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="CLIENT_ID" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="CLIENT_SECRET" javaType="java.lang.String" jdbcType="VARCHAR" />
+      <arg column="NAME" 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 Fri May 24 17:01:32 CST 2019.
+    -->
+    CODE, CLIENT_ID, CLIENT_SECRET, NAME, CREATED_AT, UPDATED_AT, DELETED_AT, APP_ID
+  </sql>
+  <insert id="insertSelective" parameterType="com.kingkong.bljs.entity.Threelogin">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 24 17:01:32 CST 2019.
+    -->
+    insert into K_USER.K_THREE_LOGIN
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="code != null">
+        CODE,
+      </if>
+      <if test="clientId != null">
+        CLIENT_ID,
+      </if>
+      <if test="clientSecret != null">
+        CLIENT_SECRET,
+      </if>
+      <if test="name != null">
+        NAME,
+      </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="code != null">
+        #{code,jdbcType=VARCHAR},
+      </if>
+      <if test="clientId != null">
+        #{clientId,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSecret != null">
+        #{clientSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        #{name,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.Threelogin">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 24 17:01:32 CST 2019.
+    -->
+    update K_USER.K_THREE_LOGIN
+    <set>
+      <if test="clientId != null">
+        CLIENT_ID = #{clientId,jdbcType=VARCHAR},
+      </if>
+      <if test="clientSecret != null">
+        CLIENT_SECRET = #{clientSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        NAME = #{name,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 CODE = #{code,jdbcType=VARCHAR}
+  </update>
+</mapper>