open-soure / cim · 提交

转到一个项目

作者 crossoverJie
提交 2a13ae58d147df09e7aaed5ba0184e4e7dc1b95a 1 个父辈 bb33fa70

:recycle: Refactoring code.联调成功4

内嵌 并排对比
正在显示 4 个修改的文件 包含 42 行增加 和 35 行删除
@@ -15,5 +15,10 @@ public final class Constant { @@ -15,5 +15,10 @@ public final class Constant {
15 */ 15 */
16 public final static String ACCOUNT_PREFIX = "cim-account:"; 16 public final static String ACCOUNT_PREFIX = "cim-account:";
17 17
  18 + /**
  19 + * 路由信息前缀
  20 + */
  21 + public final static String ROUTE_PREFIX = "cim-route:";
  22 +
18 23
19 } 24 }
@@ -34,93 +34,94 @@ public class RouteController { @@ -34,93 +34,94 @@ public class RouteController {
34 private final static Logger LOGGER = LoggerFactory.getLogger(RouteController.class); 34 private final static Logger LOGGER = LoggerFactory.getLogger(RouteController.class);
35 35
36 @Autowired 36 @Autowired
37 - private ServerCache serverCache ; 37 + private ServerCache serverCache;
38 38
39 @Autowired 39 @Autowired
40 private AccountService accountService; 40 private AccountService accountService;
41 41
42 @ApiOperation("群聊 API") 42 @ApiOperation("群聊 API")
43 - @RequestMapping(value = "groupRoute",method = RequestMethod.POST) 43 + @RequestMapping(value = "groupRoute", method = RequestMethod.POST)
44 @ResponseBody() 44 @ResponseBody()
45 - public BaseResponse<NULLBody> groupRoute(@RequestBody GroupReqVO groupReqVO){ 45 + public BaseResponse<NULLBody> groupRoute(@RequestBody GroupReqVO groupReqVO) {
46 BaseResponse<NULLBody> res = new BaseResponse(); 46 BaseResponse<NULLBody> res = new BaseResponse();
47 47
48 LOGGER.info("msg=[{}]", groupReqVO.toString()); 48 LOGGER.info("msg=[{}]", groupReqVO.toString());
49 49
50 - res.setCode(StatusEnum.SUCCESS.getCode()) ;  
51 - res.setMessage(StatusEnum.SUCCESS.getMessage()) ;  
52 - return res ; 50 + res.setCode(StatusEnum.SUCCESS.getCode());
  51 + res.setMessage(StatusEnum.SUCCESS.getMessage());
  52 + return res;
53 } 53 }
54 54
55 55
56 /** 56 /**
57 * 私聊路由 57 * 私聊路由
  58 + *
58 * @param p2pRequest 59 * @param p2pRequest
59 * @return 60 * @return
60 */ 61 */
61 @ApiOperation("私聊 API") 62 @ApiOperation("私聊 API")
62 - @RequestMapping(value = "p2pRoute",method = RequestMethod.POST) 63 + @RequestMapping(value = "p2pRoute", method = RequestMethod.POST)
63 @ResponseBody() 64 @ResponseBody()
64 - public BaseResponse<NULLBody> p2pRoute(@RequestBody P2PReqVO p2pRequest){ 65 + public BaseResponse<NULLBody> p2pRoute(@RequestBody P2PReqVO p2pRequest) {
65 BaseResponse<NULLBody> res = new BaseResponse(); 66 BaseResponse<NULLBody> res = new BaseResponse();
66 67
67 - res.setCode(StatusEnum.SUCCESS.getCode()) ;  
68 - res.setMessage(StatusEnum.SUCCESS.getMessage()) ;  
69 - return res ; 68 + res.setCode(StatusEnum.SUCCESS.getCode());
  69 + res.setMessage(StatusEnum.SUCCESS.getMessage());
  70 + return res;
70 } 71 }
71 72
72 /** 73 /**
73 * 获取一台 CIM server 74 * 获取一台 CIM server
  75 + *
74 * @return 76 * @return
75 */ 77 */
76 @ApiOperation("登录并获取服务器") 78 @ApiOperation("登录并获取服务器")
77 - @RequestMapping(value = "login",method = RequestMethod.POST) 79 + @RequestMapping(value = "login", method = RequestMethod.POST)
78 @ResponseBody() 80 @ResponseBody()
79 public BaseResponse<CIMServerResVO> login(@RequestBody LoginReqVO loginReqVO) throws Exception { 81 public BaseResponse<CIMServerResVO> login(@RequestBody LoginReqVO loginReqVO) throws Exception {
80 BaseResponse<CIMServerResVO> res = new BaseResponse(); 82 BaseResponse<CIMServerResVO> res = new BaseResponse();
81 83
82 //登录校验 84 //登录校验
83 boolean login = accountService.login(loginReqVO); 85 boolean login = accountService.login(loginReqVO);
84 - if (login){ 86 + if (login) {
85 String server = serverCache.selectServer(); 87 String server = serverCache.selectServer();
86 String[] serverInfo = server.split(":"); 88 String[] serverInfo = server.split(":");
87 - CIMServerResVO vo = new CIMServerResVO(serverInfo[0],Integer.parseInt(serverInfo[1])) ; 89 + CIMServerResVO vo = new CIMServerResVO(serverInfo[0], Integer.parseInt(serverInfo[1]));
88 90
89 //保存路由信息 91 //保存路由信息
90 - accountService.saveRouteInfo(vo) ; 92 + accountService.saveRouteInfo(loginReqVO,server);
91 93
92 res.setDataBody(vo); 94 res.setDataBody(vo);
93 - res.setCode(StatusEnum.SUCCESS.getCode()) ;  
94 - res.setMessage(StatusEnum.SUCCESS.getMessage()) ;  
95 - }else {  
96 - res.setCode(StatusEnum.FAIL.getCode()) ;  
97 - res.setMessage(StatusEnum.FAIL.getMessage()) ; 95 + res.setCode(StatusEnum.SUCCESS.getCode());
  96 + res.setMessage(StatusEnum.SUCCESS.getMessage());
  97 + } else {
  98 + res.setCode(StatusEnum.FAIL.getCode());
  99 + res.setMessage(StatusEnum.FAIL.getMessage());
98 } 100 }
99 101
100 - return res ; 102 + return res;
101 } 103 }
102 104
103 /** 105 /**
104 * 注册账号 106 * 注册账号
  107 + *
105 * @return 108 * @return
106 */ 109 */
107 @ApiOperation("注册账号") 110 @ApiOperation("注册账号")
108 - @RequestMapping(value = "registerAccount",method = RequestMethod.POST) 111 + @RequestMapping(value = "registerAccount", method = RequestMethod.POST)
109 @ResponseBody() 112 @ResponseBody()
110 public BaseResponse<RegisterInfoResVO> registerAccount(@RequestBody RegisterInfoReqVO registerInfoReqVO) throws Exception { 113 public BaseResponse<RegisterInfoResVO> registerAccount(@RequestBody RegisterInfoReqVO registerInfoReqVO) throws Exception {
111 BaseResponse<RegisterInfoResVO> res = new BaseResponse(); 114 BaseResponse<RegisterInfoResVO> res = new BaseResponse();
112 115
113 long userId = System.currentTimeMillis(); 116 long userId = System.currentTimeMillis();
114 - RegisterInfoResVO info = new RegisterInfoResVO(userId,registerInfoReqVO.getUserName()) ; 117 + RegisterInfoResVO info = new RegisterInfoResVO(userId, registerInfoReqVO.getUserName());
115 info = accountService.register(info); 118 info = accountService.register(info);
116 119
117 res.setDataBody(info); 120 res.setDataBody(info);
118 - res.setCode(StatusEnum.SUCCESS.getCode()) ;  
119 - res.setMessage(StatusEnum.SUCCESS.getMessage()) ;  
120 - return res ; 121 + res.setCode(StatusEnum.SUCCESS.getCode());
  122 + res.setMessage(StatusEnum.SUCCESS.getMessage());
  123 + return res;
121 } 124 }
122 125
123 126
124 -  
125 -  
126 } 127 }
1 package com.crossoverjie.cim.route.service; 1 package com.crossoverjie.cim.route.service;
2 2
3 import com.crossoverjie.cim.route.vo.req.LoginReqVO; 3 import com.crossoverjie.cim.route.vo.req.LoginReqVO;
4 -import com.crossoverjie.cim.route.vo.res.CIMServerResVO;  
5 import com.crossoverjie.cim.route.vo.res.RegisterInfoResVO; 4 import com.crossoverjie.cim.route.vo.res.RegisterInfoResVO;
6 5
7 /** 6 /**
@@ -31,8 +30,9 @@ public interface AccountService { @@ -31,8 +30,9 @@ public interface AccountService {
31 30
32 /** 31 /**
33 * 保存路由信息 32 * 保存路由信息
34 - * @param vo 33 + * @param msg 服务器信息
  34 + * @param loginReqVO 用户信息
35 * @throws Exception 35 * @throws Exception
36 */ 36 */
37 - void saveRouteInfo(CIMServerResVO vo) throws Exception ; 37 + void saveRouteInfo(LoginReqVO loginReqVO ,String msg) throws Exception ;
38 } 38 }
@@ -2,7 +2,6 @@ package com.crossoverjie.cim.route.service.impl; @@ -2,7 +2,6 @@ package com.crossoverjie.cim.route.service.impl;
2 2
3 import com.crossoverjie.cim.route.service.AccountService; 3 import com.crossoverjie.cim.route.service.AccountService;
4 import com.crossoverjie.cim.route.vo.req.LoginReqVO; 4 import com.crossoverjie.cim.route.vo.req.LoginReqVO;
5 -import com.crossoverjie.cim.route.vo.res.CIMServerResVO;  
6 import com.crossoverjie.cim.route.vo.res.RegisterInfoResVO; 5 import com.crossoverjie.cim.route.vo.res.RegisterInfoResVO;
7 import org.slf4j.Logger; 6 import org.slf4j.Logger;
8 import org.slf4j.LoggerFactory; 7 import org.slf4j.LoggerFactory;
@@ -11,6 +10,7 @@ import org.springframework.data.redis.core.RedisTemplate; @@ -11,6 +10,7 @@ import org.springframework.data.redis.core.RedisTemplate;
11 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
12 11
13 import static com.crossoverjie.cim.route.constant.Constant.ACCOUNT_PREFIX; 12 import static com.crossoverjie.cim.route.constant.Constant.ACCOUNT_PREFIX;
  13 +import static com.crossoverjie.cim.route.constant.Constant.ROUTE_PREFIX;
