首頁 探索 說明
註冊 登入
humingfen
/
wlyy2.0
派生自 Amoy2/wlyy2.0
關註 1
讚好 0
複刻 0
Files
瀏覽代碼

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

chenweida 7 年之前
父節點
3489aea6b0 069a6e29ce
當前提交
b435e870b5
共有 9 個文件被更改，包括 0 次插入 和 180 次删除
統一視圖 顯示文件統計
  1. 0 23
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonFoot.jsp
  2. 0 21
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonHead.jsp
  3. 0 17
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonInclude.jsp
  4. 0 21
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/layout.xml
  5. 0 25
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/mainLayout.jsp
  6. 0 13
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/simpleLayout.jsp
  7. 0 5
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/error.jsp
  8. 0 6
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/signin.jsp
  9. 0 49
      app/app-iot-server/src/main/webapp/WEB-INF/jsp/signinJs.jsp

+ 0 - 23
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonFoot.jsp
查看文件 

@ -1,23 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<script src="${staticRoot}/js/lib/jquery.min.js"></script>
 
<script>
 
    $.extend({
 
        Context: {
 
            PATH: '${contextRoot}',
 
            STATIC_PATH: '${staticRoot}'
 
        }
 
    })
 
</script>
 
<script>
 
    (function ($, win) {
 
        $(function () {
 
            var $title = $('title'),
 
                    $headTitleTarget = $('[data-head-title="true"]');
 
            document.title = $headTitleTarget.text();
 
        });
 
    })(jQuery, window);
 
</script>

+ 0 - 21
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonHead.jsp
查看文件 

@ -1,21 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<%--定义页面文档类型以及使用的字符集,浏览器会根据此来调用相应的字符集显示页面内容--%>
 
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 
<%--IE=edge告诉IE使用最新的引擎渲染网页，chrome=1则可以激活Chrome Frame.--%>
 
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 
<meta name="viewport" content="width=device-width, initial-scale=1">
 
<link rel="stylesheet" href="${staticRoot}/css/reset.css">
 
<link rel="stylesheet" href="${staticRoot}/css/bootstrap.min.css">
 
<head>
 
    <link rel="icon" href="${staticRoot}/images/logo.png" type="image/x-icon" />
 
    <link rel="shortcut icon" href="${staticRoot}/images/logo.png" type="image/x-icon" />
 
</head>

+ 0 - 17
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/commonInclude.jsp
查看文件 

@ -1,17 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
 
<%@ taglib uri="http://tiles.apache.org/tags-tiles-extras" prefix="tilesx" %>
 
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 
<c:set var="contextRoot" value="<%=request.getContextPath()%>" scope="page" />
 
<c:set var="devgMode" value="true" scope="page" />
 
<c:choose>
 
  <c:when test="${devgMode == 'true'}">
 
    <c:set var="staticRoot" value="${contextRoot}/front" scope="page" />
 
  </c:when>
 
  <c:otherwise>
 
    <c:set var="staticRoot" value="${contextRoot}/webapp/front/static" scope="page" />
 
  </c:otherwise>
 
</c:choose>

+ 0 - 21
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/layout.xml
查看文件 

@ -1,21 +0,0 @@
 
<?xml version="1.0" encoding="UTF-8" ?>
 
<!DOCTYPE tiles-definitions PUBLIC
 
        "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"
 
        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 
<tiles-definitions>
 
    <!--出错页面提示-->
 
    <definition name="errorPage"  template="/WEB-INF/jsp/error.jsp"></definition>
 
    <!-- 主布局 -->
 
    <definition name="layout" template="/WEB-INF/jsp/common/mainLayout.jsp">
 
    </definition>
 
    <!-- 主布局 -->
 
    <definition name="generalView" extends="layout">
 
        <put-attribute name="header" value="/WEB-INF/jsp/common/commonHead.jsp" />
 
        <!--<put-attribute name="pageCss" expression="/WEB-INF/jsp/${contentPage}Css.jsp" />-->
 
        <put-attribute name="contentPage" expression="/WEB-INF/jsp/${contentPage}.jsp" />
 
        <put-attribute name="footer" value="/WEB-INF/jsp/common/commonFoot.jsp" />
 
        <put-attribute name="pageJs" expression="/WEB-INF/jsp/${contentPage}Js.jsp" />
 
    </definition>
 
