登录状态下进行第三方绑定

WxrLZQ · WxrLZQ · commit ae650d8cfcf8 · 2021-09-08T17:24:49.000+08:00
diff --git a/springboot-dubbo-api/springboot-dubbo-api.iml b/springboot-dubbo-api/springboot-dubbo-api.iml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+          </map>
+        </option>
+      </configuration>
+    </facet>
     <facet type="Spring" name="Spring">
       <configuration />
     </facet>
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java b/springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java
@@ -58,17 +58,23 @@ public class AccountResult implements Serializable{
     @TableField(value = "user_picture")
     @JsonProperty("userPicture")
     private String userPicture;
+    /**
+     * 背景颜色
+     */
+    @TableField(value = "background_color")
+    @JsonProperty("backgroundColor")
+    private String backgroundColor;
     /**
      * github主键id
      */
     @TableField(value = "github_id")
-    @JsonIgnore
+    @JsonProperty("githubId")
     private String githubId;
     /**
      * gitee主键id
      */
     @TableField(value = "gitee_id")
-    @JsonIgnore
+    @JsonProperty("giteeId")
     private String giteeId;
     /**
      * 角色id
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java
@@ -68,20 +68,20 @@ public class Account implements Serializable, UserDetails {
     /**
      * 背景颜色
      */
-    @TableField(value = "backgroud_color")
+    @TableField(value = "background_color")
     @JsonIgnore
-    private String backgroudColor;
+    private String backgroundColor;
     /**
      * github主键id
      */
     @TableField(value = "github_id")
-    @JsonProperty("githubId")
+    @JsonIgnore
     private String githubId;
     /**
      * gitee主键id
      */
     @TableField(value = "gitee_id")
-    @JsonProperty("giteeId")
+    @JsonIgnore
     private String giteeId;
     /**
      * 角色id
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountResultService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountResultService.java
@@ -3,6 +3,7 @@
 
 import com.github.pagehelper.PageInfo;
 import com.lzq.api.dto.AccountResult;
+import com.lzq.api.pojo.Account;
 
 /**
  * @author ：LZQ
@@ -34,5 +35,11 @@ public interface AccountResultService {
      */
     PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPage);
 
+    /**
+     * 更新喜爱数（校正喜爱数）
+     * @param result
+     * @return
+     */
+    Boolean updateFavorites(AccountResult result);
 
 }
diff --git a/springboot-dubbo-api/src/main/resources/rebel.xml b/springboot-dubbo-api/src/main/resources/rebel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>springboot-dubbo-api</id>
+
+	<classpath>
+		<dir name="F:/项目/MyDemo/OnlineIDE/springboot-dubbo-api/target/classes">
+		</dir>
+	</classpath>
+
+</application>
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountResultMapper.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountResultMapper.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.lzq.api.dto.AccountResult;
+import com.lzq.api.pojo.Account;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -17,4 +18,6 @@ public interface AccountResultMapper extends BaseMapper<AccountResult> {
     public List<AccountResult> getFollowList(AccountResult result);
 
     public List<AccountResult> getFanList(AccountResult result);
+
+    Integer updateFavorites(AccountResult result);
 }
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountResultServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountResultServiceImpl.java
@@ -45,4 +45,9 @@ public PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPa
         List<AccountResult> list = baseMapper.getFanList(result);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public Boolean updateFavorites(AccountResult result) {
+        return baseMapper.updateFavorites(result)>0?true:false;
+    }
 }
diff --git a/springboot-dubbo-service/src/main/resources/mapper/AccoutResultMapper.xml b/springboot-dubbo-service/src/main/resources/mapper/AccoutResultMapper.xml
@@ -3,8 +3,7 @@
 <mapper namespace="com.lzq.dubboservice.mapper.AccountResultMapper">
 
     <sql id="AccountResult">
-        a.username, name, email, contact_email, password, user_picture,
-          description, fan, following
+        a.username, name, email, contact_email, user_picture
     </sql>
 
     <select id="getFollowList" resultType="com.lzq.api.dto.AccountResult">
@@ -26,4 +25,8 @@
         where
             b.follow_username=#{username}
     </select>
+
+    <update id="updateFavorites">
+        update account set favorites=#{favorites} where username=#{username}
+    </update>
 </mapper>
