From 43abf705990a572e2aa86d5c62f5ee208f2a48a6 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 17 Aug 2020 14:53:58 +0800 Subject: [PATCH 1/9] =?UTF-8?q?resi-group=20=20=E6=9C=8D=E5=8A=A1=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 44921cae4f..82c760eeb0 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.64 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.65 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 1e66ca7900..f93bd8bc88 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.64 + 0.3.65 com.epmet resi-group From 9c343e42bc6b8148de504730c0aa22cc65231338 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 17 Aug 2020 16:08:57 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=83=A8=E7=BD=B2gateWay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index 894f42b3d7..de78c36557 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.31 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d6d74e1b5b..b8996a9f75 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet epmet-cloud From 0fd867815fd77d66c80ff866aa4b8212b545d948 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 17 Aug 2020 16:58:05 +0800 Subject: [PATCH 3/9] =?UTF-8?q?enterGrid=E6=97=B6=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=8E=BB=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7Id=EF=BC=8C?= =?UTF-8?q?=E5=A4=9A=E5=AE=A2=E6=88=B7=E7=89=88=E6=9C=AC(=E5=85=9A?= =?UTF-8?q?=E7=BE=A4e=E4=BA=8B=E9=80=9A)=EF=BC=8C=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=9C=A8=E5=A4=9A=E4=B8=AA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=8B=E5=8F=AA=E8=83=BD=E6=B3=A8=E5=86=8C=E4=B8=80=E6=AC=A1?= =?UTF-8?q?=E5=B1=85=E6=B0=91=EF=BC=8C=E5=8D=95=E5=AE=A2=E6=88=B7=E7=89=88?= =?UTF-8?q?=E6=9C=AC(=E4=B8=8D=E5=90=8CappId)=EF=BC=8C=E5=90=8C=E6=A0=B7?= =?UTF-8?q?=E7=9A=84=E5=BE=AE=E4=BF=A1=E8=B4=A6=E6=88=B7=E5=9C=A8=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=8B=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=98=AF=E4=B8=8D=E5=90=8C=E7=9A=84=E5=B8=90?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=9B=A0=E6=AD=A4=E4=B9=9F=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E6=A0=A1=E9=AA=8CcustomerId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/mapper/UserRoleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 5ec9e5a268..6e8d2244db 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -35,7 +35,7 @@ AND ur.USER_ID = #{userId} AND - ur.CUSTOMER_ID = #{customerId} + /* ur.CUSTOMER_ID = #{customerId}*/ AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' ) From dcf8e83e7592716e42240a69ab537f73a03d79bc Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 17 Aug 2020 17:04:37 +0800 Subject: [PATCH 4/9] user +1 -> 117 --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 60fb75bf2c..8555b3ea46 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.117 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index a1575aa794..c92fe0c949 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.116 + 0.3.117 com.epmet epmet-user From 032463eabe06c654960bb574f7cc4e4af2508139 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 18 Aug 2020 00:47:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E9=9B=86=E7=BE=A4=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=B7=E6=B1=82=E8=AE=A4=E8=AF=81=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=E5=92=8C=E6=8B=A6=E6=88=AA=E5=99=A8=E9=9B=8F=E5=BD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/annotation/ExternalRequestAuth.java | 32 +++++++++++++++++ .../aspect/ExternalRequestAuthAspect.java | 35 +++++++++++++++++++ .../com/epmet/controller/TestController.java | 10 +++++- .../java/com/epmet/service/TestService.java | 7 ++++ .../epmet/service/impl/TestServiceImpl.java | 16 +++++++++ 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java create mode 100644 epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java new file mode 100644 index 0000000000..0cf03c25b7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java @@ -0,0 +1,32 @@ +/** + * Copyright 2018 人人开源 http://www.renren.io + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +package com.epmet.commons.tools.annotation; + +import java.lang.annotation.*; + +/** + * 需要认证的外部请求 + * @Author wxz + * @Description + * @Date 2020/4/23 16:17 + **/ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ExternalRequestAuth { + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java new file mode 100644 index 0000000000..fa9156f8f3 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java @@ -0,0 +1,35 @@ +package com.epmet.commons.tools.aspect; + +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; + +/** + * 外部请求认证切面 + */ +@Aspect +@Component +public class ExternalRequestAuthAspect { + + /** + * 拦截加了ExternalRequestAuth注解的方法 + * @param point + * @throws Throwable + */ + @Before("@annotation(com.epmet.commons.tools.annotation.ExternalRequestAuth)") + public void before(JoinPoint point) throws Throwable { + System.out.println("切面执行了"); + RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); + ServletRequestAttributes sra = (ServletRequestAttributes) requestAttributes; + HttpServletRequest request = sra.getRequest(); + String token = request.getHeader("token"); + System.out.println("token:" + token); + } + +} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java index 438f105eab..b8ab2dbda6 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java @@ -1,5 +1,8 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.ExternalRequestAuth; +import com.epmet.service.TestService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -9,9 +12,14 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("test") public class TestController { + @Autowired + private TestService testService; + + @ExternalRequestAuth @GetMapping("test") public void test() { - System.out.println(666); + System.out.println("TestController -> test()"); + testService.test(); } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java new file mode 100644 index 0000000000..587690221c --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java @@ -0,0 +1,7 @@ +package com.epmet.service; + +public interface TestService { + + void test(); + +} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java new file mode 100644 index 0000000000..99ba370525 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java @@ -0,0 +1,16 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.annotation.ExternalRequestAuth; +import com.epmet.service.TestService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class TestServiceImpl implements TestService { + + @ExternalRequestAuth + @Override + public void test() { + System.out.println("TestService -> test()"); + } +} From 40669bca4999a1bbe6fc27822d2bb81c78cd533d Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 18 Aug 2020 09:19:05 +0800 Subject: [PATCH 6/9] =?UTF-8?q?resi-group=20=E7=89=88=E6=9C=AC=E5=8F=B7+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-group/resi-group-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml index 82c760eeb0..29a259a5d2 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.65 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.66 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index f93bd8bc88..eaef30f6e7 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.65 + 0.3.66 com.epmet resi-group From 7a31fc276cec88515dae89438706067bb409a50c Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 18 Aug 2020 09:29:10 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=9F=A5=E6=89=BE=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E8=BA=AB=E4=BB=BD=E4=BF=A1=E6=81=AF=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-user-server/src/main/resources/mapper/UserRoleDao.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml index 6e8d2244db..803fa40621 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml @@ -34,8 +34,6 @@ ur.DEL_FLAG = 0 AND ur.USER_ID = #{userId} - AND - /* ur.CUSTOMER_ID = #{customerId}*/ AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' ) From 4f9d8639c42e54fdd4799fcf8b7711ace0189fe0 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 18 Aug 2020 09:32:33 +0800 Subject: [PATCH 8/9] user +1 118 --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 8555b3ea46..15c0789d48 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.117 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.118 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c92fe0c949..0d7cdfa705 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.117 + 0.3.118 com.epmet epmet-user From 2cccd03131b5cbe783d32cc049e0c7f9fef110af Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 18 Aug 2020 10:09:20 +0800 Subject: [PATCH 9/9] =?UTF-8?q?user=20=E5=8D=87=E7=BA=A7=20=E5=90=8C?= =?UTF-8?q?=E6=AD=A5130=20=20=20=E7=89=88=E6=9C=AC=E5=8F=B7=E5=88=B0=20118?= =?UTF-8?q?=20=20=20=20=20=20=20[test.yml]=20group=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5130=20=20=20=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E5=88=B0=2066=20=20=20=20=20=20=20=20[test.yml]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-group/resi-group-server/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml index 72a6a10442..f88d341ad0 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.64 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.66 ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index 51d4f40331..0dfe4fac89 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.116 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.118 ports: - "8087:8087" network_mode: host # 不会创建新的网络