登录问题

donate-console/src/main/java/com/uas/console/donate/model/User.java

@@ -1,6 +1,7 @@
 package com.uas.console.donate.model;
 
 import com.uas.account.entity.UserView;
+import com.uas.sso.entity.UserAccount;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -90,6 +91,14 @@ public class User implements Serializable{
         this.setEmail(user.getSecondUID());
     }
 
+    public User(UserAccount userAccount) {
+        this.setType("个人用户");
+        this.setUserUU(Long.valueOf(userAccount.getUserUU()));
+        this.setName(userAccount.getVipName());
+        this.setTel(userAccount.getMobile());
+        this.setEmail(userAccount.getEmail());
+    }
+
     public Long getUserUU() {
         return userUU;
     }

donate-console/src/main/java/com/uas/console/donate/web/filter/SSOInterceptor.java

@@ -1,12 +1,12 @@
 package com.uas.console.donate.web.filter;
 
-import com.uas.account.entity.UserView;
 import com.uas.console.donate.core.support.SystemSession;
 import com.uas.console.donate.dao.UserDao;
 import com.uas.console.donate.model.User;
 import com.uas.console.donate.util.FastjsonUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import com.uas.sso.web.spring.AbstractSSOInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -34,13 +34,13 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 
 	@Override
 	protected void onAuthenticateSuccess(HttpServletRequest request, HttpServletResponse response) {
-		UserView user = (UserView) request.getSession().getAttribute("user");
+		UserAccount user = (UserAccount) request.getSession().getAttribute("userAccount");
 		if (user == null) {
 			SSOToken token = SSOHelper.attrToken(request);
 			user = getUserByToken(token);
 			if (user != null) {
-				request.getSession().setAttribute("user", user);
-				User u = userDao.findOne(Long.valueOf(user.getDialectUID()));
+				request.getSession().setAttribute("userAccount", user);
+				User u = userDao.findOne(Long.valueOf(user.getUserUU()));
 				if (null == u) {
 					u = new User(user);
 					u = userDao.save(u);
@@ -48,7 +48,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
                 SystemSession.setUser(u);
 			}
 		} else {
-			User u = userDao.findOne(Long.valueOf(user.getDialectUID()));
+			User u = userDao.findOne(Long.valueOf(user.getUserUU()));
 			if (null == u) {
 				u = new User(user);
 				u = userDao.save(u);
@@ -72,10 +72,10 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	 * @param token token信息
 	 * @return 登录用户信息
 	 */
-	private UserView getUserByToken(SSOToken token) {
-        UserView user = null;
+	private UserAccount getUserByToken(SSOToken token) {
+		UserAccount user = null;
 		if (token != null && !StringUtils.isEmpty(token.getData())) {
-			user = FastjsonUtils.fromJson(token.getData(), UserView.class);
+			user = FastjsonUtils.fromJson(token.getData(), UserAccount.class);
 		}
 		return user;
 	}

donate-console/src/main/resources/dev/account.properties

@@ -3,6 +3,7 @@ sso.app=donate
 #token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 # dev
 sso.login.url=http://113.105.74.135:8001/sso/login

donate-console/src/main/resources/prod/account.properties

@@ -3,20 +3,21 @@ sso.app=donate
 #token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 #prod
 sso.cookie.domain=ubtob.com
-sso.login.url=https://account.ubtob.com/sso/login
+sso.login.url=https://sso.ubtob.com
 
 ### account center config,
-account.us.save.url=http://10.10.100.133:8080/api/userspace
-account.user.save.url=http://10.10.100.133:8080/api/user
-account.user.getPartners.url = http://10.10.100.133:8080/api/partners
-account.user.getContactPage.url=https://account.ubtob.com/business/groups
+account.us.save.url=http://10.10.100.133:9990/api/userspace
+account.user.save.url=http://10.10.100.133:9990/api/user
+account.user.getPartners.url = http://10.10.100.133:9990/api/partners
+account.user.getContactPage.url=https://sso.ubtob.com/business/groups
 
 #cross domain
-sso.ask.url=https://account.ubtob.com/sso/login/ask
-sso.askout.url=https://account.ubtob.com/sso/logout/ask
+sso.ask.url=https://sso.ubtob.com/sso/login/ask
+sso.askout.url=https://sso.ubtob.com/sso/logout/ask
 sso.proxy.uri=/login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

donate-console/src/main/resources/test/account.properties

@@ -3,6 +3,7 @@ sso.app=donate
 #token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 #test
 sso.login.url=http://113.105.74.135:8001/sso/login

donate-service/src/main/java/com/uas/service/donate/model/User.java

@@ -1,6 +1,7 @@
 package com.uas.service.donate.model;
 
 
+import com.uas.sso.entity.UserAccount;
 import com.uas.account.entity.UserView;
 
 import javax.persistence.*;
@@ -97,6 +98,14 @@ public class User implements Serializable{
         this.setEmail(accountUser.getSecondUID());
     }
 
+    public User(UserAccount userAccount) {
+        this.setType("个人用户");
+        this.setUserUU(Long.valueOf(userAccount.getUserUU()));
+        this.setName(userAccount.getVipName());
+        this.setTel(userAccount.getMobile());
+        this.setEmail(userAccount.getEmail());
+    }
+
     public Long getUserUU() {
         return userUU;
     }

donate-service/src/main/java/com/uas/service/donate/web/filter/AccessInterceptor.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.web.filter;
 
-import com.uas.account.entity.UserView;
 import com.uas.service.donate.core.support.SystemSession;
 import com.uas.service.donate.dao.UserDao;
 import com.uas.service.donate.model.User;
@@ -8,6 +7,7 @@ import com.uas.service.donate.util.FastjsonUtils;
 import com.uas.service.donate.util.StringUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -70,7 +70,7 @@ public class AccessInterceptor extends AbstractSSOInterceptor{
     private User getUserByToken(SSOToken token) {
         User user = null;
         if (token != null && !StringUtils.isEmpty(token.getData())) {
-            UserView userView = FastjsonUtils.fromJson(token.getData(), UserView.class);
+            UserAccount userView = FastjsonUtils.fromJson(token.getData(), UserAccount.class);
             user = new User(userView);
         }
         return user;

donate-service/src/main/java/com/uas/service/donate/web/filter/SSOInterceptor.java

@@ -1,6 +1,5 @@
 package com.uas.service.donate.web.filter;
 
-import com.uas.account.entity.UserView;
 import com.uas.service.donate.core.support.SystemSession;
 import com.uas.service.donate.dao.UserDao;
 import com.uas.service.donate.model.User;
@@ -8,6 +7,7 @@ import com.uas.service.donate.util.FastjsonUtils;
 import com.uas.service.donate.util.StringUtils;
 import com.uas.sso.SSOHelper;
 import com.uas.sso.SSOToken;
+import com.uas.sso.entity.UserAccount;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -61,7 +61,7 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 	private User getUserByToken(SSOToken token) {
         User user = null;
 		if (token != null && !StringUtils.isEmpty(token.getData())) {
-			UserView userView = FastjsonUtils.fromJson(token.getData(), UserView.class);
+			UserAccount userView = FastjsonUtils.fromJson(token.getData(), UserAccount.class);
 			user = new User(userView);
 		}
 		return user;

donate-service/src/main/resources/dev/account.properties

@@ -3,6 +3,7 @@ sso.app=donate
 token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 # dev
 sso.login.url=http://113.105.74.135:8001/sso/login

donate-service/src/main/resources/prod/account.properties

@@ -3,22 +3,23 @@ sso.app=donate
 token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 #prod
 sso.cookie.domain=ubtob.com
-sso.login.url=https://account.ubtob.com/sso/login
-sso.register.url=https://account.ubtob.com/sso/register_p
+sso.login.url=https://sso.ubtob.com
+sso.register.url=https://sso.ubtob.com/register/enterpriseRegistration
 #sso.register.url=http://wangmh.ubtob.com:8080/sso/register_p
 
 ### account center config,
-account.us.save.url=http://10.10.100.133:8080/api/userspace
-account.user.save.url=http://10.10.100.133:8080/api/user
-account.user.getPartners.url = http://10.10.100.133:8080/api/partners
-account.user.getContactPage.url=https://account.ubtob.com/business/groups
+account.us.save.url=http://10.10.100.133:9990/api/userspace
+account.user.save.url=http://10.10.100.133:9990/api/user
+account.user.getPartners.url = http://10.10.100.133:9990/api/partners
+account.user.getContactPage.url=http://10.10.100.133:9990/business/groups
 
 #cross domain
-sso.ask.url=https://account.ubtob.com/sso/login/ask
-sso.askout.url=https://account.ubtob.com/sso/logout/ask
+sso.ask.url=https://sso.ubtob.com/sso/login/ask
+sso.askout.url=https://sso.ubtob.com/sso/logout/ask
 sso.proxy.uri=/login/proxy
 sso.authcookie.secretkey=Z318866alN6gA0piuO
 sso.client.private_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAIquTH9rOygR1iyMzU1CSQDXG+lJpMQgWkRWMwO3lzS+UJ3GRq1yxxD8mPFZCuItMRxP4Mvu3nvxDvsJx8lfRXk4MGswROIBPcdBAnasphN7wS5mDvDe/VBIKv+fg4j4VEnak9VUAQhS1gDtp+ZmQpCc9/gz8vueF1ueIXspAoUhAgMBAAECgYBfMP8PY1KK0Zt6nvd5NauYqQ7elg9EFJUBXU3NGmLu8Eez1NrEygk8braoy57921lffrDmKsOKvc+zn2YEoqGzbHCOuYsTDBXFCGLkj8oPeHyrs02+XuJe9j2ejhq2N04oP/TMxerFeyWnHdRCNXECrthqhwTRmGitnj2/+FLVAQJBAM93HY/5HoFlfRv9zjFy72ft/ZC60jHERXwyumbFs8z/x8sHCY1GWfgGhm1ShE1bDWAPY3W9WCFsx6nOETsHajECQQCrH8Dl7IIIHJ5D0TDisFkePnYELxpmOGlPwPOQ7hyLAdW4aB1fVIpjsWmgGOyPvmhK+b99XeLUbwpxVU7AAB3xAkAJNxJCFd+sAbUH7EMfYSqPJDwSFKpHeZ9Yf+xVqkxtO6NFOl/LPae7Y5bO/k5QHU4/yQ8y6KEkgu9vdG7Bf3fRAkEAiDlX6vDytphpmN0PyHXQC9Z3Rm9k2ZjwpM+aVXZn/HSyeQFQ2JHJNQGHby5IK0nNZloYiSlTJ/9ZVc0uSoQNUQJBAJFix2tD7b0Zq82xpeGt81rhXsofuerq1x9WM5UyYILCKJMHZw5lt58snINVzA7JxV+l60dbIgJjmRYm0yxQIAY=

donate-service/src/main/resources/templates/activeCenter.ftl

@@ -573,7 +573,7 @@
 
     var returnUrl=window.location.href;
     $.ajax({
-        url:"http://lj.ubtob.com/sso/account",
+        url: "sso/account",
         type:"GET",
         success:function(data){
             console.log(data);

donate-service/src/main/resources/templates/index.ftl

@@ -903,7 +903,7 @@
 <script>
     var returnUrl=window.location.href;
     $.ajax({
-        url:"http://lj.ubtob.com/sso/account",
+        url:"sso/account",
         type:"GET",
         success:function(data){
             console.log(data);

donate-service/src/main/resources/test/account.properties

@@ -3,6 +3,7 @@ sso.app=donate
 token secretkey
 sso.secretkey=0taQcW073Z7G628g5H
 sso.cookie.secure=false
+sso.cookie.browser=false
 
 #test
 sso.login.url=http://113.105.74.135:8001/sso/login