Merge remote-tracking branch 'origin/master' into hoxfix-hejq-201807

src/main/java/com/uas/platform/b2b/controller/AuthenticationController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.uas.sso.SSOConfig;
 import com.uas.sso.entity.UserAccount;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.ConfigAttribute;
@@ -49,7 +50,7 @@ public class AuthenticationController {
 	 */
 	@RequestMapping(value = "/{enUU}")
 	@ResponseBody
-	public void switchEnterprise(HttpServletRequest request, HttpServletResponse response, @PathVariable("enUU") long enUU) {
+	public ModelMap switchEnterprise(HttpServletRequest request, HttpServletResponse response, @PathVariable("enUU") long enUU) {
 		User user = SystemSession.getUser();
 		user.setCurrentEnterprise(enUU);
 		// 通知到账户中心
@@ -60,7 +61,9 @@ public class AuthenticationController {
 			SSOToken newToken = new SSOToken(request, tokenUser.getMobile());
 			newToken.setData(FlexJsonUtils.toJson(tokenUser));
 			SSOHelper.setSSOCookie(request, response, newToken, true);
+			return new ModelMap("data", tokenUser).addAttribute("url", SSOConfig.getSSOProperties().get("mall.login.url"));
 		}
+		return null;
 	}
 
 }

src/main/resources/prod/account.properties

@@ -18,6 +18,7 @@ sso.ask.url=https://sso.ubtob.com/sso/login/ask
 sso.askout.url=https://sso.ubtob.com/sso/logout/ask
 sso.updatePassword.url=https://sso.ubtob.com/reset/forgetPasswordValidationAccount
 sso.cloudcenter.url=https://sso.ubtob.com/cloudcenter
+mall.login.url=https://www.usoftmall.com/newLogin/other
 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=

src/main/resources/test/account.properties

@@ -18,6 +18,7 @@ sso.ask.url=http://192.168.253.6:32323/sso/login/ask
 sso.askout.url=http://192.168.253.6:32323/sso/logout/ask
 sso.updatePassword.url=http://192.168.253.6:32323/reset/forgetPasswordValidationAccount
 sso.cloudcenter.url=http://192.168.253.6:32323/cloudcenter
+mall.login.url=http://192.168.253.12:23400/newLogin/other
 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=

src/main/webapp/resources/js/index/app.js

@@ -1557,7 +1557,24 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         $scope.switchto = function (enUU) {// 切换企业
-            AuthenticationService.reSignin(enUU).success(function () {
+            AuthenticationService.reSignin(enUU).success(function (response) {
+                console.log(response);
+                if (!response) $window.location.reload();
+                $.ajax({
+                    url:response.url,
+                    data:response.data,
+                    type:"get",
+                    cache:false,
+                    dataType:"jsonp",
+                    jsonp:"callback",
+                    jsonpCallback:"successCallback",
+                    success:function(data){
+                        console.log(data);
+                    },
+                    error:function(data){
+                        console.log(data);
+                    }
+                });
                 $window.location.reload();
             });
         };