</tiles-definitions>

+ 0 - 25
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/mainLayout.jsp
查看文件 

@ -1,25 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<!DOCTYPE html>
 
<html>
 
<head>
 
    <%--定义页面文档类型以及使用的字符集,浏览器会根据此来调用相应的字符集显示页面内容--%>
 
    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 
    <%--IE=edge告诉IE使用最新的引擎渲染网页，chrome=1则可以激活Chrome Frame.--%>
 
    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
 
    <meta name="viewport" content="width=device-width, initial-scale=1">
 
    <title>${title}</title>
 
    <tiles:insertAttribute name="header" />
 
    <tiles:insertAttribute name="pageCss" ignore="true"/>
 
</head>
 
<body>
 
    <div data-content-page>
 
        <tiles:insertAttribute name="contentPage" ignore="true"/>
 
    </div>
 
    <tiles:insertAttribute name="footer"/>
 
    <tiles:insertAttribute name="pageJs" ignore="true"/>
 
    <input type="hidden" id="flag_top_window" />
 
</body>
 
</html>

+ 0 - 13
app/app-iot-server/src/main/webapp/WEB-INF/jsp/common/simpleLayout.jsp
查看文件 

@ -1,13 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<script>
 
    $.extend({
 
        Context: {
 
            PATH: '${contextRoot}',
 
            STATIC_PATH: '${staticRoot}'
 
        }
 
    })
 
</script>
 
<tiles:insertAttribute name="pageCss" ignore="true"/>
 
<tiles:insertAttribute name="contentPage" ignore="true"/>
 
<tiles:insertAttribute name="pageJs" ignore="true"/>

+ 0 - 5
app/app-iot-server/src/main/webapp/WEB-INF/jsp/error.jsp
查看文件 

@ -1,5 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<div id="divErrorContent" style="width:550px;height:400px;margin:0 auto;background: url('${contextRoot}/src/images/404.png') no-repeat;">
 
</div>

+ 0 - 6
app/app-iot-server/src/main/webapp/WEB-INF/jsp/signin.jsp
查看文件 

@ -1,6 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"  pageEncoding="utf-8"%>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<div style="margin:20px;">
 
加载中，请稍候...
 
</div>

+ 0 - 49
app/app-iot-server/src/main/webapp/WEB-INF/jsp/signinJs.jsp
查看文件 

@ -1,49 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
 
<%@include file="/WEB-INF/jsp/common/commonInclude.jsp" %>
 
<script>
 
    var clientId = '${clientId}';
 
    var signin = {
 
        init:function () {
 
            //判断是否自动登录
 
            var hash = window.location.hash;
 
            if(hash.indexOf("#access_token")>=0)
 
            {
 
                //获取accrss_token
 
                var tokenString =hash.substring(1,hash.indexOf("&"));
 
                var token = tokenString.substr(hash.indexOf("="));
 
                debugger;
 
                //自动登录
 
                $.ajax({
 
                    url: "${contextRoot}/login/autoLogin",
 
                    type: 'POST',
 
                    dataType: 'json',
 
                    data:{
 
                        "token":token,
 
                        "clientId": clientId
 
                    },
 
                    success: function (data) {
 
                        debugger;
 
                        if(data.successFlg){
 
                            sessionStorage.setItem("ZF_UID",data.obj.id);
 
                            sessionStorage.setItem("ZF_UN",data.obj.realName);
 
                            sessionStorage.setItem("ZF_U",data.obj);
 
                            location.href = '${contextRoot}/index';
 
                        }else{
 
                            location.href = '${contextRoot}/login';
 
                        }
 
                    },
 
                    error: function (data) {
 
                        location.href = '${contextRoot}/login';
 
                    }
 
                });
 
                return;
 
            }
 
        }
 
    }
 
    $(function() {
 
        signin.init();
 
    });
 
</script>