Skip to content

S
sunac_report
Commit 60ae8ae0 by java-lixy
Options

修复邮箱问题和登陆问题

parent 999a1083
Showing with 33 additions and 114 deletions
src/main/java/com/ejweb/modules/sys/web/LoginController.java
...@@ -76,8 +76,8 @@ public class LoginController extends BaseController{ ...@@ -76,8 +76,8 @@ public class LoginController extends BaseController{
// String filePath =getClass().getResource("/LtpaToken.properties").getPath(); // String filePath =getClass().getResource("/LtpaToken.properties").getPath();
String filePath =resource.getURL().getPath(); String filePath =resource.getURL().getPath();
LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath))); 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是否合法有效 if (LtpaTokenManager.isValid(token)) {//验证Token是否合法有效
logger.info("..................token合法"); logger.info("..................token合法");
LtpaToken ltpaToken = new LtpaToken(token); LtpaToken ltpaToken = new LtpaToken(token);
...@@ -102,96 +102,6 @@ public class LoginController extends BaseController{ ...@@ -102,96 +102,6 @@ public class LoginController extends BaseController{
// } // }
User user= systemService.getUserByLoginName(userName); User user= systemService.getUserByLoginName(userName);
logger.info(".....................user:" + user); logger.info(".....................user:" + user);
// if(user==null){ // 从接口获取用户信息
// logger.info("..................数据库没有用户信息。");
// // HCFetcher fetcher = HCFetcher.getInstance();
// // String content="{\"versionName\": \"1.0\",\"platform\": \"Android\",\"appCode\": \"30005\",\"language\": \"zh_CN\",\"deviceToken\": \"\",\"appkey\": \"\"," +
// // "\"loginName\":\"" +userName + "\"}";
// // String url=GConstants.FAQ_BASE_API+"/api/user/getUserLoginName?sign=sign&content="+content;
// // System.out.print(url);
// //
// // List<BasicNameValuePair> params=new ArrayList<BasicNameValuePair>();
// // 添加参数
// // params.add(new BasicNameValuePair("content", content));
// // params.add(new BasicNameValuePair("sign", "sign"));
// // FetchEntity entity = fetcher.post(GConstants.FAQ_BASE_API+"/api/user/getUserLoginName",params ,null);
// // FetchEntity entity = fetcher.post(GConstants.FAQ_BASE_API+"/api/user/getUserLoginName?sign=sign&content="+content, null);
// logger.info("..................从core中查到的数据entity：" + JSON.toJSONString(entity));
// // if(entity.isSuccess()){
// logger.info("..................从融创查到了用户信息1。");
// // String resultStr = entity.getContent("utf-8");
// // if (resultStr != null) {// 成功获取数据
// logger.info("..................从融创查到了用户信息2。");
// // ResponseBean requestBean= JSON.parseObject(resultStr, ResponseBean.class);
// // if(!"2000".equals(requestBean.getStatus())){
// // logger.info("..................找不到此用户的部门或组织！");
// // throw new NullPointerException("找不到此用户的部门或组织！");
// // }
// // requestBean.getData();
// // UserInfoEntity userInfo = JSON.parseObject(requestBean.getData().toString(), UserInfoEntity.class);
//
// // if(userInfo!=null){
// logger.info("..................从融创查到了用户信息3。");
// user= new User();
// user.setId(IdWorker.getNextId("U"));
// user.setLoginName(userName);
//
// String name = util.GetUserInfo(userName, "cn");
// user.setName(name);
//
// user.setPassword(systemService.entryptPassword(token));
// user.setLoginFlag("1");
// user.setDelFlag("0");
// user.setRemarks(systemService.entryptPassword("同步用户"));
// Date createDate = new Date();
// user.setCreateBy(user);
// user.setCreateDate(createDate);
// user.setUpdateBy(user);
// user.setUpdateDate(createDate);
//
// // Office office = officeService.findByOfficeName(userInfo.getDepartName());
// // if(office==null){
// // office=new Office();
// // office.preInsert();
// // office.setName(userInfo.getDepartName());
// // office.setParent(officeService.getCompany());
// //
// // office.setParentIds("0,1,"+office.getParentId());
// // office.setType("");
// // office.setGrade("");
// // office.setCreateBy(user);
// // office.setUpdateBy(user);
// // office.setSort(0);
// // Area area=new Area();
// // area.setId("");
// // office.setArea(area);
// // officeService.insert(office);
// // }
// // user.setOffice(office);
// List<Role> listRole=new ArrayList<>();
// Role r=new Role();
// r.setId("3");
// listRole.add(r);
// user.setRoleList(listRole);
//
// // if(StringUtils.isNoneBlank(userInfo.getLongName())){
// // String[] offs=userInfo.getLongName().split("_");
// //
// // if(offs.length>3){
// // List<String> list=new ArrayList<String>();
// // for(int i=3;i<offs.length;i++){
// // list.add(offs[i]);
// //
// // }
// // user.setOfficeName(StringUtils.join(list.toArray(),"_"));
// //
// // }
// // }
// systemService.insertUser(user);
// logger.info("..................向数据库中添加用户信息成功。");
// // }
// // }
// // }
// } // }
}catch (Exception e){ }catch (Exception e){
throw new AuthenticationException(e.getMessage()); throw new AuthenticationException(e.getMessage());
......
src/main/resources/mappings/modules/report/ReportDao.xml
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
report_source, report_source,
report_status, report_status,
supplement_informant, supplement_informant,
supplement_title，
exchange_before_user, exchange_before_user,
exchange_after_user, exchange_after_user,
exchange_type, exchange_type,
...@@ -179,6 +180,7 @@ ...@@ -179,6 +180,7 @@
#{reportSource}, #{reportSource},
#{reportStatus}, #{reportStatus},
#{supplementInformant}， #{supplementInformant}，
#{supplementTitle},
#{exchangeBeforeUser}, #{exchangeBeforeUser},
#{exchangeAfterUser}, #{exchangeAfterUser},
#{exchangeType}, #{exchangeType},
......
src/main/webapp/WEB-INF/views/modules/report/reportForm.jsp
...@@ -140,12 +140,19 @@ ...@@ -140,12 +140,19 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">被举报项目/被举报部门:</label> <label class="control-label">被举报项目/被举报部门:</label>
<div class="controls"> <div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required" <form:input path="supplementTitle" htmlEscape="false" maxlength="50" class="input-xlarge required"
placeholder="最多输入50个字符"/> placeholder="最多输入50个字符"/>
<span class="help-inline"><font color="red">*</font> </span> <span class="help-inline"><font color="red">*</font> </span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label">标题:</label>
<div class="controls">
<form:input path="reportProject" htmlEscape="false" maxlength="50" class="input-xlarge required"/>
<span class="help-inline"><font color="red">*</font> </span>
</div>
</div>
<div class="control-group">
<label class="control-label">所在城市:</label> <label class="control-label">所在城市:</label>
<div class="controls"> <div class="controls">
<select id="s_province" name="s_province" htmlEscape="false" class="input-medium"></select> <select id="s_province" name="s_province" htmlEscape="false" class="input-medium"></select>
......
src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp
...@@ -76,24 +76,24 @@ ...@@ -76,24 +76,24 @@
} }
var path = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作"; var path = "mailto:?subject=举报核查-"+supplementType+"-"+supplementInformant+"违规操作";
path += "&body=Dear,<br/>附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。<br/>谢谢！"; path += "&body=Dear,%0D%0A附件是举报核查-"+supplementType+"-"+supplementInformant+"违规操作，请核实是否属实。%0D%0A谢谢！";
//path += "<br/><br/><br/>%0D%0A${userName}"; //path += "%0D%0A%0D%0A%0D%0A%0D%0A${userName}";
path += "</p>举报内容</br>"; path += "%0D%0A%0D%0A举报内容%0D%0A";
path += "被举报项目:${report.reportProject}</br>"; path += "被举报项目:${report.reportProject}%0D%0A";
path += "标题:${report.supplementTitle}</br>"; path += "标题:${report.supplementTitle}%0D%0A";
path += "被举报人:${report.supplementInformant}</br>"; path += "被举报人:${report.supplementInformant}%0D%0A";
path += "举报时间:${report.reportTime}</br>"; path += "举报时间:${report.reportTime}%0D%0A";
path += "所在城市:${report.reportCity}</br>"; path += "所在城市:${report.reportCity}%0D%0A";
path += "内容:${report.reportContent}</br>"; path += "内容:${report.reportContent}%0D%0A";
path += "附件:</br>"; path += "附件:%0D%0A";
$("#attachment1").find("[class='attachmentClass']").each(function(){ $("#attachment1").find("[class='attachmentClass']").each(function(){
var url = $(this).text(); var url = $(this).text();
path += url; path += url;
}); });
path += "</br>举报人信息</br>"; path += "%0D%0A举报人信息%0D%0A";
path += "姓名:${report.reportPersonName}</br>"; path += "姓名:${report.reportPersonName}%0D%0A";
path += "手机号:${report.reportPersonTel}</br>"; path += "手机号:${report.reportPersonTel}%0D%0A";
path += "Email:${report.reportPersonEmail}</br>"; path += "Email:${report.reportPersonEmail}%0D%0A";
var reportSource = "${report.reportSource}"; var reportSource = "${report.reportSource}";
if (reportSource == "web"){ if (reportSource == "web"){
reportSource = "官网"; reportSource = "官网";
...@@ -114,12 +114,12 @@ ...@@ -114,12 +114,12 @@
}else if (reportSource == "visit"){ }else if (reportSource == "visit"){
reportSource = "来访"; reportSource = "来访";
} }
path += "举报途径:"+reportSource+"</br>"; path += "举报途径:"+reportSource+"%0D%0A";
var reportStatus = "${report.reportStatus}"; var reportStatus = "${report.reportStatus}";
if (reportStatus != "0"){ if (reportStatus != "0"){
path += "举报信息补充</br>"; path += "举报信息补充%0D%0A";
var supplementTypeStr = "${supplementTypeStr}"; var supplementTypeStr = "${supplementTypeStr}";
path += "业务类型:"+supplementTypeStr+"</br>"; path += "业务类型:"+supplementTypeStr+"%0D%0A";
var supplementArea = "${report.supplementArea}"; var supplementArea = "${report.supplementArea}";
if (supplementArea == "North China"){ if (supplementArea == "North China"){
supplementArea = "华北区域公司"; supplementArea = "华北区域公司";
...@@ -140,10 +140,10 @@ ...@@ -140,10 +140,10 @@
}else if (supplementArea == "Group"){ }else if (supplementArea == "Group"){
supplementArea = "集团本部"; supplementArea = "集团本部";
} }
path += "被举报区域:"+ supplementArea +"</br>"; path += "被举报区域:"+ supplementArea +"%0D%0A";
//path += "被举报项目:${report.supplementProject}</br>"; //path += "被举报项目:${report.supplementProject}%0D%0A";
path += "内容:${report.supplementContent}</br>"; path += "内容:${report.supplementContent}%0D%0A";
path += "附件:</br>"; path += "附件:%0D%0A";
$("#attachment2").find("[class='attachmentClass']").each(function(){ $("#attachment2").find("[class='attachmentClass']").each(function(){
var url = $(this).text(); var url = $(this).text();
path += url; path += url;
......
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