소스 검색

更新获取AccessToken地址为B2B后台管理地址

hejq 7 년 전
부모
커밋
45c9c785d8

+ 18 - 6
src/main/java/com/uas/platform/b2b/filter/SSOInterceptor.java

@@ -2,7 +2,11 @@ package com.uas.platform.b2b.filter;
 
 import com.uas.platform.b2b.dao.ResourceItemDao;
 import com.uas.platform.b2b.manage.service.AccessTokenService;
-import com.uas.platform.b2b.model.*;
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.ResourceItem;
+import com.uas.platform.b2b.model.Role;
+import com.uas.platform.b2b.model.SigninLog;
+import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.RoleService;
 import com.uas.platform.b2b.service.SigninLogService;
@@ -40,9 +44,15 @@ import org.springframework.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.*;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 访问拦截
@@ -191,8 +201,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
      */
     private String getLoginPage(HttpServletRequest request, HttpServletResponse response) throws IOException {
         // 引用页面
-        String refererSymbol = "Referer";
-        request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(refererSymbol));
+        String referSymbol = "Referer";
+        request.getSession().setAttribute(SSOConfig.SSOReferer, request.getHeader(referSymbol));
         SSOHelper.clearLogin(request, response);
         String redirectUrl = (SSOHelper.getRedirectLoginUrl(request, conf.getB2b()));
         return redirectUrl;
@@ -392,6 +402,8 @@ public class SSOInterceptor extends AbstractSSOInterceptor {
 		String token = request.getParameter(tokenParam);
 		// 发现有采用access_token方式
 		if (token != null) {
+		    // 清除上一次访问的数据
+            SystemSession.clear();
 			Object sUser = request.getSession().getAttribute("user");
 			User user = null;
 			if (sUser != null) {

+ 5 - 0
src/main/java/com/uas/platform/b2b/manage/service/AccessTokenService.java

@@ -2,6 +2,11 @@ package com.uas.platform.b2b.manage.service;
 
 import java.util.Map;
 
+/**
+ * AccessTokenService
+ *
+ * @author US50
+ */
 public interface AccessTokenService {
 
 	/**

+ 13 - 9
src/main/java/com/uas/platform/b2b/manage/service/impl/AccessTokenServiceImpl.java

@@ -1,19 +1,23 @@
 package com.uas.platform.b2b.manage.service.impl;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Service;
-
 import com.uas.platform.b2b.manage.service.AccessTokenService;
 import com.uas.platform.b2b.support.SysConf;
 import com.uas.platform.core.exception.SystemException;
 import com.uas.platform.core.util.HttpUtil;
 import com.uas.platform.core.util.HttpUtil.Response;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 
+/**
+ * AccessTokenServiceImpl
+ *
+ * @author US50
+ */
 @Service("manage.AccessTokenServiceImpl")
 public class AccessTokenServiceImpl implements AccessTokenService {
 
@@ -22,9 +26,9 @@ public class AccessTokenServiceImpl implements AccessTokenService {
 
 	@Override
 	public Map<String, Object> validFormManage(String accessToken) {
-		Map<String, String> params = new HashMap<String, String>();
+		Map<String, String> params = new HashMap<>(1);
 		params.put("access_token", accessToken);
-		Response response = null;
+		Response response;
 		try {
 			response = HttpUtil.sendGetRequest(sysConf.getManageInner() + "/public/token", params);
 		} catch (Exception e) {

+ 1 - 1
src/main/resources/test/sys.properties

@@ -1,7 +1,7 @@
 #path
 b2b=http://218.17.158.219:9000/b2b-test
 manage=http://218.17.158.219:9090/platform-manage
-manageInner=http://192.168.253.60:9090/platform-manage
+manageInner=http://10.1.51.24:8888
 im=http://113.105.74.131:8092
 b2c=http://192.168.253.12:23400
 registerUrl=http://192.168.253.12:32323/register/enterpriseRegistration

+ 1 - 1
src/main/resources/txcloud/sys.properties

@@ -1,7 +1,7 @@
 #path
 b2b=https://b2b.usoftchina.com
 manage=http://manage.ubtob.com
-manageInner=http://10.10.100.81:8080
+manageInner=http://192.168.253.12:23396
 im=http://113.105.74.140:8092
 b2c=https://www.usoftmall.com
 registerUrl=https://sso.ubtob.com/register/enterpriseRegistration