diff --git a/src/main/java/com/example/chat/service/websocket/WebSocketServer.java b/src/main/java/com/example/chat/controller/websocket/WebSocketServer.java similarity index 98% rename from src/main/java/com/example/chat/service/websocket/WebSocketServer.java rename to src/main/java/com/example/chat/controller/websocket/WebSocketServer.java index 5fdc93e..5a19aa2 100644 --- a/src/main/java/com/example/chat/service/websocket/WebSocketServer.java +++ b/src/main/java/com/example/chat/controller/websocket/WebSocketServer.java @@ -1,4 +1,4 @@ -package com.example.chat.service.websocket; +package com.example.chat.controller.websocket; import com.alibaba.fastjson.JSON; import com.example.chat.dao.chat.ChatMapper; diff --git a/src/main/java/com/example/chat/dao/Login.java b/src/main/java/com/example/chat/dao/Login.java index 5d3aa22..e787e47 100644 --- a/src/main/java/com/example/chat/dao/Login.java +++ b/src/main/java/com/example/chat/dao/Login.java @@ -45,4 +45,12 @@ public class Login implements UserMapper { sqlSession.close(); return returnUser; } + + @Override + public void modifyHead(String pic, String account) throws IOException { + SqlSession sqlSession=MybatisSingleton.getSqlSessionFactory().openSession(); + sqlSession.update("dao.Login.updateHead",new User("","",account,pic,"")); + sqlSession.close(); + } + } diff --git a/src/main/java/com/example/chat/dao/Test01.java b/src/main/java/com/example/chat/dao/Test01.java index d4b0d86..5322911 100644 --- a/src/main/java/com/example/chat/dao/Test01.java +++ b/src/main/java/com/example/chat/dao/Test01.java @@ -16,7 +16,7 @@ public class Test01 implements CommandLineRunner { public void run(String... args) throws Exception { while (true) { SqlSession sqlSession = MybatisSingleton.getSqlSessionFactory().openSession(); - User user = sqlSession.selectOne("dao.Login.getUser", "123"); + User user = sqlSession.selectOne("dao.Login.getUser", "img/123/123"); if (user != null) { System.out.println(user); } diff --git a/src/main/java/com/example/chat/dao/UserMapper.java b/src/main/java/com/example/chat/dao/UserMapper.java index 406631b..9fda91f 100644 --- a/src/main/java/com/example/chat/dao/UserMapper.java +++ b/src/main/java/com/example/chat/dao/UserMapper.java @@ -14,4 +14,6 @@ public interface UserMapper { public abstract User getUser(User user) throws IOException; public abstract User emailCheck(User user) throws IOException; + + public abstract void modifyHead(String Pic,String username) throws IOException; } diff --git a/src/main/java/com/example/chat/dao/chat/ChatMapper.java b/src/main/java/com/example/chat/dao/chat/ChatMapper.java index dc83df6..814a3ef 100644 --- a/src/main/java/com/example/chat/dao/chat/ChatMapper.java +++ b/src/main/java/com/example/chat/dao/chat/ChatMapper.java @@ -14,5 +14,5 @@ public interface ChatMapper { public abstract List getMessage() throws IOException; - public abstract void updateMessage(UpdateMessage updateMessage) throws IOException; + public abstract void updateMessage(Message message) throws IOException; } diff --git a/src/main/java/com/example/chat/dao/chat/ChatMessage.java b/src/main/java/com/example/chat/dao/chat/ChatMessage.java index 35e0137..4700d6f 100644 --- a/src/main/java/com/example/chat/dao/chat/ChatMessage.java +++ b/src/main/java/com/example/chat/dao/chat/ChatMessage.java @@ -20,9 +20,9 @@ public class ChatMessage implements ChatMapper { } @Override - public void updateMessage(UpdateMessage updateMessage) throws IOException { + public void updateMessage(Message message) throws IOException { SqlSession sqlSession = MybatisSingleton.getSqlSessionFactory().openSession(); - sqlSession.update("dao.chat.Message.updateMessage", updateMessage); + sqlSession.update("dao.chat.Message.updateHead", message); sqlSession.commit(); sqlSession.close(); } diff --git a/src/main/java/com/example/chat/entity/User.java b/src/main/java/com/example/chat/entity/User.java index 7b7dc81..3895a34 100644 --- a/src/main/java/com/example/chat/entity/User.java +++ b/src/main/java/com/example/chat/entity/User.java @@ -4,7 +4,7 @@ public class User { private String username; private String password; private String account; - + private String pic; private String email; @@ -18,6 +18,14 @@ public class User { this.email = email; } + public User(String username, String password, String account, String pic, String email) { + this.username = username; + this.password = password; + this.account = account; + this.pic = pic; + this.email = email; + } + /** * 获取 * @@ -93,4 +101,20 @@ public class User { public String toString() { return "User{username = " + username + ", password = " + password + ", account = " + account + ", email = " + email + "}"; } + + /** + * 获取 + * @return pic + */ + public String getPic() { + return pic; + } + + /** + * 设置 + * @param pic + */ + public void setPic(String pic) { + this.pic = pic; + } } diff --git a/src/main/java/com/example/chat/service/LoginService.java b/src/main/java/com/example/chat/service/LoginService.java index 98900b7..ec2b304 100644 --- a/src/main/java/com/example/chat/service/LoginService.java +++ b/src/main/java/com/example/chat/service/LoginService.java @@ -57,7 +57,7 @@ public class LoginService { returnInt = 1002; } } else { - requestUser.setUsername("用户"); + requestUser.setUsername(requestUser.getAccount()); userTable.addUser(requestUser); returnInt = 200; } diff --git a/src/main/resources/mapper/LoginMapper.xml b/src/main/resources/mapper/LoginMapper.xml index 1b73614..52257d8 100644 --- a/src/main/resources/mapper/LoginMapper.xml +++ b/src/main/resources/mapper/LoginMapper.xml @@ -13,8 +13,8 @@ - insert into user(account, password, username, email) - values (#{account}, #{password}, #{username}, #{email}); + insert into user(account, password, username, email, pic) + values (#{account}, #{password}, #{username}, #{email}, #{pic}); delete @@ -26,4 +26,9 @@ set password=#{password} and username = #{username} and email = #{email} where account = #{account}; + + update user + set pic=#{pic} + where account = #{account} + diff --git a/src/main/resources/mapper/MessageMapper.xml b/src/main/resources/mapper/MessageMapper.xml index b55ea88..72f4517 100644 --- a/src/main/resources/mapper/MessageMapper.xml +++ b/src/main/resources/mapper/MessageMapper.xml @@ -11,11 +11,10 @@ values (#{nickname}, #{pic}, #{sendTime}, #{message}) - + update message - set nickname=#{newName} and pic = #{newPic} + set and pic = #{pic} where nickname = #{nickname} - and pic = #{pic}