fix:解决合并冲突

application.yaml

@@ -5,8 +5,9 @@ spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     username: root
-    password: eai123456
-    url: jdbc:mysql://139.196.252.184:3306/eai?useSSL=false&serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true
+    password: abc123
+    #url: jdbc:mysql://139.196.252.184:3306/eai?useSSL=false&serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/eai?useSSL=false&serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&allowPublicKeyRetrieval=true
   data:
     mongodb:
       uri: mongodb://admin:eai123456@139.196.252.184:27017/eai?authSource=admin
@@ -54,7 +55,7 @@ aliyun:
     bucketName: eai-files
 
 logging:
-  config: classpath:log4j2-prod.xml
+  config: classpath:log4j2-dev.xml
 
 openai:
   chatgpt:
@@ -90,4 +91,7 @@ xunfei:
 proxy:
   enabled: false
   host: 20.111.54.16
-  port: 8123
+  port: 8123
+
+server:
+  port: 8082

src/main/java/com/njuzr/eaibackend/po/MyUserDetails.java

@@ -43,7 +43,7 @@ public class MyUserDetails extends BaseUser implements UserDetails {
 
     @Override
     public String getUsername() {
-        // 在User相关类中没有username字段，此处的username其实就是学号
+        // 在User相关类中没有username字段，此处的username其实就是手机号
         return getPhone();
     }
 

src/main/java/com/njuzr/eaibackend/service/impl/AuthenticationServiceImpl.java

@@ -60,7 +60,6 @@ public class AuthenticationServiceImpl implements AuthenticationService {
             MyUserDetails userDetails = (MyUserDetails) authentication.getPrincipal();
 
             log.info("用户认证通过，用户认证信息如下：" + userDetails.toString());
-            // 原来是学号，这里修改为phone
             String jwt = jwtTokenUtil.generateToken(userDetails.getPhone());
             log.info("生成jwt成功，token信息：" + jwt);