diff --git a/springboot-dubbo-web/pom.xml b/springboot-dubbo-web/pom.xml
@@ -86,7 +86,7 @@
             <artifactId>selenium-java</artifactId>
             <version>3.9.1</version>
         </dependency>
-        <!--版本冲突必须和seleniumhq同时导入-->
+        <!--版本冲突时必须和seleniumhq同时导入-->
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java b/springboot-dubbo-web/src/main/java/com/lzq/web/config/SecurityConfig.java
@@ -100,11 +100,11 @@ protected void configure(HttpSecurity http) throws Exception {
                 .authenticationSuccessHandler((httpServletRequest, httpServletResponse, authentication) -> {
                     Map<String, Object> map = new HashMap();
                     HashMap<String, String> jwtmap = new HashMap();
-                    jwtmap.put("username", authentication.getName());
-                    //生成token
-                    String token = JWTUtils.getToken(jwtmap);
                     //获取用户
                     Account account = (Account) authentication.getPrincipal();
+                    jwtmap.put("username", account.getUsername());
+                    //生成token
+                    String token = JWTUtils.getToken(jwtmap);
                     Map<String, Object> withToken = ResultMapUtils.ResultMapWithToken(true, 0, account, token);
                     httpServletRequest.getSession().setAttribute("map", withToken);
                     UserUtils.responseMessage(httpServletResponse, withToken, objectMapper);
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/IndexController.java
@@ -343,8 +343,11 @@ public Map<String, Object> doLogin(HttpServletRequest request) {
                     account = (Account) auth.getPrincipal();
                     log.info("用户信息为：" + account.toString());
                     SecurityContextHolder.getContext().setAuthentication(auth);
-                    ;
-                    Map<String, Object> map = ResultMapUtils.ResultMap(true, 0, account);
+                    //生成登录token
+                    Map<String, String> tokenMap = new HashMap<>();
+                    tokenMap.put("username",account.getUsername());
+                    String resultToken = JWTUtils.getToken(tokenMap);
+                    Map<String, Object> map = ResultMapUtils.ResultMapWithToken(true, 0, account,resultToken);
                     //存入用户信息
                     request.getSession().setAttribute("map", map);
                     return map;
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/QueryController.java
@@ -20,6 +20,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import java.util.List;
 import java.util.Map;
 
@@ -60,21 +61,21 @@ public class QueryController {
      */
     @GetMapping("/queryByUsername")
     @ApiOperation("根据用户名查询用户信息")
-    public Map<String, Object> queryByUsername(String username) {
+    public Map<String, Object> queryByUsername(HttpSession session, String username) {
+
         log.info("根据用户名查询用户信息接口："+username);
         //获取用户信息
         AccountResult result = accountResultService.queryByUsername(username);
         //获取喜爱人数
         Integer count = favoritesService.getCount(username);
-        //当喜爱数不匹配时进行更新
-        if (!result.getFavorites().equals(count)) {
-            result.setFavorites(count);
-            Account account = new Account();
-            account.setUsername(result.getUsername());
-            account.setFavorites(count);
-            //更新数据
-            Boolean aBoolean = accountService.updateFavorites(account);
-            log.info("校正用户喜爱数成功:" + aBoolean.toString());
+        if (result!=null){
+            //当喜爱数不匹配时进行更新
+            if (!result.getFavorites().equals(count)) {
+                result.setFavorites(count);
+                //更新数据
+                Boolean aBoolean = accountResultService.updateFavorites(result);
+                log.info("校正用户喜爱数成功:" + aBoolean.toString());
+            }
         }
         return ResultMapUtils.ResultMap(true, 0, result);
     }
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/UserController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/UserController.java
@@ -100,7 +100,7 @@ public Map<String, Object> unbindGithub(HttpServletRequest request, Account acco
     @PutMapping("/unbindGitee")
     @ApiOperation("解绑Gitee")
     public Map<String, Object> unbindGitee(HttpServletRequest request, Account account) {
-        log.info(account.toString());
+        log.info("进入了解绑gitee接口："+account.toString());
         account.setGiteeId("");
         try {
             Boolean update = accountService.update(account);
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/utils/UserUtils.java b/springboot-dubbo-web/src/main/java/com/lzq/web/utils/UserUtils.java
@@ -33,6 +33,9 @@ public class UserUtils {
     public static Map<String, Object> BindAccount(Account account, String headtoken, AccountService accountService) {
         //用户保存jwt信息
         HashMap<String, String> jwtmap = new HashMap();
+        jwtmap.put("username", account.getUsername());
+        //登录成功生产token
+        String token = JWTUtils.getToken(jwtmap);
         //判断是否有token 有token则需要进行第三方绑定 没有则正常登录返回结果
         if (StringUtils.isNotBlank(headtoken)) {
             //验证token
@@ -43,28 +46,22 @@ public static Map<String, Object> BindAccount(Account account, String headtoken,
             if (StringUtils.isNotBlank(id)) {
                 if (StringUtils.isNotBlank(account.getGithubId())) {
                     //该用户已经绑定了github账号
-                    return ResultMapUtils.ResultMapWithToken(true,1,account,null);
+                    return ResultMapUtils.ResultMapWithToken(true,1,account,token);
                 }
                 account.setGithubId(id);
             } else {
                 log.info("gitee为："+account.getGiteeId());
                 if (StringUtils.isNotBlank(account.getGiteeId())) {
                     //该用户已经绑定了gitee账号
-                    return ResultMapUtils.ResultMapWithToken(true,1,account,null);
+                    return ResultMapUtils.ResultMapWithToken(true,1,account,token);
 
                 }
                 account.setGiteeId(verify.getClaim("giteeId").asString());
             }
             //更新数据进行账号绑定
             accountService.bindGit(account);
-            //登录成功生产token
-            jwtmap.put("username", account.getUsername());
-            String token = JWTUtils.getToken(jwtmap);
             return ResultMapUtils.ResultMapWithToken(true,2,account,token);
         }else {
-            //登录成功生产token
-            jwtmap.put("username", account.getUsername());
-            String token = JWTUtils.getToken(jwtmap);
             //返回信息
             return ResultMapUtils.ResultMapWithToken(true,0,account,token);
         }
@@ -106,25 +103,35 @@ public static Map<String, Object> callback(HttpServletRequest request, BaseOuath
         JSONObject userInfo = baseOuathService.getUserInfo(baseOuathService.getAccessToken(code, state));
         //把返回的信息封装成对象
         UserInfo info = JSON.parseObject(userInfo.toString(), UserInfo.class);
-
+        log.info("获取第三方信息"+info.toString());
         //用户登录的状态下进行第三方绑定
         //根据git类型查询用户信息
         if (gitType.equals("giteeId")){
             rest = accountService.queryByGitId(null, info.getId());
             if (StringUtils.isNotBlank(header)){
+                //获取token中的用户名
+                log.info(header);
+                String username = JWTUtils.verify(header).getClaim("username").asString();
+                log.info(username);
                 if (rest==null){
+                    rest=new Account();
+                    rest.setUsername(username);
                     rest.setGiteeId(info.getId());
                     accountService.bindGit(rest);
-                    return ResultMapUtils.ResultMapWithToken(true, 1, "登陆状态下绑定第三方成功", null);
+                    return ResultMapUtils.ResultMap(true, 1, "登陆状态下绑定第三方成功");
                 }else {
-                    return ResultMapUtils.ResultMapWithToken(false,1,"登录状态下绑定第三方失败,该第三方已绑定其他账号",null);
+                    return ResultMapUtils.ResultMap(false,1,"登录状态下绑定第三方失败,该第三方已绑定其他账号");
                 }
 
             }
         }else if (gitType.equals("githubId")){
             rest = accountService.queryByGitId(info.getId(),null );
             if (StringUtils.isNotBlank(header)){
+                //获取token中的用户名
+                String username = JWTUtils.verify(header).getClaim("username").asString();
                 if (rest==null){
+                    rest=new Account();
+                    rest.setUsername(username);
                     rest.setGithubId(info.getId());
                     accountService.bindGit(rest);
                     return ResultMapUtils.ResultMapWithToken(true, 1, "登陆状态下绑定第三方成功", null);

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,9 @@ public PageInfo<AccountResult> getFanList(AccountResult result,Integer currentPa`
`45`	`45`	`List<AccountResult> list = baseMapper.getFanList(result);`
`46`	`46`	`return new PageInfo<>(list);`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ @Override`
	`50`	`+ public Boolean updateFavorites(AccountResult result) {`
	`51`	`+ return baseMapper.updateFavorites(result)>0?true:false;`
	`52`	`+ }`
`48`	`53`	`}`