refactoring + add JMS/AOP
refactoring + add JMS/AOP
recup failed merge