Skip to content

Commit a678e41

Browse files
author
Sen
committedApr 11, 2020
添加注释
1 parent 34de826 commit a678e41

20 files changed

+60
-41
lines changed
 

‎haoke-im/src/main/java/com/sen/haoke/im/controller/MessageController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* @Auther: Sen
1515
* @Date: 2020/2/17 23:08
16-
* @Description:
16+
* @Description: 微聊控制中心
1717
*/
1818
@RestController
1919
@RequestMapping("message")

‎haoke-im/src/main/java/com/sen/haoke/im/pojo/Message.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
public class Message {
2828

2929
@Id
30-
//指定次属性使用JackSon序列化称字符串
30+
//指定属性使用JackSon序列化称字符串
3131
@JsonSerialize(using = ToStringSerializer.class)
3232
private ObjectId id;
3333

‎haoke-im/src/main/java/com/sen/haoke/im/websocket/MyHandler.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public void handleMessage(WebSocketSession session, WebSocketMessage<?> message)
9090
//把MongoDB的消息状态更新为已读
9191
messageDao.updateMessageStatus(target.getId(), 2);
9292
}else{
93-
//当前的额Session不在当前JVM或者Session不在线,发送消息到MQ
93+
//当前的Session不在当前JVM或者Session不在线,发送消息到MQ
9494
rocketMQTemplate.convertAndSend("haoke-im-send-message:SEND_MSG", msgJson);
9595
}
9696
}
@@ -103,6 +103,10 @@ public void afterConnectionClosed(WebSocketSession session, CloseStatus status)
103103
LONG_WEB_SOCKET_SESSION_MAP.remove(uid);
104104
}
105105

