Browse Source

增加优雅停机配置,增加热部署配置,迁移TransactionAspect类

huangbo 4 years ago
parent
commit
bf277ef1f0

+ 1 - 3
ipu-rest-demo/src/main/java/com/ipu/server/aspect/TransactionAspect.java

@ -1,4 +1,4 @@
1
package com.ipu.server.aspect;
1
package com.ai.ipu.server.demo.aspect;
2 2

3 3
import org.aspectj.lang.ProceedingJoinPoint;
4 4
import org.aspectj.lang.annotation.Around;
@ -9,8 +9,6 @@ import com.ai.ipu.basic.log.ILogger;
9 9
import com.ai.ipu.basic.log.IpuLoggerFactory;
10 10
import com.ai.ipu.nosql.mongodb.MongoCacheFactory;
11 11

12

13

14 12
@Aspect
15 13
public class TransactionAspect {
16 14
    transient protected ILogger log = IpuLoggerFactory.createLogger(TransactionAspect.class);

+ 39 - 0
ipu-rest-demo/src/main/java/com/ai/ipu/server/demo/control/other/GracefulTestController.java

@ -0,0 +1,39 @@
1
package com.ai.ipu.server.demo.control.other;
2

3
import java.util.concurrent.atomic.AtomicInteger;
4

5
import org.slf4j.Logger;
6
import org.slf4j.LoggerFactory;
7
import org.springframework.stereotype.Controller;
8
import org.springframework.web.bind.annotation.RequestMapping;
9
import org.springframework.web.bind.annotation.ResponseBody;
10

11
/**
12
 * @team IPU
13
 * @date 2020年9月28日下午6:14:19
14
 * @desc 优雅停机的阻塞测试类
15
 */
16
@Controller
17
@RequestMapping("/graceful")
18
public class GracefulTestController {
19
    private static final Logger logger = LoggerFactory.getLogger(GracefulTestController.class);
20
    // 计数器
21
    public AtomicInteger started = new AtomicInteger();
22
    public AtomicInteger ended = new AtomicInteger();
23

24
    @RequestMapping("/hello")
25
    @ResponseBody
26
    public String hello() {
27

28
        logger.debug(Thread.currentThread().getName() + " -> " + this + " Get one, got: " + started.addAndGet(1));
29
        try {
30
            Thread.sleep(1000 * 100); // 模拟一个执行时间很长的任务
31
        } catch (InterruptedException e) {
32
            logger.info("模拟任务被中断", e);
33
        }
34

35
        logger.debug(Thread.currentThread().getName() + " -> " + this + "  Finish one, finished: " + ended.addAndGet(1));
36
        return "hello";
37
    }
38

39
}

+ 31 - 6
ipu-rest-demo/src/main/resources/dev/application.properties

@ -1,5 +1,5 @@
1
######设置服务器端口
2
######也可以通过启动命令行参数实现:java -jar myproject.jar --server.port=9084
1
#设置服务器端口
2
#也可以通过启动命令行参数实现:java -jar myproject.jar --server.port=9084
3 3
server.port=unknown
4 4

5 5
web.root=webapp/
@ -8,16 +8,41 @@ spring.mvc.static-path-pattern=/**
8 8
#spring.resources.static-locations=file:${web.root}
9 9
spring.resources.static-locations=classpath:/${web.root}
10 10

11
######默认/
11
#默认/
12 12
server.context-path=/ipu
13
######默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
13
#默认/。注册DispatcherServlet对应path,亦可通过dispatcherRegistration方法配置
14 14
server.servlet-path=/
15 15
#使用maven中的变量替换
16 16
logging.file=target/logs/${project.artifactId}.log
17 17
spring.application.name=${project.artifactId}
18 18

19
######查看spring错误日志
19
#查看spring错误日志
20 20
#logging.level.org.springframework=DEBUG
21 21

22
######session使用默认
22
#session使用默认
23 23
spring.session.store-type=none
24

25

26
#优雅停机------------------------------------------------------
27
#启用优雅停机
28
endpoints.shutdown.enabled=true
29
#关闭密码验证
30
endpoints.shutdown.sensitive=false
31
#自定义管理端点的前缀(保证安全)
32
management.context-path=/mgmt
33
#指定管理服务端口
34
management.port=9527
35
#关闭远程管理,不允许外部调用,保证安全
36
management.address=127.0.0.1
37
#管理安全设置
38
#false,允许任何人访问管理节点,不推荐
39
#true,用户密码访问管理节点,缺省
40
management.security.enabled=false
41

42

43
#热部署------------------------------------------------------
44
#设置开启热部署
45
#spring.devtools.restart.enabled=true
46
#重启目录
47
#spring.devtools.restart.additional-paths=src/main/java
48
#spring.devtools.restart.exclude=WEB-INF/**

+ 1 - 1
ipu-rest-demo/src/main/resources/ipu-spring-mvc.xml

@ -11,5 +11,5 @@
11 11
		http://www.springframework.org/schema/mvc/spring-mvc.xsd">
12 12
	<!-- 自定义的control扫描目录 -->
13 13
    <context:component-scan base-package="com.ai.ipu.server.demo" />
14
    <bean id="transcationAspects" class="com.ipu.server.aspect.TransactionAspect" />
14
    <bean id="transcationAspects" class="com.ai.ipu.server.demo.aspect.TransactionAspect" />
15 15
</beans>