Browse Source

添加推出逻辑

yuhaitao14 7 years ago
parent
commit
e13e51cc54

+ 14 - 2
shop/src/main/java/com/zskk/shop/controller/AbstractController.java

@@ -66,13 +66,13 @@ public class AbstractController {
 			value = getCookieValue(USER_COOKIE_NAME);
 			value = getCookieValue(USER_COOKIE_NAME);
 		} catch (Exception e) {
 		} catch (Exception e) {
 			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
 			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
-					uccenter + "/login/authorize?needtoken=false&redirect=" + this.getRefererUrl());
+					uccenter + "login/authorize?needtoken=false&mustLogin=1&redirect=" + this.getRefererUrl());
 			throw new ZSKKException(error);
 			throw new ZSKKException(error);
 		}
 		}
 
 
 		if (value == null) {
 		if (value == null) {
 			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
 			ZSKKError error = new ZSKKError(ErrorConstant.NO_LOGIN_ERROR.getCode(),
-					uccenter + "/login/authorize?needtoken=false&redirect=" + this.getRefererUrl());
+					uccenter + "login/authorize?needtoken=false&mustLogin=1&redirect=" + this.getRefererUrl());
 			throw new ZSKKException(error);
 			throw new ZSKKException(error);
 		}
 		}
 		UserInfoBean user = JSON.parseObject(value, UserInfoBean.class);
 		UserInfoBean user = JSON.parseObject(value, UserInfoBean.class);
@@ -151,4 +151,16 @@ public class AbstractController {
 			return url;
 			return url;
 		}
 		}
 	}
 	}
+
+	public String getUccenter() {
+		return uccenter;
+	}
+
+	public String getUcweb() {
+		return ucweb;
+	}
+
+	public String getMyhost() {
+		return myhost;
+	}
 }
 }

+ 42 - 0
shop/src/main/java/com/zskk/shop/controller/admin/HelpController.java

@@ -0,0 +1,42 @@
+/**
+* @版权信息 (@copyright Copyright 2017-XXXX JDJR.COM All Right Reserved);
+* @see
+* @author 于海涛 京东金融【技术研发部-证券及营销平台研发部-营销平台研发部】
+* @version 1.0
+* @date 2018年6月21日
+*/
+
+package com.zskk.shop.controller.admin;
+
+import java.net.URLEncoder;
+import java.nio.charset.Charset;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.zskk.shop.controller.AbstractController;
+import com.zskk.shop.controller.bean.ControllerResult;
+import com.zskk.shop.exception.ErrorConstant;
+import com.zskk.shop.exception.ZSKKException;
+
+@Controller
+@RequestMapping("/help")
+public class HelpController extends AbstractController {
+
+	@Value("${zskk.shopmanagehost}")
+	private String shopmanagehost;
+	
+	@RequestMapping("/loginout")
+	@ResponseBody
+	public ControllerResult loginout(){
+		try{
+			String login = this.getUccenter() + "login/authorize?needtoken=false&mustLogin=1&redirect=" + URLEncoder.encode(shopmanagehost, "UTF-8");
+			String redirect = URLEncoder.encode(login, "UTF-8");
+			return new ControllerResult(this.getUccenter() + "login/loginout?redirect=" + redirect);
+		}catch (Exception e) {
+			throw new ZSKKException(ErrorConstant.SERVER_ERROR);
+		}
+	}
+}

+ 1 - 0
shop/src/main/resource/application-dev.properties

@@ -7,6 +7,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 
 
 zskk.myhost=http://shop.pacsonline.cn/
 zskk.myhost=http://shop.pacsonline.cn/
+zskk.shopmanagehost=http://localhost:8080/
 zskk.secret=6244c0f6da164d4db51fdb27cff15c95
 zskk.secret=6244c0f6da164d4db51fdb27cff15c95
 zskk.tjcenter=http://kunlun.pacsonline.cn/
 zskk.tjcenter=http://kunlun.pacsonline.cn/
 zskk.tjkey=Kq2gNG2WnWeJG3ug1SedNo2oGZHujs49
 zskk.tjkey=Kq2gNG2WnWeJG3ug1SedNo2oGZHujs49

+ 1 - 0
shop/src/main/resource/application-test.properties

@@ -7,6 +7,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 
 
 zskk.myhost=http://testshop.pacsonline.cn/
 zskk.myhost=http://testshop.pacsonline.cn/
+zskk.shopmanagehost=http://testshopmanage.pacsonline.cn/
 zskk.secret=6244c0f6da164d4db51fdb27cff15c95
 zskk.secret=6244c0f6da164d4db51fdb27cff15c95
 zskk.tjcenter=http://kunlun.pacsonline.cn/
 zskk.tjcenter=http://kunlun.pacsonline.cn/
 zskk.tjkey=Kq2gNG2WnWeJG3ug1SedNo2oGZHujs49
 zskk.tjkey=Kq2gNG2WnWeJG3ug1SedNo2oGZHujs49

+ 2 - 0
shop/static/manager/src/api/index.js

@@ -89,4 +89,6 @@ export default {
     saveSysConfig: (params, vue) => post(`${serverPath}manage/config/save`, params, vue),
     saveSysConfig: (params, vue) => post(`${serverPath}manage/config/save`, params, vue),
     getAllSysConfig: (params, vue) => post(`${serverPath}manage/config/getAll`, params, vue),
     getAllSysConfig: (params, vue) => post(`${serverPath}manage/config/getAll`, params, vue),
     releaseSysConfig: (params, vue) => post(`${serverPath}manage/config/release`, params, vue),
     releaseSysConfig: (params, vue) => post(`${serverPath}manage/config/release`, params, vue),
+
+    loginout: (params, vue) => post(`${serverPath}help/loginout`, params, vue),
 }
 }

+ 5 - 1
shop/static/manager/src/components/Header.vue

@@ -32,7 +32,11 @@
             },
             },
             handleCommand(command) {
             handleCommand(command) {
                 if(command == 'loginout'){
                 if(command == 'loginout'){
-                    
+                    this.$http.loginout({}, this).then(res => {
+                        if (res.code === 0){
+                            window.location.href = res.obj
+                        }
+                    })
                 }
                 }
             }
             }
         },
         },