模块修改,去除common-api

pom.xml

@@ -9,7 +9,6 @@
 
     <modules>
         <module>teachcloud-exchange-common</module>
-        <module>teachcloud-exchange-common-api</module>
         <module>xjtu-exchange</module>
     </modules>
 
@@ -62,11 +61,6 @@
                 <artifactId>xjtu-exchange</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.qmth.teachcloud.exchange.common.api</groupId>
-                <artifactId>teachcloud-exchange-common-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.qmth.boot</groupId>
                 <artifactId>starter-api</artifactId>

teachcloud-exchange-common-api/.gitignore

@@ -1,33 +0,0 @@
-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

teachcloud-exchange-common-api/pom.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.qmth.teachcloud.exchange.common.api</groupId>
-    <artifactId>teachcloud-exchange-common-api</artifactId>
-    <version>1.0.0</version>
-    <packaging>jar</packaging>
-
-    <parent>
-        <groupId>com.qmth.teachcloud.exchange.service</groupId>
-        <artifactId>teachcloud-exchange-service</artifactId>
-        <version>1.0.0</version>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.qmth.teachcloud.exchange.common</groupId>
-            <artifactId>teachcloud-exchange-common</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

teachcloud-exchange-common-api/src/main/java/com/qmth/teachcloud/exchange/common/api/CommonOpenApiController.java

@@ -1,48 +0,0 @@
-//package com.qmth.teachcloud.exchange.common.api;
-//
-//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.service.CommonService;
-//import com.qmth.teachcloud.exchange.common.util.Result;
-//import io.swagger.annotations.*;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.validation.annotation.Validated;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RequestMethod;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.Resource;
-//import java.io.IOException;
-//
-///**
-// * <p>
-// * 知学知考开放接口前端控制器
-// * </p>
-// *
-// * @author wangliang
-// * @since 2022-04-26
-// */
-//@Api(tags = "公用开放跳转接口Controller")
-//@RestController
-//@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.open}/common")
-//@Validated
-//public class CommonOpenApiController {
-//    private static final Logger log = LoggerFactory.getLogger(CommonOpenApiController.class);
-//
-//    @Resource
-//    CommonService commonService;
-//
-//    @ApiOperation(value = "公用跳转接口")
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
-//    @RequestMapping(value = "/authentication/teachcloud", method = RequestMethod.POST)
-//    @Aac(auth = BOOL.FALSE)
-//    public void authenticationTeachcloud(@ApiParam(value = "工号", required = true) @RequestParam String account,
-//                                         @ApiParam(value = "学校code", required = true) @RequestParam String schoolCode,
-//                                         @ApiParam(value = "返回url") @RequestParam(required = false) String returnUrl,
-//                                         @ApiParam(value = "其它参数") @RequestParam(required = false) String params) throws IOException {
-//        commonService.redirectLogic(account, schoolCode, returnUrl, params);
-//    }
-//}

teachcloud-exchange-common-api/src/test/java/com/qmth/teachcloud/exchange/common/api/TeachcloudExchangeCommonApiApplicationTests.java

@@ -1,13 +0,0 @@
-package com.qmth.teachcloud.exchange.common.api;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class TeachcloudExchangeCommonApiApplicationTests {
-
-    @Test
-    void contextLoads() {
-    }
-
-}

teachcloud-exchange-common/src/main/java/com/qmth/teachcloud/exchange/common/service/impl/CommonServiceImpl.java

@@ -20,7 +20,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.StringJoiner;
@@ -53,7 +52,7 @@ public class CommonServiceImpl implements CommonService {
      */
     @Override
     public void redirectLogic(String account, String schoolCode, String returnUrl, String params) throws IOException {
-        log.info("公用跳转接口进来了,account:{},schoolCode:{}", account, schoolCode);
+        log.info("公用跳转接口进来了,account:{},schoolCode:{},returnUrl:{},params:{}", account, schoolCode, returnUrl, params);
         if (Objects.isNull(teachcloudLoginUrl) || Objects.equals(teachcloudLoginUrl, "")) {
             throw ExceptionResultEnum.PARAMS_ERROR.exception("知学登录跳转地址不存在");
         }

xjtu-exchange/pom.xml

@@ -15,8 +15,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.qmth.teachcloud.exchange.common.api</groupId>
-            <artifactId>teachcloud-exchange-common-api</artifactId>
+            <groupId>com.qmth.teachcloud.exchange.common</groupId>
+            <artifactId>teachcloud-exchange-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -52,24 +52,9 @@ public class OpenApiController {
         String schoolCode = "test-school-2";
 
         //todo 学校业务逻辑待完善
-
-//        StringJoiner stringJoiner = new StringJoiner("")
-//                .add(SystemConstant.JUMP_API_URL)
-////                .add(SystemConstant.GET_UNKNOWN).add(SystemConstant.USER_COMMON).add(SystemConstant.GET_EQUAL).add(URLEncoder.encode(account, SystemConstant.CHARSET))
-//                .add(SystemConstant.GET_UNKNOWN).add(SystemConstant.USER_COMMON).add(SystemConstant.GET_EQUAL).add(account)
-//                .add(SystemConstant.GET_SYMBOL).add(SystemConstant.SCHOOL_CODE_COMMON).add(SystemConstant.GET_EQUAL).add(schoolCode);
-//
-//        if (Objects.nonNull(returnUrl) && !Objects.equals(returnUrl, "")) {
-//            stringJoiner = stringJoiner.add(SystemConstant.GET_SYMBOL).add(SystemConstant.RETURN_URL_COMMON).add(SystemConstant.GET_EQUAL).add(returnUrl);
-//        }
         OpenParams openParams = new OpenParams();
         openParams.setName("test1");
-////
-//        if (Objects.nonNull(openParams)) {
-//            stringJoiner = stringJoiner.add(SystemConstant.GET_SYMBOL).add(SystemConstant.PARAMS_COMMON).add(SystemConstant.GET_EQUAL).add(JacksonUtil.parseJson(openParams));
-//        }
-//        log.info("redirectUrl:{},account:{},schoolCode:{}", stringJoiner.toString(), account, schoolCode);
-//        return stringJoiner.toString();
+
         commonService.redirectLogic(account, schoolCode, returnUrl, Objects.nonNull(openParams) ? JacksonUtil.parseJson(openParams) : null);
     }
 }