Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

体验新版 GitCode，发现更多精彩内容 >>

提交 bc8fbe3a 编写于 作者: MaxKey单点登录官方's avatar MaxKey单点登录官方
浏览文件
操作

v1.3.1 FIX 

1、验证增强，增加算术验证码支持
2、修复新增用户时报错
3、修复操作日志报错
4、mybatis-jpa-extra升级到v2.0
上级 20497c4a
展开全部 隐藏空白更改
内联 并排
Showing with 1815 addition and 1779 deletion
maxkey-core/src/main/java/org/maxkey/config/LoginConfig.java
浏览文件 @ bc8fbe3a
...@@ -9,16 +9,26 @@ import org.springframework.context.annotation.PropertySource; ...@@ -9,16 +9,26 @@ import org.springframework.context.annotation.PropertySource;
public class LoginConfig { public class LoginConfig {
@Value("${config.login.captcha}") @Value("${config.login.captcha}")
boolean captcha; boolean captcha;
//验证码类型 text 文本 ， arithmetic算术验证码
@Value("${config.login.captcha.type}")
String captchaType;
@Value("${config.login.onetimepwd}") @Value("${config.login.onetimepwd}")
boolean oneTimePwd; boolean oneTimePwd;
@Value("${config.login.socialsignon}") @Value("${config.login.socialsignon}")
boolean socialSignOn; boolean socialSignOn;
@Value("${config.login.kerberos}") @Value("${config.login.kerberos}")
boolean kerberos; boolean kerberos;
@Value("${config.login.remeberme}") @Value("${config.login.remeberme}")
boolean remeberMe; boolean remeberMe;
@Value("${config.login.wsfederation}") @Value("${config.login.wsfederation}")
boolean wsFederation; boolean wsFederation;
@Value("${config.login.default.uri}") @Value("${config.login.default.uri}")
String defaultUri; String defaultUri;
...@@ -84,6 +94,14 @@ public class LoginConfig { ...@@ -84,6 +94,14 @@ public class LoginConfig {
public void setWsFederation(boolean wsFederation) { public void setWsFederation(boolean wsFederation) {
this.wsFederation = wsFederation; this.wsFederation = wsFederation;
} }
public String getCaptchaType() {
return captchaType;
}
public void setCaptchaType(String captchaType) {
this.captchaType = captchaType;
}
@Override @Override
public String toString() { public String toString() {
......
maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java
浏览文件 @ bc8fbe3a
package org.maxkey.domain; package org.maxkey.domain;
import java.io.Serializable; import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import org.apache.mybatis.jpa.persistence.JpaBaseDomain; import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
/** /**
* .
* @author Crystal.Sea * @author Crystal.Sea
* *
*/ */
@Table(name = "HISTORY_LOGS") @Table(name = "HISTORY_LOGS")
public class HistoryLogs extends JpaBaseDomain implements Serializable { public class HistoryLogs extends JpaBaseDomain implements Serializable {
private static final long serialVersionUID = 6560201093784960493L;
@Id
@Column
@GeneratedValue(strategy = GenerationType.AUTO, generator = "uuid")
String id;
@Column
String serviceName;
@Column
String message;
@Column
String content;
@Column
String messageType;
@Column
String operateType;
@Column
String username;
@Column
String code;
@Column
String createdBy;
@Column
String createdDate;
@Column
String modifiedBy;
@Column
String modifiedDate;
String startDate;
String endDate;
public HistoryLogs() {
super();
}
/**
* HistoryLogs.
* @param serviceName String
* @param code String
* @param message String
* @param content String
* @param messageType String
* @param operateType String
* @param createdBy String
* @param username String
* @param cname String
*/
public HistoryLogs(String serviceName, String code,
String message, String content,
String messageType,String operateType,
String createdBy, String username, String cname) {
super();
this.serviceName = serviceName;
this.code = code;
this.message = message;
this.content = content;
this.messageType = messageType;
this.operateType = operateType;
this.createdBy = createdBy;
this.username = username;
}
public String getServiceName() {
return serviceName;
}
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getMessageType() {
return messageType;
}
public void setMessageType(String messageType) {
this.messageType = messageType;
}
public String getOperateType() {
return operateType;
}
public void setOperateType(String operateType) {
this.operateType = operateType;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCreatedBy() {
return createdBy;
}
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public String getCreatedDate() {
return createdDate;
}
public void setCreatedDate(String createdDate) {
this.createdDate = createdDate;
}
public String getModifiedBy() {
return modifiedBy;
}
public void setModifiedBy(String modifiedBy) {
this.modifiedBy = modifiedBy;
}
public String getModifiedDate() {
return modifiedDate;
}
public void setModifiedDate(String modifiedDate) {
this.modifiedDate = modifiedDate;
}
public String getStartDate() {
return startDate;
}
/** public void setStartDate(String startDate) {
* this.startDate = startDate;
*/ }
private static final long serialVersionUID = 6560201093784960493L;
String id;
String serviceName;
String message;
String content;
String messageType;
String operateType;
String username;
String code;
String createdBy;
String createdDate;
String modifiedBy;
String modifiedDate;
String startDate;
String endDate;
public HistoryLogs() {
super();
}
public HistoryLogs(String serviceName, String code, String message,
String content, String messageType, String operateType,
String createdBy, String username, String cname) {
super();
this.serviceName = serviceName;
this.code = code;
this.message = message;
this.content = content;
this.messageType = messageType;
this.operateType = operateType;
this.createdBy = createdBy;
this.username = username;
}
public String getServiceName() {
return serviceName;
}
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getMessageType() {
return messageType;
}
public void setMessageType(String messageType) {
this.messageType = messageType;
}
public String getOperateType() {
return operateType;
}
public void setOperateType(String operateType) {
this.operateType = operateType;
}
/**
* @return the username
*/
public String getUsername() {
return username;
}
/**
* @param username
* the username to set
*/
public void setUsername(String username) {
this.username = username;
}
/**
* @return the code
*/
public String getCode() {
return code;
}
/**
* @param code
* the code to set
*/
public void setCode(String code) {
this.code = code;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getCreatedBy() {
return createdBy;
}
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
public String getCreatedDate() {
return createdDate;
}
public void setCreatedDate(String createdDate) {
this.createdDate = createdDate;
}
public String getModifiedBy() {
return modifiedBy;
}
public void setModifiedBy(String modifiedBy) {
this.modifiedBy = modifiedBy;
}
public String getModifiedDate() {
return modifiedDate;
}
public void setModifiedDate(String modifiedDate) {
this.modifiedDate = modifiedDate;
}
public String getStartDate() {
return startDate;
}
public void setStartDate(String startDate) {
this.startDate = startDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
public String getEndDate() {
return endDate;
}
public void setEndDate(String endDate) {
this.endDate = endDate;
}
} }
maxkey-core/src/main/java/org/maxkey/persistence/db/UserInfoRowMapper.java
浏览文件 @ bc8fbe3a
...@@ -6,114 +6,113 @@ import java.sql.SQLException; ...@@ -6,114 +6,113 @@ import java.sql.SQLException;
import org.maxkey.domain.UserInfo; import org.maxkey.domain.UserInfo;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
public class UserInfoRowMapper implements RowMapper<UserInfo> { public class UserInfoRowMapper implements RowMapper<UserInfo> {
@Override @Override
public UserInfo mapRow(ResultSet rs, int rowNum)throws SQLException { public UserInfo mapRow(ResultSet rs, int rowNum) throws SQLException {
UserInfo userInfo=new UserInfo(); UserInfo userInfo = new UserInfo();
userInfo.setId(rs.getString("ID")); userInfo.setId(rs.getString("ID"));
userInfo.setUsername(rs.getString("USERNAME")); userInfo.setUsername(rs.getString("USERNAME"));
userInfo.setPassword(rs.getString("PASSWORD")); userInfo.setPassword(rs.getString("PASSWORD"));
userInfo.setSharedSecret(rs.getString("SHAREDSECRET")); userInfo.setSharedSecret(rs.getString("SHAREDSECRET"));
userInfo.setSharedCounter(rs.getString("SHAREDCOUNTER")); userInfo.setSharedCounter(rs.getString("SHAREDCOUNTER"));
userInfo.setDecipherable(rs.getString("DECIPHERABLE")); userInfo.setDecipherable(rs.getString("DECIPHERABLE"));
userInfo.setWindowsAccount(rs.getString("WINDOWSACCOUNT")); userInfo.setWindowsAccount(rs.getString("WINDOWSACCOUNT"));
userInfo.setUserType(rs.getString("USERTYPE")); userInfo.setUserType(rs.getString("USERTYPE"));
userInfo.setDisplayName(rs.getString("DISPLAYNAME")); userInfo.setDisplayName(rs.getString("DISPLAYNAME"));
userInfo.setNickName(rs.getString("NICKNAME")); userInfo.setNickName(rs.getString("NICKNAME"));
userInfo.setNameZHSpell(rs.getString("NAMEZHSPELL"));//nameZHSpell userInfo.setNameZhSpell(rs.getString("NAMEZHSPELL"));// nameZHSpell
userInfo.setNameZHShortSpell(rs.getString("NAMEZHSHORTSPELL"));//nameZHSpell userInfo.setNameZhShortSpell(rs.getString("NAMEZHSHORTSPELL"));// nameZHSpell
userInfo.setGivenName(rs.getString("GIVENNAME")); userInfo.setGivenName(rs.getString("GIVENNAME"));
userInfo.setMiddleName(rs.getString("MIDDLENAME")); userInfo.setMiddleName(rs.getString("MIDDLENAME"));
userInfo.setFamilyName(rs.getString("FAMILYNAME")); userInfo.setFamilyName(rs.getString("FAMILYNAME"));
userInfo.setHonorificPrefix(rs.getString("HONORIFICPREFIX")); userInfo.setHonorificPrefix(rs.getString("HONORIFICPREFIX"));
userInfo.setHonorificSuffix(rs.getString("HONORIFICSUFFIX")); userInfo.setHonorificSuffix(rs.getString("HONORIFICSUFFIX"));
userInfo.setFormattedName(rs.getString("FORMATTEDNAME")); userInfo.setFormattedName(rs.getString("FORMATTEDNAME"));
userInfo.setGender(rs.getInt("GENDER")); userInfo.setGender(rs.getInt("GENDER"));
userInfo.setBirthDate(rs.getString("BIRTHDATE")); userInfo.setBirthDate(rs.getString("BIRTHDATE"));
userInfo.setPicture(rs.getBytes("PICTURE")); userInfo.setPicture(rs.getBytes("PICTURE"));
userInfo.setMarried(rs.getInt("MARRIED")); userInfo.setMarried(rs.getInt("MARRIED"));
userInfo.setIdType(rs.getInt("IDTYPE")); userInfo.setIdType(rs.getInt("IDTYPE"));
userInfo.setIdCardNo(rs.getString("IDCARDNO")); userInfo.setIdCardNo(rs.getString("IDCARDNO"));
userInfo.setWebSite(rs.getString("WEBSITE")); userInfo.setWebSite(rs.getString("WEBSITE"));
userInfo.setAuthnType(rs.getInt("AUTHNTYPE")); userInfo.setAuthnType(rs.getInt("AUTHNTYPE"));
userInfo.setMobile(rs.getString("MOBILE")); userInfo.setMobile(rs.getString("MOBILE"));
userInfo.setMobileVerified(rs.getInt("MOBILEVERIFIED")); userInfo.setMobileVerified(rs.getInt("MOBILEVERIFIED"));
userInfo.setEmail(rs.getString("EMAIL")); userInfo.setEmail(rs.getString("EMAIL"));
userInfo.setEmailVerified(rs.getInt("EMAILVERIFIED")); userInfo.setEmailVerified(rs.getInt("EMAILVERIFIED"));
userInfo.setPasswordQuestion(rs.getString("PASSWORDQUESTION")); userInfo.setPasswordQuestion(rs.getString("PASSWORDQUESTION"));
userInfo.setPasswordAnswer(rs.getString("PASSWORDANSWER")); userInfo.setPasswordAnswer(rs.getString("PASSWORDANSWER"));
userInfo.setAppLoginAuthnType(rs.getInt("APPLOGINAUTHNTYPE")); userInfo.setAppLoginAuthnType(rs.getInt("APPLOGINAUTHNTYPE"));
userInfo.setAppLoginPassword(rs.getString("APPLOGINPASSWORD")); userInfo.setAppLoginPassword(rs.getString("APPLOGINPASSWORD"));
userInfo.setProtectedApps(rs.getString("PROTECTEDAPPS")); userInfo.setProtectedApps(rs.getString("PROTECTEDAPPS"));
userInfo.setPasswordLastSetTime(rs.getString("PASSWORDLASTSETTIME")); userInfo.setPasswordLastSetTime(rs.getString("PASSWORDLASTSETTIME"));
userInfo.setPasswordSetType(rs.getInt("PASSWORDSETTYPE")); userInfo.setPasswordSetType(rs.getInt("PASSWORDSETTYPE"));
userInfo.setBadPasswordCount(rs.getInt("BADPASSWORDCOUNT")); userInfo.setBadPasswordCount(rs.getInt("BADPASSWORDCOUNT"));
userInfo.setUnLockTime(rs.getString("UNLOCKTIME")); userInfo.setUnLockTime(rs.getString("UNLOCKTIME"));
userInfo.setIsLocked(rs.getInt("ISLOCKED")); userInfo.setIsLocked(rs.getInt("ISLOCKED"));
userInfo.setLastLoginTime(rs.getString("LASTLOGINTIME")); userInfo.setLastLoginTime(rs.getString("LASTLOGINTIME"));
userInfo.setLastLoginIp(rs.getString("LASTLOGINIP")); userInfo.setLastLoginIp(rs.getString("LASTLOGINIP"));
userInfo.setLastLogoffTime(rs.getString("LASTLOGOFFTIME")); userInfo.setLastLogoffTime(rs.getString("LASTLOGOFFTIME"));
userInfo.setLoginCount(rs.getInt("LOGINCOUNT")); userInfo.setLoginCount(rs.getInt("LOGINCOUNT"));
userInfo.setTimeZone(rs.getString("TIMEZONE")); userInfo.setTimeZone(rs.getString("TIMEZONE"));
userInfo.setLocale(rs.getString("LOCALE")); userInfo.setLocale(rs.getString("LOCALE"));
userInfo.setPreferredLanguage(rs.getString("PREFERREDLANGUAGE")); userInfo.setPreferredLanguage(rs.getString("PREFERREDLANGUAGE"));
userInfo.setWorkEmail(rs.getString("WORKEMAIL"));
userInfo.setWorkEmail(rs.getString("WORKEMAIL")); userInfo.setWorkPhoneNumber(rs.getString("WORKPHONENUMBER"));
userInfo.setWorkPhoneNumber(rs.getString("WORKPHONENUMBER")); userInfo.setWorkCountry(rs.getString("WORKCOUNTRY"));
userInfo.setWorkCountry(rs.getString("WORKCOUNTRY")); userInfo.setWorkRegion(rs.getString("WORKREGION"));
userInfo.setWorkRegion(rs.getString("WORKREGION")); userInfo.setWorkLocality(rs.getString("WORKLOCALITY"));
userInfo.setWorkLocality(rs.getString("WORKLOCALITY")); userInfo.setWorkStreetAddress(rs.getString("WORKSTREETADDRESS"));
userInfo.setWorkStreetAddress(rs.getString("WORKSTREETADDRESS")); userInfo.setWorkAddressFormatted(rs.getString("WORKADDRESSFORMATTED"));
userInfo.setWorkAddressFormatted(rs.getString("WORKADDRESSFORMATTED")); userInfo.setWorkPostalCode(rs.getString("WORKPOSTALCODE"));
userInfo.setWorkPostalCode(rs.getString("WORKPOSTALCODE")); userInfo.setWorkFax(rs.getString("WORKFAX"));
userInfo.setWorkFax(rs.getString("WORKFAX"));
userInfo.setHomeEmail(rs.getString("HOMEEMAIL"));
userInfo.setHomeEmail(rs.getString("HOMEEMAIL")); userInfo.setHomePhoneNumber(rs.getString("HOMEPHONENUMBER"));
userInfo.setHomePhoneNumber(rs.getString("HOMEPHONENUMBER")); userInfo.setHomeCountry(rs.getString("HOMECOUNTRY"));
userInfo.setHomeCountry(rs.getString("HOMECOUNTRY")); userInfo.setHomeRegion(rs.getString("HOMEREGION"));
userInfo.setHomeRegion(rs.getString("HOMEREGION")); userInfo.setHomeLocality(rs.getString("HOMELOCALITY"));
userInfo.setHomeLocality(rs.getString("HOMELOCALITY")); userInfo.setHomeStreetAddress(rs.getString("HOMESTREETADDRESS"));
userInfo.setHomeStreetAddress(rs.getString("HOMESTREETADDRESS")); userInfo.setHomeAddressFormatted(rs.getString("HOMEADDRESSFORMATTED"));
userInfo.setHomeAddressFormatted(rs.getString("HOMEADDRESSFORMATTED")); userInfo.setHomePostalCode(rs.getString("HOMEPOSTALCODE"));
userInfo.setHomePostalCode(rs.getString("HOMEPOSTALCODE")); userInfo.setHomeFax(rs.getString("HOMEFAX"));
userInfo.setHomeFax(rs.getString("HOMEFAX"));
userInfo.setEmployeeNumber(rs.getString("EMPLOYEENUMBER"));
userInfo.setEmployeeNumber(rs.getString("EMPLOYEENUMBER")); userInfo.setDivision(rs.getString("DIVISION"));
userInfo.setDivision(rs.getString("DIVISION")); userInfo.setCostCenter(rs.getString("COSTCENTER"));
userInfo.setCostCenter(rs.getString("COSTCENTER")); userInfo.setOrganization(rs.getString("ORGANIZATION"));
userInfo.setOrganization(rs.getString("ORGANIZATION")); userInfo.setDepartmentId(rs.getString("DEPARTMENTID"));
userInfo.setDepartmentId(rs.getString("DEPARTMENTID")); userInfo.setDepartment(rs.getString("DEPARTMENT"));
userInfo.setDepartment(rs.getString("DEPARTMENT")); userInfo.setJobTitle(rs.getString("JOBTITLE"));
userInfo.setJobTitle(rs.getString("JOBTITLE")); userInfo.setJobLevel(rs.getString("JOBLEVEL"));
userInfo.setJobLevel(rs.getString("JOBLEVEL")); userInfo.setManagerId(rs.getString("MANAGERID"));
userInfo.setManagerId(rs.getString("MANAGERID")); userInfo.setManager(rs.getString("MANAGER"));
userInfo.setManager(rs.getString("MANAGER")); userInfo.setAssistantId(rs.getString("ASSISTANTID"));
userInfo.setAssistantId(rs.getString("ASSISTANTID")); userInfo.setAssistant(rs.getString("ASSISTANT"));
userInfo.setAssistant(rs.getString("ASSISTANT")); userInfo.setEntryDate(rs.getString("ENTRYDATE"));//
userInfo.setEntryDate(rs.getString("ENTRYDATE"));// userInfo.setQuitDate(rs.getString("QUITDATE"));
userInfo.setQuitDate(rs.getString("QUITDATE")); userInfo.setStartWorkDate(rs.getString("STARTWORKDATE"));// STARTWORKDATE
userInfo.setStartWorkDate(rs.getString("STARTWORKDATE"));//STARTWORKDATE
userInfo.setExtraAttribute(rs.getString("EXTRAATTRIBUTE"));
userInfo.setExtraAttribute(rs.getString("EXTRAATTRIBUTE"));
userInfo.setCreatedBy(rs.getString("CREATEDBY"));
userInfo.setCreatedBy(rs.getString("CREATEDBY")); userInfo.setCreatedDate(rs.getString("CREATEDDATE"));
userInfo.setCreatedDate(rs.getString("CREATEDDATE")); userInfo.setModifiedBy(rs.getString("MODIFIEDBY"));
userInfo.setModifiedBy(rs.getString("MODIFIEDBY")); userInfo.setModifiedDate(rs.getString("MODIFIEDDATE"));
userInfo.setModifiedDate(rs.getString("MODIFIEDDATE"));
userInfo.setStatus(rs.getInt("STATUS"));
userInfo.setStatus(rs.getInt("STATUS")); userInfo.setGridList(rs.getInt("GRIDLIST"));
userInfo.setGridList(rs.getInt("GRIDLIST")); userInfo.setDescription(rs.getString("DESCRIPTION"));
userInfo.setDescription(rs.getString("DESCRIPTION"));
return userInfo;
return userInfo; }
}
} }
maxkey-core/src/main/java/org/maxkey/web/ImageEndpoint.java
浏览文件 @ bc8fbe3a
package org.maxkey.web; package org.maxkey.web;
import com.google.code.kaptcha.Producer;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.maxkey.config.ApplicationConfig;
import org.maxkey.web.WebConstants;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import com.google.code.kaptcha.Producer;
/** /**
* ImageEndpoint Producer Image and captcha.
* @author Crystal.Sea * @author Crystal.Sea
* *
*/ */
@Controller @Controller
public class ImageEndpoint { public class ImageEndpoint {
private static final Logger _logger = LoggerFactory.getLogger(ImageEndpoint.class); private static final Logger _logger = LoggerFactory.getLogger(ImageEndpoint.class);
@Autowired
private Producer captchaProducer;
/** @Autowired
* captcha image Producer private Producer captchaProducer;
* @param request
* @param response
*/
@RequestMapping(value = "/captcha")
public void captchaHandleRequest(HttpServletRequest request,HttpServletResponse response){
try{
// Set to expire far in the past.
response.setDateHeader("Expires", 0);
// Set standard HTTP/1.1 no-cache headers.
response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
// Set IE extended HTTP/1.1 no-cache headers (use addHeader).
response.addHeader("Cache-Control", "post-check=0, pre-check=0");
// Set standard HTTP/1.0 no-cache header.
response.setHeader("Pragma", "no-cache");
// return a jpeg
response.setContentType("image/jpeg");
// create the text for the image
String capText = captchaProducer.createText();
_logger.trace("Sesssion id " + request.getSession().getId() + " , Captcha Text is " + capText);
// store the text in the session
request.getSession().setAttribute(WebConstants.KAPTCHA_SESSION_KEY, capText);
// create the image with the text
BufferedImage bi = captchaProducer.createImage(capText);
ServletOutputStream out = response.getOutputStream();
// write the data out
ImageIO.write(bi, "jpg", out);
out.flush(); @Autowired
out.close(); @Qualifier("applicationConfig")
}catch(Exception e) { ApplicationConfig applicationConfig;
_logger.error("captcha Producer Error " + e.getMessage());
/**
* captcha image Producer.
*
* @param request HttpServletRequest
* @param response HttpServletResponse
*/
@RequestMapping(value = "/captcha")
public void captchaHandleRequest(HttpServletRequest request, HttpServletResponse response) {
try {
String kaptchaText = captchaProducer.createText();
if (applicationConfig.getLoginConfig().getCaptchaType()
.equalsIgnoreCase("Arithmetic")) {
Integer intParamA = Integer.valueOf(kaptchaText.substring(0, 1));
Integer intParamB = Integer.valueOf(kaptchaText.substring(1, 2));
Integer calculateValue = 0;
if ((intParamA > intParamB) && ((intParamA + intParamB) % 5 > 3)) {
calculateValue = intParamA - intParamB;
kaptchaText = intParamA + "-" + intParamB + "=?";
} else {
calculateValue = intParamA + intParamB;
kaptchaText = intParamA + "+" + intParamB + "=?";
}
_logger.trace("Sesssion id " + request.getSession().getId()
+ " , Arithmetic calculate Value is " + calculateValue);
request.getSession().setAttribute(
WebConstants.KAPTCHA_SESSION_KEY, calculateValue + "");
} else {
// store the text in the session
request.getSession().setAttribute(WebConstants.KAPTCHA_SESSION_KEY, kaptchaText);
}
_logger.trace("Sesssion id " + request.getSession().getId()
+ " , Captcha Text is " + kaptchaText);
// create the image with the text
BufferedImage bufferedImage = captchaProducer.createImage(kaptchaText);
producerImage(request,response,bufferedImage);
} catch (Exception e) {
_logger.error("captcha Producer Error " + e.getMessage());
} }
} }
/**
* image Producer
* @param request
* @param response
* @return
* @throws Exception
*/
@RequestMapping("/image/{id}") /**
public void imageHandleRequest(HttpServletRequest request,HttpServletResponse response,@PathVariable("id") String id) throws Exception { * Session Image Producer.
// Set to expire far in the past. *
response.setDateHeader("Expires", 0); * @param request HttpServletRequest
// Set standard HTTP/1.1 no-cache headers. * @param response HttpServletResponse
response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate"); */
// Set IE extended HTTP/1.1 no-cache headers (use addHeader).
response.addHeader("Cache-Control", "post-check=0, pre-check=0"); @RequestMapping("/image/{id}")
// Set standard HTTP/1.0 no-cache header. public void imageHandleRequest(HttpServletRequest request, HttpServletResponse response,
response.setHeader("Pragma", "no-cache"); @PathVariable("id") String id) {
// return a jpeg/gif try {
response.setContentType("image/gif"); // get session image bytes
// create the text for the image byte[] image = (byte[]) request.getSession().getAttribute(id);
byte[]image=(byte[]) request.getSession().getAttribute(id); producerImage(request,response,byte2BufferedImage(image));
//request.getSession().removeAttribute(id); } catch (Exception e) {
// create the image with the text _logger.error("captcha Producer Error " + e.getMessage());
if(image!=null){ }
ServletOutputStream out = response.getOutputStream(); }
// write the data out
ImageIO.write(byte2BufferedImage(image), "gif", out); /**
try{ * producerImage.
out.flush(); * @param request HttpServletRequest
}finally{ * @param response HttpServletResponse
out.close(); * @param bufferedImage BufferedImage
} * @throws IOException error
*/
public static void producerImage(HttpServletRequest request,
HttpServletResponse response,
BufferedImage bufferedImage) throws IOException {
// Set to expire far in the past.
response.setDateHeader("Expires", 0);
// Set standard HTTP/1.1 no-cache headers.
response.setHeader("Cache-Control", "no-store, no-cache, must-revalidate");
// Set IE extended HTTP/1.1 no-cache headers (use addHeader).
response.addHeader("Cache-Control", "post-check=0, pre-check=0");
// Set standard HTTP/1.0 no-cache header.
response.setHeader("Pragma", "no-cache");
// return a jpeg/gif
response.setContentType("image/gif");
// create the image
if (bufferedImage != null) {
ServletOutputStream out = response.getOutputStream();
// write the data out
ImageIO.write(bufferedImage, "gif", out);
try {
out.flush();
} finally {
out.close();
} }
}
} }
public static BufferedImage byte2BufferedImage(byte[]imageByte){ /**
* byte2BufferedImage.
* @param imageByte bytes
* @return
*/
public static BufferedImage byte2BufferedImage(byte[] imageByte) {
try { try {
InputStream in = new ByteArrayInputStream(imageByte); InputStream in = new ByteArrayInputStream(imageByte);
BufferedImage bufferedImage = ImageIO.read(in); BufferedImage bufferedImage = ImageIO.read(in);
return bufferedImage; return bufferedImage;
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
} }
public static byte[] bufferedImage2Byte(BufferedImage bufferedImage ){ /**
* bufferedImage2Byte.
* @param bufferedImage BufferedImage
* @return
*/
public static byte[] bufferedImage2Byte(BufferedImage bufferedImage) {
try { try {
ByteArrayOutputStream byteArrayOutputStream=new ByteArrayOutputStream(); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
ImageIO.write(bufferedImage,"gif",byteArrayOutputStream); ImageIO.write(bufferedImage, "gif", byteArrayOutputStream);
return byteArrayOutputStream.toByteArray(); return byteArrayOutputStream.toByteArray();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
return null; return null;
} }
public Producer getCaptchaProducer() { public void setCaptchaProducer(Producer captchaProducer) {
return captchaProducer; this.captchaProducer = captchaProducer;
} }
public void setApplicationConfig(ApplicationConfig applicationConfig) {
this.applicationConfig = applicationConfig;
}
public void setCaptchaProducer(Producer captchaProducer) {
this.captchaProducer = captchaProducer;
}
} }
maxkey-core/src/main/java/org/maxkey/web/message/Message.java
浏览文件 @ bc8fbe3a
...@@ -15,211 +15,213 @@ import org.springframework.validation.FieldError; ...@@ -15,211 +15,213 @@ import org.springframework.validation.FieldError;
/** /**
* message类定义 * message类定义
*
* @author Crystal.Sea * @author Crystal.Sea
* *
*/ */
public class Message { public class Message {
final static Logger _logger = LoggerFactory.getLogger(Message.class); static final Logger _logger = LoggerFactory.getLogger(Message.class);
//服务名称 // 服务名称
private String serviceName; private String serviceName;
//信息内容 // 信息内容
private String message; private String message;
//信息代码 // 信息代码
private String code; private String code;
//信息对象 // 信息对象
private Object messageObject; private Object messageObject;
//错误信息 // 错误信息
private ArrayList<HashMap<String,Object>> errors; private ArrayList<HashMap<String, Object>> errors;
//类型 // 类型
private MessageType messageType=MessageType.info; private MessageType messageType = MessageType.info;
//操作类型 // 操作类型
private OperateType operateType=OperateType.unknown; private OperateType operateType = OperateType.unknown;
//范围 // 范围
MessageScope messageScope=MessageScope.JSON; MessageScope messageScope = MessageScope.JSON;
public Message() { public Message() {
} }
public Message(String message) { public Message(String message) {
this.message = message; this.message = message;
this.messageType = MessageType.info; this.messageType = MessageType.info;
} }
public Message(BindingResult result) {
public Message(BindingResult result) { setFieldErrors(result);
setFieldErrors(result); }
}
public Message(String message, String code) {
public Message(String message, String code) { this.message = message;
this.message = message; this.code = code;
this.code = code; this.messageType = MessageType.info;
this.messageType = MessageType.info; }
}
public Message(String message, MessageType messageType) {
public Message(String message, MessageType messageType) { this.message = message;
this.message = message; this.messageType = messageType;
this.messageType = messageType; }
}
public Message(String message, BindingResult result) {
public Message(String message,BindingResult result) { this.message = message;
this.message = message; setFieldErrors(result);
setFieldErrors(result); }
}
public Message(String message, String code, MessageType messageType) {
public Message(String message, String code, MessageType messageType) { this.message = message;
this.message = message; this.code = code;
this.code = code; this.messageType = messageType;
this.messageType = messageType; }
}
public Message(String message, Object messageObject, MessageType messageType, OperateType operateType) {
public Message(String message,Object messageObject, MessageType messageType, this.message = message;
OperateType operateType) { this.messageType = messageType;
this.message = message; this.operateType = operateType;
this.messageType = messageType; this.messageObject = messageObject;
this.operateType = operateType; WebContext.setMessage(this);
this.messageObject = messageObject; }
WebContext.setMessage(this);
} public Message(String message, Object messageObject, MessageType messageType, OperateType operateType,
MessageScope messageScope) {
this.message = message;
public Message(String message,Object messageObject, MessageType messageType, this.messageObject = messageObject;
OperateType operateType,MessageScope messageScope) { this.messageType = messageType;
this.message = message; this.operateType = operateType;
this.messageObject = messageObject; this.messageScope = messageScope;
this.messageType = messageType; WebContext.setMessage(this);
this.operateType = operateType; }
this.messageScope= messageScope;
WebContext.setMessage(this); public Message(String message, Object messageObject, BindingResult result, MessageType messageType,
} OperateType operateType, MessageScope messageScope) {
this.message = message;
public Message(String message,Object messageObject,BindingResult result, MessageType messageType, this.messageObject = messageObject;
OperateType operateType,MessageScope messageScope) { this.operateType = operateType;
this.message = message; this.messageScope = messageScope;
this.messageObject = messageObject; setFieldErrors(result);
this.operateType = operateType; this.messageType = messageType;
this.messageScope= messageScope; WebContext.setMessage(this);
setFieldErrors(result); }
this.messageType = messageType;
WebContext.setMessage(this); public Message(String serviceName, String message, Object messageObject, BindingResult result,
} MessageType messageType, OperateType operateType, MessageScope messageScope) {
this.serviceName = serviceName;
public Message(String serviceName,String message,Object messageObject,BindingResult result, MessageType messageType, this.message = message;
OperateType operateType,MessageScope messageScope) { this.messageObject = messageObject;
this.serviceName = serviceName; this.operateType = operateType;
this.message = message; this.messageScope = messageScope;
this.messageObject = messageObject; setFieldErrors(result);
this.operateType = operateType; this.messageType = messageType;
this.messageScope= messageScope; WebContext.setMessage(this);
setFieldErrors(result); }
this.messageType = messageType;
WebContext.setMessage(this); public Message(String serviceName, String message, Object messageObject, BindingResult result,
} MessageType messageType, OperateType operateType, MessageScope messageScope, String code) {
this(serviceName, message, messageObject, result, messageType, operateType, messageScope);
public Message(String serviceName,String message,Object messageObject,BindingResult result, MessageType messageType, this.code = code;
OperateType operateType,MessageScope messageScope,String code) { }
this(serviceName, message, messageObject, result, messageType, operateType, messageScope);
this.code = code; /**
} * 验证错误组装
*
/** * @param result
* 验证错误组装 */
* @param result public void setFieldErrors(BindingResult result) {
*/ if (result == null)
public void setFieldErrors(BindingResult result) { return;
if(result==null) this.messageType = MessageType.error;
return; this.errors = new ArrayList<HashMap<String, Object>>();
this.messageType = MessageType.error; List<FieldError> listFieldError = result.getFieldErrors();
this.errors=new ArrayList<HashMap<String,Object>>();
List<FieldError> listFieldError=result.getFieldErrors(); for (FieldError fieldError : listFieldError) {
HashMap<String, Object> error = new HashMap<String, Object>();
for(FieldError fieldError : listFieldError){ error.put("field", fieldError.getField());
HashMap<String,Object> error=new HashMap<String,Object>(); error.put("type", fieldError.getCode());
error.put("field", fieldError.getField()); error.put("objectName", fieldError.getObjectName());
error.put("type", fieldError.getCode()); String defaultMessageSourceResolvable = fieldError.getCodes()[0];
error.put("objectName", fieldError.getObjectName()); String errorMessage = WebContext.getI18nValue(defaultMessageSourceResolvable);
String defaultMessageSourceResolvable=fieldError.getCodes()[0]; if (errorMessage == null) {
String errorMessage=WebContext.getI18nValue(defaultMessageSourceResolvable); error.put("message", /* fieldError.getField()+" "+ */fieldError.getDefaultMessage());
if(errorMessage==null){ } else {
error.put("message", /*fieldError.getField()+" "+*/fieldError.getDefaultMessage()); error.put("message", errorMessage);
}else{ }
error.put("message", errorMessage); _logger.debug("" + error);
} this.errors.add(error);
_logger.debug(""+error); }
this.errors.add(error); _logger.debug("" + this.errors);
} }
_logger.debug(""+this.errors);
} public void setApplication() {
WebContext.setMessage(this);
public void setApplication(){ }
WebContext.setMessage(this);
} /**
/** * @return the code
* @return the code */
*/ public String getCode() {
public String getCode() { return code;
return code; }
}
/**
/** * @param code the code to set
* @param code the code to set */
*/ public void setCode(String code) {
public void setCode(String code) { this.code = code;
this.code = code; }
}
public String getMessage() {
public String getMessage() { return message;
return message; }
}
public void setMessage(String message) { public void setMessage(String message) {
this.message = message; this.message = message;
} }
public MessageType getMessageType() { public MessageType getMessageType() {
return messageType; return messageType;
} }
public void setMessageType(MessageType messageType) {
this.messageType = messageType; public void setMessageType(MessageType messageType) {
} this.messageType = messageType;
}
public ArrayList<HashMap<String, Object>> getErrors() {
return errors; public ArrayList<HashMap<String, Object>> getErrors() {
} return errors;
}
public void setErrors(ArrayList<HashMap<String, Object>> errors) {
this.errors = errors; public void setErrors(ArrayList<HashMap<String, Object>> errors) {
} this.errors = errors;
}
public OperateType getOperateType() {
return operateType; public OperateType getOperateType() {
} return operateType;
}
public void setOperateType(OperateType operateType) {
this.operateType = operateType; public void setOperateType(OperateType operateType) {
} this.operateType = operateType;
}
public Object getMessageObject() {
return messageObject; public Object getMessageObject() {
} return messageObject;
}
public void setMessageObject(Object messageObject) {
this.messageObject = messageObject; public void setMessageObject(Object messageObject) {
} this.messageObject = messageObject;
}
public MessageScope getMessageScope() {
return messageScope; public MessageScope getMessageScope() {
} return messageScope;
}
public void setMessageScope(MessageScope messageScope) {
this.messageScope = messageScope; public void setMessageScope(MessageScope messageScope) {
} this.messageScope = messageScope;
}
public String getServiceName() {
return serviceName; public String getServiceName() {
} return serviceName;
}
public void setServiceName(String serviceName) {
this.serviceName = serviceName; public void setServiceName(String serviceName) {
} this.serviceName = serviceName;
}
} }
maxkey-dao/src/main/java/org/maxkey/dao/service/UserInfoService.java
浏览文件 @ bc8fbe3a
...@@ -43,14 +43,15 @@ public class UserInfoService extends JpaBaseService<UserInfo> { ...@@ -43,14 +43,15 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
return (UserInfoMapper)super.getMapper(); return (UserInfoMapper)super.getMapper();
} }
public boolean insert(UserInfo userinfo) { public boolean insert(UserInfo userInfo) {
if(super.insert(userinfo)){ userInfo = passwordEncoder(userInfo);
if (super.insert(userInfo)) {
return true;
} return true;
}
return false;
} return false;
}
public boolean update(UserInfo userinfo) { public boolean update(UserInfo userinfo) {
if(super.update(userinfo)){ if(super.update(userinfo)){
...@@ -102,20 +103,25 @@ public class UserInfoService extends JpaBaseService<UserInfo> { ...@@ -102,20 +103,25 @@ public class UserInfoService extends JpaBaseService<UserInfo> {
e.printStackTrace(); e.printStackTrace();
} }
} }
public UserInfo passwordEncoder(UserInfo userInfo) {
String password = passwordEncoder.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword()));
userInfo.setDecipherable(ReciprocalUtils.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())));
_logger.debug("decipherable : "+userInfo.getDecipherable());
userInfo.setPassword(password);
userInfo.setPasswordLastSetTime(DateUtils.getCurrentDateTimeAsString());
userInfo.setModifiedDate(DateUtils.getCurrentDateTimeAsString());
return userInfo;
}
public boolean changePassword(UserInfo userInfo) { public boolean changePassword(UserInfo userInfo) {
try { try {
if(WebContext.getUserInfo() != null) { if(WebContext.getUserInfo() != null) {
userInfo.setModifiedBy(WebContext.getUserInfo().getId()); userInfo.setModifiedBy(WebContext.getUserInfo().getId());
} }
String password = passwordEncoder.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())); userInfo = passwordEncoder(userInfo);
userInfo.setDecipherable(ReciprocalUtils.encode(PasswordReciprocal.getInstance().rawPassword(userInfo.getUsername(), userInfo.getPassword())));
_logger.debug("decipherable : "+userInfo.getDecipherable());
userInfo.setPassword(password);
userInfo.setPasswordLastSetTime(DateUtils.getCurrentDateTimeAsString());
userInfo.setModifiedDate(DateUtils.getCurrentDateTimeAsString());
if(getMapper().changePassword(userInfo) > 0){ if(getMapper().changePassword(userInfo) > 0){
ChangePassword changePassword=new ChangePassword(); ChangePassword changePassword=new ChangePassword();
......
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java
浏览文件 @ bc8fbe3a
...@@ -199,7 +199,7 @@ public class UserInfoController { ...@@ -199,7 +199,7 @@ public class UserInfoController {
* @return * @return
*/ */
@ResponseBody @ResponseBody
@RequestMapping(value="/delete",method=RequestMethod.DELETE) @RequestMapping(value="/delete")
public Message deleteUsersById(@RequestParam("id") String id) { public Message deleteUsersById(@RequestParam("id") String id) {
_logger.debug(id); _logger.debug(id);
if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) { if(userInfoService.batchDelete(StringUtils.string2List(id, ","))) {
......
maxkey-web-manage/src/main/resources/config/applicationConfig.properties
浏览文件 @ bc8fbe3a
...@@ -51,6 +51,8 @@ config.characterencoding.tocharset=UTF-8 ...@@ -51,6 +51,8 @@ config.characterencoding.tocharset=UTF-8
############################################################################ ############################################################################
# Login # Login
config.login.captcha=false config.login.captcha=false
#text or arithmetic
config.login.captcha.type=text
config.login.socialAuth=true config.login.socialAuth=true
config.login.msad.kerberos=false config.login.msad.kerberos=false
# End Login # End Login
......
maxkey-web-manage/src/main/resources/spring/maxkey-mgt-persistence.xml
浏览文件 @ bc8fbe3a
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
<!--<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">--> <!--<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">-->
<bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean"> <bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean">
<property name="dataSource" ref="dataSource" /> <property name="dataSource" ref="dataSource" />
<property name="dialect" value="mysql" />
<property name="timeout" value="30" />
<property name="transactionFactory"> <property name="transactionFactory">
<bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" /> <bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" />
</property> </property>
...@@ -70,32 +72,13 @@ ...@@ -70,32 +72,13 @@
org.maxkey.domain, org.maxkey.domain,
org.maxkey.domain.apps, org.maxkey.domain.apps,
" /> " />
<property name="timeout" value="30" />
<property name="mapperLocations" value="classpath*:org/maxkey/dao/persistence/xml/#{dataSoruceConfig.database}/*.xml" /> <property name="mapperLocations" value="classpath*:org/maxkey/dao/persistence/xml/#{dataSoruceConfig.database}/*.xml" />
<property name="interceptors">
<list>
<ref bean="StatementHandlerInterceptor"/>
</list>
</property>
</bean> </bean>
<bean id="StatementHandlerInterceptor" class="org.apache.mybatis.jpa.StatementHandlerInterceptor">
<!-- dialect need bean dialect
<property name="dialect">
<bean id="dialect" class="org.apache.mybatis.jpa.dialect.MySQLDialect"/>
</property>
-->
<!-- from database type -->
<property name="dialectString" value="#{dataSoruceConfig.dialect}"/>
</bean>
<bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate"> <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
<constructor-arg index="0" ref="sqlSessionFactory" /> <constructor-arg index="0" ref="sqlSessionFactory" />
</bean> </bean>
<!-- scan for mappers and let them be autowired --> <!-- scan for mappers and let them be autowired -->
<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer"> <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
<property name="basePackage" <property name="basePackage"
......
maxkey-web-manage/src/main/resources/spring/maxkey-mgt-security.xml
浏览文件 @ bc8fbe3a
...@@ -117,24 +117,23 @@ ...@@ -117,24 +117,23 @@
<!-- Captcha Producer Config --> <!-- Captcha Producer Config -->
<bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha"> <bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha">
<property name="config"> <property name="config" >
<bean class="com.google.code.kaptcha.util.Config"> <bean id="kaptchaConfig" class="com.google.code.kaptcha.util.Config">
<constructor-arg type="java.util.Properties"> <constructor-arg type="java.util.Properties">
<props> <props>
<prop key="kaptcha.image.width">70</prop> <prop key="kaptcha.image.width">80</prop>
<prop key="kaptcha.image.height">25</prop> <prop key="kaptcha.image.height">25</prop>
<prop key="kaptcha.border">no</prop> <prop key="kaptcha.border">no</prop>
<prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop> <prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop>
<prop key="kaptcha.textproducer.font.size">23</prop> <prop key="kaptcha.textproducer.font.size">23</prop>
<prop key="kaptcha.textproducer.char.string">0123456789</prop> <prop key="kaptcha.textproducer.char.string">0123456789</prop>
<prop key="kaptcha.textproducer.char.length">4</prop> <prop key="kaptcha.textproducer.char.length">4</prop>
<prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop> <prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop>
<!-- <prop key="kaptcha.noise.color">white</prop> <!-- <prop key="kaptcha.noise.color">white</prop> -->
--> </props>
</props> </constructor-arg>
</constructor-arg> </bean>
</bean> </property>
</property>
</bean> </bean>
<bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean> <bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean>
......
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsAdd.ftl
浏览文件 @ bc8fbe3a
...@@ -51,11 +51,11 @@ $(function () { ...@@ -51,11 +51,11 @@ $(function () {
</tr> </tr>
<tr> <tr>
<td > <@locale code="org.name" />：</td> <td > <@locale code="org.name" />：</td>
<td><input type="text" id="name" name="name" class="form-control"/></td> <td><input type="text" id="name" name="name" required="" class="form-control"/></td>
</tr> </tr>
<tr> <tr>
<td > <@locale code="org.fullname" />：</td> <td > <@locale code="org.fullname" />：</td>
<td><input type="text" id="fullName" name="fullName" class="form-control"/></td> <td><input type="text" id="fullName" name="fullName" required="" class="form-control"/></td>
</tr> </tr>
<tr > <tr >
<td > <@locale code="org.xpath" /> ： <td > <@locale code="org.xpath" /> ：
......
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
浏览文件 @ bc8fbe3a
...@@ -51,11 +51,11 @@ ...@@ -51,11 +51,11 @@
<td style="width:15%;"><@locale code="userinfo.username" />：</td> <td style="width:15%;"><@locale code="userinfo.username" />：</td>
<td style="width:35%;"> <td style="width:35%;">
<input type="hidden" id="id" name="id" value=""/> <input type="hidden" id="id" name="id" value=""/>
<input class="form-control" type="text" id="username" name="username" title="" value=""/> <input class="form-control" type="text" required="" id="username" name="username" title="" value=""/>
</td> </td>
<td style="width:15%;"><@locale code="login.text.password" />：</td> <td style="width:15%;"><@locale code="login.text.password" />：</td>
<td style="width:35%;"> <td style="width:35%;">
<input class="form-control" type="password" id="password" name="password" title="" value=""/> <input class="form-control" type="password" required="" id="password" name="password" title="" value=""/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<tr> <tr>
<td><@locale code="userinfo.displayName" />：</td> <td><@locale code="userinfo.displayName" />：</td>
<td> <td>
<input class="form-control" type="text" id="displayName" name="displayName" title="" value=""/> <input class="form-control" type="text" required="" id="displayName" name="displayName" title="" value=""/>
</td> </td>
<td rowspan="4"><@locale code="userinfo.picture" />：</td> <td rowspan="4"><@locale code="userinfo.picture" />：</td>
<td rowspan="4"> <td rowspan="4">
......
maxkey-web-maxkey/src/main/resources/config/applicationConfig.properties
浏览文件 @ bc8fbe3a
...@@ -40,12 +40,12 @@ config.datasource.password.encrypt=false ...@@ -40,12 +40,12 @@ config.datasource.password.encrypt=false
############################################################################ ############################################################################
# EMAIL configuration # EMAIL configuration
############################################################################ ############################################################################
config.email.username=test@maxkey.org config.email.username=shimingxy@163.com
config.email.password=3&8Ujbnm5hkjhFD config.email.password=seamingxy99
config.email.smtpHost=smtp.exmail.qq.com config.email.smtpHost=smtp.163.com
config.email.port=25 config.email.port=465
config.email.senderMail=test@maxkey.org config.email.senderMail=shimingxy@163.com
config.email.ssl=false config.email.ssl=true
############################################################################ ############################################################################
# CharacterEncoding configuration # CharacterEncoding configuration
...@@ -79,6 +79,8 @@ config.redis.pool.testonborrow=true ...@@ -79,6 +79,8 @@ config.redis.pool.testonborrow=true
# Login configuration # Login configuration
#enable captcha #enable captcha
config.login.captcha=true config.login.captcha=true
#text or arithmetic
config.login.captcha.type=text
#enable two factor,use one time password #enable two factor,use one time password
config.login.onetimepwd=true config.login.onetimepwd=true
#enable social sign on #enable social sign on
......
maxkey-web-maxkey/src/main/resources/spring/maxkey-persistence.xml
浏览文件 @ bc8fbe3a
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
<!--<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">--> <!--<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">-->
<bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean"> <bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean">
<property name="dataSource" ref="dataSource" /> <property name="dataSource" ref="dataSource" />
<property name="dialect" value="mysql" />
<property name="timeout" value="30" />
<property name="transactionFactory"> <property name="transactionFactory">
<bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" /> <bean class="org.apache.ibatis.transaction.managed.ManagedTransactionFactory" />
</property> </property>
...@@ -68,27 +70,9 @@ ...@@ -68,27 +70,9 @@
org.maxkey.domain, org.maxkey.domain,
org.maxkey.domain.apps, org.maxkey.domain.apps,
" /> " />
<property name="timeout" value="30" />
<property name="mapperLocations" value="classpath*:/org/maxkey/dao/persistence/xml/#{dataSoruceConfig.database}/*.xml" /> <property name="mapperLocations" value="classpath*:/org/maxkey/dao/persistence/xml/#{dataSoruceConfig.database}/*.xml" />
<property name="interceptors">
<list>
<ref bean="StatementHandlerInterceptor"/>
</list>
</property>
</bean> </bean>
<bean id="StatementHandlerInterceptor" class="org.apache.mybatis.jpa.StatementHandlerInterceptor">
<!-- dialect need bean dialect
<property name="dialect">
<bean id="dialect" class="org.apache.mybatis.jpa.dialect.MySQLDialect"/>
</property>
-->
<!-- from database type -->
<property name="dialectString" value="#{dataSoruceConfig.dialect}"/>
</bean>
<bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate"> <bean id="sqlSession" class="org.mybatis.spring.SqlSessionTemplate">
<constructor-arg index="0" ref="sqlSessionFactory" /> <constructor-arg index="0" ref="sqlSessionFactory" />
</bean> </bean>
......
maxkey-web-maxkey/src/main/resources/spring/maxkey-security.xml
浏览文件 @ bc8fbe3a
...@@ -127,26 +127,28 @@ ...@@ -127,26 +127,28 @@
</property> </property>
</bean> </bean>
<!-- Captcha Producer Config --> <!-- Captcha Producer Config -->
<bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha"> <bean id="captchaProducer" class="com.google.code.kaptcha.impl.DefaultKaptcha">
<property name="config"> <property name="config">
<bean class="com.google.code.kaptcha.util.Config"> <bean id="kaptchaConfig" class="com.google.code.kaptcha.util.Config">
<constructor-arg type="java.util.Properties"> <constructor-arg type="java.util.Properties">
<props> <props>
<prop key="kaptcha.image.width">70</prop> <prop key="kaptcha.image.width">80</prop>
<prop key="kaptcha.image.height">25</prop> <prop key="kaptcha.image.height">25</prop>
<prop key="kaptcha.border">no</prop> <prop key="kaptcha.border">no</prop>
<prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop> <prop key="kaptcha.obscurificator.impl">com.google.code.kaptcha.impl.ShadowGimpy</prop>
<prop key="kaptcha.textproducer.font.size">23</prop> <prop key="kaptcha.textproducer.font.size">23</prop>
<prop key="kaptcha.textproducer.char.string">0123456789</prop> <prop key="kaptcha.textproducer.char.string">0123456789</prop>
<prop key="kaptcha.textproducer.char.length">4</prop> <prop key="kaptcha.textproducer.char.length">4</prop>
<prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop> <prop key="kaptcha.noise.impl">com.google.code.kaptcha.impl.NoNoise</prop>
<!-- <prop key="kaptcha.noise.color">white</prop> <!-- 干扰线
--> <prop key="kaptcha.noise.color">white</prop>
</props> -->
</constructor-arg> </props>
</bean> </constructor-arg>
</property> </bean>
</property>
</bean> </bean>
<bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean> <bean id="savedRequestSuccessHandler" class="org.maxkey.authn.SavedRequestAwareAuthenticationSuccessHandler"> </bean>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或