106+
/**
107+
* RocketMQ接收消息接口实现
108+
* @param message RocketMQ消息
109+
*/
106110
@Override
107111
public void onMessage(String message) {
108112
//获取uid

‎haoke-im/src/main/java/com/sen/haoke/im/websocket/WebSocketConfiguration.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import org.springframework.web.socket.config.annotation.EnableWebSocket;
55
import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
66
import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
7-
87
import javax.annotation.Resource;
98

109
/**
@@ -24,8 +23,11 @@ public class WebSocketConfiguration implements WebSocketConfigurer {
2423

2524
@Override
2625
public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
26+
//配置websocket路径和参数
2727
registry.addHandler(myHandler, "/ws/{uid}")
28+
//配置跨域
2829
.setAllowedOrigins("*")
30+
//配置拦截器
2931
.addInterceptors(webSocketInterceptor);
3032
}
3133
}

‎haoke-manage-web/src/pages/haoke/House/Resource.js

+10-8
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ const getValue = obj =>
2727
.join(',');
2828
//支付方式
2929
const payType = new Map([
30-
[1,'付一押一'],
31-
[2,'付三押一'],
32-
[3,'付六押一'],
33-
[4,'年付押一'],
34-
[5,'其它'],
30+
[1, '付一押一'],
31+
[2, '付三押一'],
32+
[3, '付六押一'],
33+
[4, '年付押一'],
34+
[5, '其它'],
3535
]);
36+
3637
/* eslint react/no-multi-comp:0 */
3738
@connect(({houseResource, loading}) => ({
3839
houseResource,
@@ -61,7 +62,7 @@ class Resource extends PureComponent {
6162
{
6263
title: '图',
6364
dataIndex: 'pic',
64-
render : (text, record, index) => {
65+
render: (text, record, index) => {
6566
return <ShowPics pics={text}/>
6667
}
6768

@@ -106,8 +107,9 @@ class Resource extends PureComponent {
106107
),
107108
}
108109
];
109-
reload(){
110-
const { dispatch } = this.props;
110+
111+
reload() {
112+
const {dispatch} = this.props;
111113
dispatch({
112114
type: 'houseResource/fetch'
113115
});

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/config/InterceptorConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
1717
private RedisInterceptor redisInterceptor;
1818

1919
/**
20-
* 注册自定义拦截器到Spring拦截器链中
20+
* 注册自定义{@link RedisInterceptor}拦截器到Spring拦截器链中
2121
* @param registry
2222
*/
2323
@Override

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/config/MockConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* @Auther: Sen
1010
* @Date: 2020/2/13 21:45
11-
* @Description:
11+
* @Description: @PropertySource注解实现配置文件与{@link MockConfiguration}属性的自动映射
1212
*/
1313
@Configuration
1414
@PropertySource("classpath:mock-data.properties")

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/controller/HouseResourcesController.java

-3
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@
55
import com.sen.haoke.manage.dubbo.server.pojo.HouseResources;
66
import org.springframework.http.HttpStatus;
77
import org.springframework.http.ResponseEntity;
8-
import org.springframework.stereotype.Controller;
98
import org.springframework.web.bind.annotation.GetMapping;
109
import org.springframework.web.bind.annotation.PostMapping;
1110
import org.springframework.web.bind.annotation.PutMapping;
1211
import org.springframework.web.bind.annotation.RequestBody;
1312
import org.springframework.web.bind.annotation.RequestMapping;
1413
import org.springframework.web.bind.annotation.RequestParam;
15-
import org.springframework.web.bind.annotation.ResponseBody;
1614
import org.springframework.web.bind.annotation.RestController;
17-
1815
import javax.annotation.Resource;
1916

2017
/**

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/controller/MockController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* @Auther: Sen
1212
* @Date: 2020/2/13 21:48
13-
* @Description:
13+
* @Description: 服务端提供mock数据给客户端
1414
*/
1515
@RestController
1616
@CrossOrigin

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/controller/PicUploadController.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
import com.sen.haoke.manage.api.service.PicUploadService;
44
import com.sen.haoke.manage.api.vo.UploadParams;
5-
import org.springframework.beans.factory.annotation.Autowired;
65
import org.springframework.stereotype.Controller;
76
import org.springframework.web.bind.annotation.PostMapping;
87
import org.springframework.web.bind.annotation.RequestMapping;
98
import org.springframework.web.bind.annotation.RequestParam;
109
import org.springframework.web.bind.annotation.ResponseBody;
1110
import org.springframework.web.multipart.MultipartFile;
12-
1311
import javax.annotation.Resource;
1412

1513
/**

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/controller/WxController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* @Auther: Sen
1818
* @Date: 2020/2/25 21:19
19-
* @Description:
19+
* @Description: 实现微信登录
2020
*/
2121
@RestController
2222
@RequestMapping("wx")

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/graphql/GraphQLProvider.java

+18-11
Original file line numberDiff line numberDiff line change
@@ -26,43 +26,49 @@
2626
/**
2727
* @Auther: Sen
2828
* @Date: 2020/2/11 22:59
29-
* @Description:
29+
* @Description: 初始化GraphQL对象并注入Spring IOC容器中
3030
*/
3131
@Component
3232
public class GraphQLProvider {
3333

3434
private GraphQL graphQL;
3535

36-
@Resource
37-
private List<MyDataFetcher> myDataFetchers;
36+
/**
37+
* spring注入所有MyDataFetcher的实现类到集合中
38+
*/
39+
@Resource
40+
private List<MyDataFetcher> myDataFetchers;
3841

3942
/**
4043
* Spring初始化后初始化GraphQL对象
4144
*/
4245
@PostConstruct
4346
public void init() {
4447
//初始化graphql文件
45-
File file = null;
48+
//File file = null;
4649
try {
50+
//读取GraphQL文件
4751
InputStream resource = GraphQLProvider.class.getClassLoader().getResourceAsStream("haoke.graphql");
4852
// file = ResourceUtils.getFile("classpath:haoke.graphql");
4953
String graphqlStr = IOUtils.toString(Objects.requireNonNull(resource), StandardCharsets.UTF_8);
5054
TypeDefinitionRegistry typeRegistry = new SchemaParser().parse(graphqlStr);
51-
//查询
55+
56+
//确定与GraphQL文件操作返回值对象映射
5257
RuntimeWiring wiring = RuntimeWiring.newRuntimeWiring()
53-
.type("HaokeQuery", builder->
58+
.type("HaokeQuery", builder ->
5459
{
5560
myDataFetchers.forEach(myDataFetcher -> {
5661
builder.dataFetcher(myDataFetcher.fileName(), myDataFetcher::dataFetcher);
5762
});
5863
return builder;
5964
}
60-
// builder.dataFetcher("HouseResources", param->{
61-
// Long id = param.getArgument("id");
62-
// return service.queryHouseResources(id);
63-
// })
65+
// builder.dataFetcher("HouseResources", param->{
66+
// Long id = param.getArgument("id");
67+
// return service.queryHouseResources(id);
68+
// })
6469
)
6570
.build();
71+
//创建Schema
6672
GraphQLSchema graphQLSchema = new SchemaGenerator().makeExecutableSchema(typeRegistry, wiring);
6773
this.graphQL = GraphQL.newGraphQL(graphQLSchema).build();
6874
} catch (IOException e) {
@@ -72,10 +78,11 @@ public void init() {
7278

7379
/**
7480
* 把graphQL交给Spring容器托管
81+
*
7582
* @return
7683
*/
7784
@Bean
78-
public GraphQL graphQL(){
85+
public GraphQL graphQL() {
7986
return this.graphQL;
8087
}
8188
}

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/graphql/MyDataFetcher.java

+9
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@
1111
@Component
1212
public interface MyDataFetcher {
1313

14+
/**
15+
* 获取GraphQL操作名
16+
* @return String
17+
*/
1418
String fileName();
1519

20+
/**
21+
* 返回结果映射封装对象返回
22+
* @param environment 查询参数
23+
* @return 查询结果
24+
*/
1625
Object dataFetcher(DataFetchingEnvironment environment);
1726
}

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/interceptor/MyResponseBodyAdvice.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,11 @@ public class MyResponseBodyAdvice implements ResponseBodyAdvice {
3636
*
3737
* @param returnType
3838
* @param converterType
39-
* @return 返回true执行 beforeBodyWrite()
39+
* @return 返回true执行 beforeBodyWrite() 实现增强
4040
*/
4141
@Override
4242
public boolean supports(MethodParameter returnType, Class converterType) {
43+
// Controller中get请求结果全部缓存
4344
if (returnType.hasMethodAnnotation(GetMapping.class)) {
4445
return true;
4546
}

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/interceptor/MyServletRequestWrapper.java

-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33

44
import org.apache.commons.io.IOUtils;
5-
65
import javax.servlet.ReadListener;
76
import javax.servlet.ServletInputStream;
8-
97
import javax.servlet.http.HttpServletRequest;
108
import javax.servlet.http.HttpServletRequestWrapper;
119
import java.io.BufferedReader;

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/interceptor/RedisInterceptor.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**
1818
* @Auther: Sen
1919
* @Date: 2020/2/14 22:59
20-
* @Description:
20+
* @Description: 查询缓存拦截器
2121
*/
2222
@Component
2323
public class RedisInterceptor implements HandlerInterceptor {
@@ -53,6 +53,7 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons
5353
response.setHeader("Access-Control-Allow-Credentials", "true");
5454
response.setHeader("Access-Control-Allow-Headers", "Content-Type,X-Token");
5555
response.setHeader("Access-Control-Allow-Credentials", "true");
56+
//缓存内容放入Response中
5657
response.getWriter().write(result);
5758
return false;
5859
}

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/interceptor/RequestReplaceFilter.java

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* @Auther: Sen
1313
* @Date: 2020/2/15 00:18
1414
* @Description: 替换Request为包装后的Request
15+
* {@link OncePerRequestFilter}一个请求,该类只会拦截一次
1516
*/
1617
@Component
1718
public class RequestReplaceFilter extends OncePerRequestFilter {

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/service/MongoDBHouseService.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.springframework.data.mongodb.core.query.Criteria;
99
import org.springframework.data.mongodb.core.query.Query;
1010
import org.springframework.stereotype.Service;
11-
1211
import javax.annotation.Resource;
1312
import java.util.ArrayList;
1413
import java.util.HashMap;
@@ -18,7 +17,7 @@
1817
/**
1918
* @Auther: Sen
2019
* @Date: 2020/2/22 01:25
21-
* @Description:
20+
* @Description: MongDB实现地图找房
2221
*/
2322
@Service
2423
public class MongoDBHouseService {
@@ -57,7 +56,7 @@ public class MongoDBHouseService {
5756
* @param lng 经度
5857
* @param lat 纬度
5958
* @param zoom 缩放等级
60-
* @return
59+
* @return 搜索到的房源
6160
*/
6261
public MapHouseDataResult queryHouseDataByMap(Float lng, Float lat, Integer zoom) {
6362
//默认查找范围是比例尺的1.5倍距离查找,除以111.12-->地球1°代表111.12km

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/service/PicUploadService.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
public class PicUploadService {
2323
// 允许上传的格式
2424
private static final String[] IMAGE_TYPE = new String[]{".bmp", ".jpg", ".jpeg", ".gif", ".png"};
25+
2526
@Resource
2627
private OSSClient ossClient;
2728

‎haoke-manage/haoke-manage-api/src/main/java/com/sen/haoke/manage/api/service/SearchService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
2020
import org.springframework.data.elasticsearch.core.query.SearchQuery;
2121
import org.springframework.stereotype.Service;
22-
2322
import javax.annotation.Resource;
2423
import java.util.ArrayList;
2524
import java.util.Collections;
@@ -29,7 +28,7 @@
2928
/**
3029
* @Auther: Sen
3130
* @Date: 2020/2/28 15:38
32-
* @Description:
31+
* @Description: ElasticSearch实现搜索功能
3332
*/
3433
@Service
3534
public class SearchService {

0 commit comments

Comments
 (0)
Please sign in to comment.