14 14
15 /** 15 /**
16 * Function: 16 * Function:
@@ -32,7 +32,7 @@ public class AccountServiceRedisImpl implements AccountService { @@ -32,7 +32,7 @@ public class AccountServiceRedisImpl implements AccountService {
32 32
33 String name = redisTemplate.opsForValue().get(info.getUserName()) ; 33 String name = redisTemplate.opsForValue().get(info.getUserName()) ;
34 if (null == name){ 34 if (null == name){
35 - //为了方便查询，冗余存一份 35 + //为了方便查询，冗余一份
36 redisTemplate.opsForValue().set(key, info.getUserName()); 36 redisTemplate.opsForValue().set(key, info.getUserName());
37 redisTemplate.opsForValue().set(info.getUserName(),key); 37 redisTemplate.opsForValue().set(info.getUserName(),key);
38 }else { 38 }else {
@@ -59,7 +59,8 @@ public class AccountServiceRedisImpl implements AccountService { @@ -59,7 +59,8 @@ public class AccountServiceRedisImpl implements AccountService {
59 } 59 }
60 60
61 @Override 61 @Override
62 - public void saveRouteInfo(CIMServerResVO vo) throws Exception {  
63 - 62 + public void saveRouteInfo(LoginReqVO loginReqVO,String msg) throws Exception {
  63 + String key = ROUTE_PREFIX + loginReqVO.getUserId() ;
  64 + redisTemplate.opsForValue().set(key,msg) ;
64 } 65 }
65 } 66 }