Browse Source

Merge remote-tracking branch 'remotes/origin/release'

dev_shibei_match
jianjun 5 years ago
parent
commit
7039ba00fc
  1. 32
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/annotation/ExternalRequestAuth.java
  2. 35
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aspect/ExternalRequestAuthAspect.java
  3. 2
      epmet-gateway/deploy/docker-compose-dev.yml
  4. 2
      epmet-gateway/pom.xml
  5. 10
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/TestController.java
  6. 7
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/TestService.java
  7. 16
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/TestServiceImpl.java
  8. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
  9. 2
      epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
  10. 2
      epmet-module/resi-group/resi-group-server/pom.xml
  11. 2
      epmet-user/epmet-user-server/deploy/docker-compose-dev.yml
  12. 2
      epmet-user/epmet-user-server/deploy/docker-compose-test.yml
  13. 2
      epmet-user/epmet-user-server/pom.xml
  14. 2
      epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

32
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
* <p>
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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 {
}

35
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);
}
}

2
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 # 使用现有网络

2
epmet-gateway/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.30</version>
<version>0.3.31</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId>

10
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();
}
}

7
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();
}

16
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()");
}
}

2
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 # 使用现有网络

2
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 # 使用现有网络

2
epmet-module/resi-group/resi-group-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.64</version>
<version>0.3.66</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>resi-group</artifactId>

2
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 # 不会创建新的网络

2
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 # 不会创建新的网络

2
epmet-user/epmet-user-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<version>0.3.116</version>
<version>0.3.118</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-user</artifactId>

2
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}
<if test='null != gridId and "" != gridId'>
AND( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
</if>

Loading…
Cancel
Save