소스 검색

新账户中心登录

wangdy 7 년 전
부모
커밋
fb02ced5bb
2개의 변경된 파일17개의 추가작업 그리고 2개의 파일을 삭제
  1. 16 1
      src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java
  2. 1 1
      src/main/resources/dev/account.properties

+ 16 - 1
src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -20,7 +20,6 @@ import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
 import com.uas.sso.SSOToken;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserAccount;
 import com.uas.sso.entity.UserSpaceView;
 import com.uas.sso.entity.UserSpaceView;
-import com.uas.sso.entity.UserView;
 import com.uas.sso.util.AccountUtils;
 import com.uas.sso.util.AccountUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
@@ -33,12 +32,15 @@ import org.springframework.mobile.device.site.SitePreference;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import javax.servlet.http.HttpSession;
+import java.beans.PropertyEditorSupport;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
@@ -216,6 +218,19 @@ public class SecurityController {
 		return null;
 		return null;
 	}
 	}
 
 
+	@InitBinder
+	public void InitBinder(WebDataBinder dataBinder) {
+		/*SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		dateFormat.setLenient(false);
+		dataBinder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));*/
+		dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
+			@Override
+			public void setAsText(String value) {
+				setValue(new Date(Long.valueOf(value)));
+			}
+		});
+	}
+
 	/**
 	/**
 	 * 其他地点登录后 同步登录状态
 	 * 其他地点登录后 同步登录状态
 	 * @param request
 	 * @param request

+ 1 - 1
src/main/resources/dev/account.properties

@@ -10,7 +10,7 @@ sso.cookie.secure=false
 sso.cookie.browser=false
 sso.cookie.browser=false
 sso.login.url=http://192.168.253.149:3001
 sso.login.url=http://192.168.253.149:3001
 sso.logout.url=http://192.168.253.149:3001/sso/logout
 sso.logout.url=http://192.168.253.149:3001/sso/logout
-sso.register.url=http://192.168.253.149:3001/sso/register_p
+sso.register.url=http://192.168.253.149:3001/register/enterpriseRegistration?appId=mall
 
 
 #cross domain
 #cross domain
 sso.ask.url=http://192.168.253.149:3001/sso/login/ask
 sso.ask.url=http://192.168.253.149:3001/sso/login/ask