From d858e8b9866f72a48cce05373191b4fa827d2944 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期一, 13 九月 2021 14:59:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java
index 40e5532..2692963 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPropertyAlarmApi.java
@@ -28,9 +28,9 @@
* @return 所有数据
*/
@ApiOperation(value = "分页查询",response = ComPropertyAlarmVO.class)
- @PostMapping("queryAll")
+ @PostMapping("queryAll/noToken")
public R selectAll(@RequestBody CommonPage commonPage) {
- commonPage.setParamId(this.getCommunityId());
+ commonPage.setParamId(2L);
return propertyService.comPropertyAlarmSelectAll(commonPage);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java
index 50c342a..21ae8f0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServer.java
@@ -14,7 +14,7 @@
@Slf4j
public class NettyServer {
- private static Integer port=20012;
+ private static final Integer port=20012;
public void start() {
//new 一个主线程组
EventLoopGroup bossGroup = new NioEventLoopGroup(1);
--
Gitblit v1.7.1