Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/sys/interceptor/LoginInterceptor.java

@@ -185,7 +185,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter{
     public static void initModelAndView(HttpServletRequest request, ModelAndView modelAndView) throws Exception {
        // modelAndView.addObject("sysUrl", "https://sys.sharingschool.com");
         modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url")+"/ssj");
-        //modelAndView.addObject("sysUrl", "http://127.0.0.1:8080/");
+       // modelAndView.addObject("sysUrl", "http://127.0.0.1:8080");
         modelAndView.addObject("imgUrl", PropertiesUtil.getValue("STATIC_FILE_URL"));
 
     }

src/main/resources/application-common-dev.properties

@@ -50,7 +50,7 @@ spring.redis.cluster.pool.min-idle=0
 
 spring.jmx.enabled=false
 
-spring.rabbitmq.host=192.168.1.153
+spring.rabbitmq.host=172.18.121.4
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin1
 spring.rabbitmq.password=admin1