修改用户登录逻辑

合并第三方登录逻辑代码块

Author: WxrLZQ

springboot-dubbo-api/src/main/java/com/lzq/api/dto/AccountResult.java

@@ -45,7 +45,7 @@ public class AccountResult implements Serializable{
      */
     @TableField(value = "contact_email")
     @JsonProperty("contactEmail")
-    private String contactEmail;
+    private String contactEmail="";
     /**
      * 密码
      */
@@ -81,7 +81,7 @@ public class AccountResult implements Serializable{
      */
     @TableField("description")
     @JsonProperty("description")
-    private String description;
+    private String description="";
     /**
      * 作品数
      */

springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Account.java

@@ -75,13 +75,13 @@ public class Account implements Serializable, UserDetails {
      * 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

springboot-dubbo-api/src/main/java/com/lzq/api/pojo/UserInfo.java

@@ -19,5 +19,5 @@ public class UserInfo implements Serializable {
     private static final long serialVersionUID = 8560308483184278887L;
 
     //用户id
-    private Integer id;
+    private String id;
 }

springboot-dubbo-api/src/main/java/com/lzq/api/service/AccountService.java

@@ -33,6 +33,12 @@ public interface AccountService {
      */
     Boolean update(Account account) throws Exception;
 
+
+    /**
+     * 绑定第三方id
+     */
+    Boolean bindGit(Account account);
+
     /**
      * 增加作品数
      * @param username

springboot-dubbo-service/pom.xml

@@ -183,7 +183,7 @@
 
     <build>
         <!-- 包名称 -->
-        <finalName>dubbo-service</finalName>
+        <finalName>onlineidea-service</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/mapper/AccountMapper.java

@@ -24,4 +24,6 @@ public interface AccountMapper extends BaseMapper<Account> {
     Integer increaseRecycle(@Param("username") String username);
 
     Integer reduceRecycle(@Param("username") String username);
+
+    Integer bindGit(Account account);
 }

springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/AccountServiceImpl.java

@@ -48,6 +48,11 @@ public Boolean update(Account account) throws NullPointerException {
         return baseMapper.update(account,wrapper)>0?true:false;
     }
 
+    @Override
+    public Boolean bindGit(Account account) {
+        return baseMapper.bindGit(account)>0?true:false;
+    }
+
     @Override
     public Boolean addWorks(String username) {
         return baseMapper.addWorks(username)>0?true:false;

springboot-dubbo-service/src/main/resources/mapper/AccoutMapper.xml

@@ -21,4 +21,14 @@
     <update id="reduceRecycle">
         update account set recycle=recycle-1 where username=#{username}
     </update>
+    <update id="bindGit">
+        update account
+        <if test=" githubId != '' and githubId != null ">
+            set github_id=#{githubId}
+        </if>
+        <if test=" giteeId != '' and giteeId != null ">
+            set gitee_id=#{giteeId}
+        </if>
+        where username=#{username}
+    </update>
 </mapper>

springboot-dubbo-web/lib/webp-imageio-core-0.1.0.jar

@@ -158,6 +158,12 @@
             <artifactId>jasypt-spring-boot</artifactId>
             <version>3.0.2</version>
         </dependency>
+        <!--druid连接池-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.2.4</version>
+        </dependency>
         <!--lombok-->
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -176,13 +182,20 @@
             <artifactId>qiniu-java-sdk</artifactId>
             <version>7.7.0</version>
         </dependency>
-
+        <!--用于转webp-->
+        <dependency>
+            <groupId>com.github.nintha</groupId>
+            <artifactId>webp-imageio-core</artifactId>
+            <version>0.1.0</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/lib/webp-imageio-core-0.1.0.jar</systemPath>
+        </dependency>
     </dependencies>
 
 
     <build>
         <!-- 包名称 -->
-        <finalName>dubbo-web</finalName>
+        <finalName>onlineidea-web</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>