Merge branch 'dev' of chenweida/jw2.0 into dev

app/app-iot-server/.gitignore

@@ -1,22 +0,0 @@
#project files
app-emergency-server.iml
.idea/*
target/*
# ---> Java
*/target
*.class
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*#
# thrift generate code

app/app-iot-server/pom.xml

@@ -192,7 +192,7 @@
    </dependencies>
    <build>
        <finalName>app-iot-server</finalName>
        <finalName>app-emergency-server</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

app/app-iot-server/readMe.MD

@@ -1,3 +0,0 @@
app-iot-server 
物联网平台的前端
目前是嵌入到EHR平台中

app/app-iot-server/src/main/java/com/yihu/ehr/iot/config/CommonConfig.java

@@ -1,43 +0,0 @@
package com.yihu.ehr.iot.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
//@Configuration
//@ComponentScan("com.yihu.ehr.eme.controller")
public class CommonConfig {
    @Bean
    public InternalResourceViewResolver viewResolver() {
        InternalResourceViewResolver resolver = new InternalResourceViewResolver();
        resolver.setPrefix("/WEB-INF/jsp/");
        resolver.setSuffix(".jsp");
        resolver.setOrder(1);
        return resolver;
    }
    @Bean
    public ResourceBundleMessageSource messageSource() {
        ResourceBundleMessageSource resolver = new ResourceBundleMessageSource();
        resolver.setBasenames("text/message");
        resolver.setDefaultEncoding("UTF-8");
        return resolver;
    }
    @Bean
    public TilesViewResolver tilesViewResolver(){
        TilesViewResolver tilesViewResolver = new TilesViewResolver();
        tilesViewResolver.setOrder(0);
        return tilesViewResolver;
    }
    @Bean
    public TilesConfigurer tilesConfigurer(){
        TilesConfigurer tilesConfigurer = new TilesConfigurer();
        tilesConfigurer.setDefinitions("/WEB-INF/jsp/common/layout.xml");
        return tilesConfigurer;
    }
}

app/app-iot-server/src/main/java/com/yihu/ehr/iot/interceptor/LoginInterceptor.java

@@ -16,7 +16,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter {
        }
        Boolean isLogin = (Boolean) request.getSession().getAttribute("isLogin");
        if (isLogin == null || !isLogin) {
            response.sendRedirect("/emergency/login");
            response.sendRedirect("/iot/login");
            response.setStatus(-200);
            return false;
        }

app/app-iot-server/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  contextPath: /emergency
  contextPath: /iot
  port: 9099
  sessionTimeout: 30000000

app/app-iot-server/src/main/webapp/front/js/common/apiServer.js

@@ -3,7 +3,7 @@
 */
define(['jquery', 'promise', 'layer', 'jsHelper'], function ($, Promise, layer, jsHelper) {
    jsHelper.setLayerCon();
    var baseUrl = '/emergency/';
    var baseUrl = '/iot/';
    function httpGet(url,options) {
        //发送ajax请求
        return new Promise(function(resolve, reject) {