1

pom.xml

@@ -110,6 +110,7 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+<<<<<<< HEAD
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>
@@ -118,6 +119,8 @@
 
 
 
+=======
+>>>>>>> c8f9768 (1)
     </dependencies>
     <dependencyManagement>
         <dependencies>

src/main/java/com/zhentao/information/controller/MessageController.java

@@ -34,10 +34,7 @@ public class MessageController {
      * 发送消息接口
      */
     @PostMapping("/send")
-    @NullLogin
-    public String sendMessage(@RequestHeader("token")String token,@RequestBody Message message) {
-        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
-        message.setFromUserId(userIdFromToken);
+    public String sendMessage(@RequestBody Message message) {
         log.info("收到消息：发送者={}, 接收者={}, 内容={}",
                 message.getFromUserId(),
                 message.getToUserId(),

src/main/java/com/zhentao/user/domain/UserLogin.java

@@ -125,20 +125,36 @@ public class UserLogin implements Serializable {
     private Date updatedTime;
 
     /**
+<<<<<<< HEAD
      *
+=======
+     *
+>>>>>>> c8f9768 (1)
      */
     private String openId;
 
     /**
+<<<<<<< HEAD
+     *
+=======
      *
+>>>>>>> c8f9768 (1)
      */
     private String sessionKey;
 
     /**
+<<<<<<< HEAD
      *
+=======
+     *
+>>>>>>> c8f9768 (1)
      */
     private String uniId;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> c8f9768 (1)

src/main/java/com/zhentao/user/dto/UserPassDto.java

@@ -3,6 +3,7 @@ package com.zhentao.user.dto;
 import lombok.Data;
 import lombok.ToString;
 
+
 import javax.validation.constraints.NotBlank;
 
 @Data