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-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
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()");
+ }
+}
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..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.64
+ 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 1e66ca7900..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.64
+ 0.3.66
com.epmet
resi-group
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..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.116
+ 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 a1575aa794..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.116
+ 0.3.118
com.epmet
epmet-user
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..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' )