Przeglądaj źródła

!102 修正个人中心第三方应用绑定中的一些小问题
Merge pull request !102 from 王显锋/2.X

疯狂的狮子Li 3 lat temu
rodzic
commit
74ae98bbc5

+ 8 - 2
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java

@@ -1,6 +1,10 @@
 package org.dromara.system.api.domain.bo;
 
 import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * 社会化关系业务对象 sys_social
@@ -8,8 +12,10 @@ import lombok.Data;
  * @author Michelle.Chung
  */
 @Data
-public class RemoteSocialBo {
-
+@NoArgsConstructor
+public class RemoteSocialBo implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
     /**
      * 主键
      */

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java

@@ -31,7 +31,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/client")
+@RequestMapping("/client")
 public class SysClientController extends BaseController {
 
     private final ISysClientService sysClientService;

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java

@@ -24,7 +24,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/social")
+@RequestMapping("/social")
 public class SysSocialController extends BaseController {
 
     private final ISysSocialService socialUserService;

+ 14 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java

@@ -3,11 +3,16 @@ package org.dromara.system.domain.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMappers;
 import lombok.Data;
+import org.dromara.system.api.domain.bo.RemoteSocialBo;
+import org.dromara.system.api.domain.vo.RemoteSocialVo;
 import org.dromara.system.domain.SysSocial;
+import org.dromara.system.domain.bo.SysSocialBo;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 
 /**
@@ -17,7 +22,10 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysSocial.class)
+@AutoMappers({
+    @AutoMapper(target = SysSocial.class, reverseConvertGenerate = false),
+    @AutoMapper(target = RemoteSocialVo.class)
+})
 public class SysSocialVo implements Serializable {
 
     @Serial
@@ -161,5 +169,9 @@ public class SysSocialVo implements Serializable {
     @ExcelProperty(value = "Twitter平台用户的附带属性,部分平台可能没有")
     private String oauthTokenSecret;
 
-
+    /**
+     * 显示绑定时间
+     */
+    @ExcelProperty(value = "绑定时间")
+    private Date createTime;
 }