Skip to content

S
sunac_report
Commit 5309cb82 by java-lixy
Options

修改登陆跳转 ie兼容

parent 26b2bc16
Showing with 36 additions and 33 deletions
src/main/java/com/ejweb/modules/front/report/service/FrontReportService.java
......@@ -62,7 +62,7 @@ public class FrontReportService extends CrudService<FrontReportDao,FrontReportEn
LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
// token = URLDecoder.decode(token);
String username = "";
boolean result = LtpaTokenManager.isValid(token);
if (result) {//验证Token是否合法有效
......
src/main/java/com/ejweb/modules/front/sso/api/SsoController.java
......@@ -39,11 +39,11 @@ public class SsoController extends BaseController {
DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
Resource resource = resourceLoader.getResource("LtpaToken.properties");
String filePath = resource.getURL().getPath();
String returnToken = token;
LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
// token = URLDecoder.decode(token);
String username = "";
boolean result = LtpaTokenManager.isValid(token);
if (result) {//验证Token是否合法有效
......@@ -58,11 +58,11 @@ public class SsoController extends BaseController {
}
Map<String,String> map = new HashMap<String,String>();
if (ssoService.checkSso(username) == 1) {
map.put("token",token);
map.put("token",returnToken);
map.put("result",GConstants.YES);
response.setData(map);
} else {
map.put("token",token);
map.put("token",returnToken);
map.put("result",GConstants.NO);
response.setData(map);
}
......
src/main/java/com/ejweb/modules/sys/web/LoginController.java
......@@ -76,8 +76,8 @@ public class LoginController extends BaseController{
// String filePath =getClass().getResource("/LtpaToken.properties").getPath();
String filePath =resource.getURL().getPath();
LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
// token = URLDecoder.decode(token);
// token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
token = URLDecoder.decode(token);
if (LtpaTokenManager.isValid(token)) {//验证Token是否合法有效
logger.info("..................token合法");
LtpaToken ltpaToken = new LtpaToken(token);
......
src/main/webapp/WEB-INF/views/modules/report/reportList.jsp
......@@ -125,6 +125,7 @@
<th>OA账号</th>
<th>举报人</th>
<th>举报人电话</th>
<th>举报途径</th>
<th>区域</th>
<th>被举报人</th>
<th>举报时间</th>
......@@ -145,6 +146,16 @@
<td>${report.oaname}</td>
<td>${report.reportPersonName}</td>
<td>${report.reportPersonTel}</td>
<td><c:if test="${report.reportSource eq 'web'}">官网</c:if>
<c:if test="${report.reportSource eq 'oa'}">融创OA系统</c:if>
<c:if test="${report.reportSource eq 'supplier'}">供应商系统</c:if>
<c:if test="${report.reportSource eq 'wechat'}">微信公众号</c:if>
<c:if test="${report.reportSource eq 'sunacE'}">融E</c:if>
<c:if test="${report.reportSource eq 'offline'}">线下扫码</c:if>
<c:if test="${report.reportSource eq 'tel'}">电话</c:if>
<c:if test="${report.reportSource eq 'email'}">邮件</c:if>
<c:if test="${report.reportSource eq 'visit'}">来访</c:if>
<c:if test="${report.reportSource eq null}">--</c:if></td>
<td>
<c:if test="${report.supplementArea eq 'North China'}">华北区域公司</c:if>
<c:if test="${report.supplementArea eq 'BeiJing'}">北京区域公司</c:if>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
<%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
<html>
<head>
<title>举报管理</title>
......@@ -66,6 +67,8 @@
// alert($(this).val());
$(this).attr("disabled",true);
});
var source = "${report.reportSource}";
$(":radio[name='reportSource'][value='" + source + "']").prop("checked", "checked");
});
//发邮件
function ceshi(){
......@@ -84,7 +87,8 @@
path += "被举报人:${report.supplementInformant}%0D%0A";
path += "举报时间:${report.reportTime}%0D%0A";
path += "所在城市:${report.reportCity}%0D%0A";
path += "内容:${report.reportContent}%0D%0A";
var reportContent = $("#reportContent").val();
path += "内容:"+reportContent+"%0D%0A";
path += "附件:%0D%0A";
$("#attachment1").find("[class='attachmentClass']").each(function(){
var url = $(this).text();
......@@ -141,8 +145,8 @@
supplementArea = "集团本部";
}
path += "被举报区域:"+ supplementArea +"%0D%0A";
//path += "被举报项目:${report.supplementProject}%0D%0A";
path += "内容:${report.supplementContent}%0D%0A";
var supplementContent = $("#supplementContent").val();
path += "内容:"+supplementContent+"%0D%0A";
path += "附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function(){
var url = $(this).text();
......@@ -285,33 +289,21 @@
<div class="control-group">
<label class="control-label">举报途径:</label>
<div class="controls">
<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"
htmlEscape="false" disabled="true"/>
<%--<form:radiobuttons path="reportSource" items="${fns:getDictList('report_source')}" itemLabel="label" itemValue="value"--%>
<%--style="width:14px;margin:0" htmlEscape="false" disabled="true"/>--%>
<input type="radio" id="reportSource" name="reportSource" value="web" disabled="true" style="margin-right: -23px\9;">官网
<input type="radio" id="reportSource" name="reportSource" value="oa" disabled="true" style="margin-right: -23px\9;">融创OA系统
<input type="radio" id="reportSource" name="reportSource" value="supplier" disabled="true" style="margin-right: -23px\9;">供应商系统
<input type="radio" id="reportSource" name="reportSource" value="wechat" disabled="true" style="margin-right: -23px\9;">微信公众号
<input type="radio" id="reportSource" name="reportSource" value="sunacE" disabled="true" style="margin-right: -23px\9;">融E
<input type="radio" id="reportSource" name="reportSource" value="offline" disabled="true" style="margin-right: -23px\9;">线下扫码
<input type="radio" id="reportSource" name="reportSource" value="tel" disabled="true" style="margin-right: -23px\9;">电话
<input type="radio" id="reportSource" name="reportSource" value="email" disabled="true" style="margin-right: -23px\9;">邮件
<input type="radio" id="reportSource" name="reportSource" value="visit" disabled="true" style="margin-right: -23px\9;">来访
</div>
</div>
</div>
<span class="title">举报信息补充</span>
<%--<div class="control-group">--%>
<%--<label class="control-label">被举报公司:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementCompany" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">被举报部门:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementDepartment" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<%--<div class="control-group">--%>
<%--<label class="control-label">标题:</label>--%>
<%--<div class="controls">--%>
<%--<form:input path="supplementTitle" htmlEscape="false" maxlength="200" class="input-xlarge required"/>--%>
<%--<span class="help-inline"><font color="red">*</font> </span>--%>
<%--</div>--%>
<%--</div>--%>
<div class="control-group">
<label class="control-label">业务类型:</label>
<div class="controls">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment