西安交通大学逻辑修改

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/contant/SystemConstant.java

@@ -23,24 +23,17 @@ public class SystemConstant {
     /**
      * 系统常量
      */
-    public static final String SYS_CONFIG_KEY_CHARSETS = "sys.txt.charset";
     public static final String CHARSET_NAME = "UTF-8";
     //    public static final String CHARSET_GB2312 = "gb2312";
-    public static final String CHARSET_GBK = "gbk";
     public static final Charset CHARSET = Charset.forName(CHARSET_NAME);
     public static final String SUCCESS = "success";
     public static final String UPDATE_TIME = "updateTime";
     public static final String SESSION = "session:";
     public static final String USER = "account";
-    public static final String USER_COMMON = "accountCommon";
     public static final String SCHOOL_ID = "schoolId";
     public static final String SCHOOL = "school";
-    public static final String SCHOOL_CODE = "schoolCode";
-    public static final String SCHOOL_CODE_COMMON = "schoolCodeCommon";
     public static final String RETURN_URL = "returnUrl";
-    public static final String RETURN_URL_COMMON = "returnUrlCommon";
     public static final String PARAMS = "params";
-    public static final String PARAMS_COMMON = "paramsCommon";
     public static final String ORG = "org";
     public static final String MD5 = "MD5";
     public static final String ID = "id";
@@ -51,7 +44,6 @@ public class SystemConstant {
     public static final String GET_EQUAL = "=";
     public static final String PATH_MATCH = "*";
     public static final String PATH_SUBSTR = "/#";
-    public static final String JUMP_API_URL = "/api/open/common/authentication/teachcloud";
 
     /**
      * 缓存配置

xjtu-exchange/src/main/java/com/qmth/xjtu/api/OpenApiController.java

@@ -6,6 +6,7 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.exchange.common.bean.params.OpenParams;
+import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import com.qmth.teachcloud.exchange.common.service.CommonService;
 import com.qmth.teachcloud.exchange.common.util.HttpUtil;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
@@ -24,6 +25,7 @@ import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Objects;
+import java.util.StringJoiner;
 
 /**
  * <p>
@@ -55,7 +57,7 @@ public class OpenApiController {
                                @ApiParam(value = "用户类型") @RequestParam(required = false) String userType,
                                @ApiParam(value = "员工工号") @RequestParam(required = false) String employeeNo,
                                @ApiParam(value = "返回url") @RequestParam(required = false) String returnUrl) throws IOException {
-        String schoolCode = "test-school-2";
+        String schoolCode = "test-school-2";//测试学校code，正式改成xjtu
 
         Map<String, Object> accessTokenParams = new LinkedHashMap<>();
         accessTokenParams.put("code", code);
@@ -109,12 +111,16 @@ public class OpenApiController {
 
         //登出
         if (Objects.nonNull(gsessionId)) {
-            Map<String, Object> logoutParams = new LinkedHashMap<>();
-            logoutParams.put("gSessionId", gsessionId);
-            String logoutResult = HttpUtil.post(LOGOUT_URL, logoutParams, null);
-            if (Objects.nonNull(logoutResult)) {
-                log.info("logoutResult:{}", JacksonUtil.parseJson(logoutResult));
-            }
+//            Map<String, Object> logoutParams = new LinkedHashMap<>();
+//            logoutParams.put("gSessionId", gsessionId);
+//            String logoutResult = HttpUtil.post(LOGOUT_URL, logoutParams, null);
+//            if (Objects.nonNull(logoutResult)) {
+//                log.info("logoutResult:{}", JacksonUtil.parseJson(logoutResult));
+//            }
+            StringJoiner stringJoiner = new StringJoiner("");
+            stringJoiner.add(LOGOUT_URL).add(SystemConstant.GET_UNKNOWN).add("gSessionId")
+                    .add(SystemConstant.GET_EQUAL).add(gsessionId);
+            returnUrl = stringJoiner.toString();
         }
 
         commonService.redirectLogic(code, schoolCode, returnUrl, Objects.nonNull(openParams) ? JacksonUtil.parseJson(openParams) : null);