浏览代码

模块修改

wangliang 2 年之前
父节点
当前提交
09c224e560

+ 3 - 0
README.md

@@ -3,6 +3,9 @@
 1.teachcloud-exchange-common 
 公共模块
 
+2.teachcloud-exchange-common-api
+公共api模块
+
 项目框架:
 java11,spring boot2.6.12
 

+ 0 - 6
pom.xml

@@ -10,7 +10,6 @@
     <modules>
         <module>teachcloud-exchange-common</module>
         <module>teachcloud-exchange-common-api</module>
-        <module>teachcloud-exchange-business</module>
         <module>xjtu-exchange</module>
     </modules>
 
@@ -53,11 +52,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>com.qmth.teachcloud.exchange.business</groupId>
-                <artifactId>teachcloud-exchange-business</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.qmth.teachcloud.exchange.common</groupId>
                 <artifactId>teachcloud-exchange-common</artifactId>

+ 0 - 33
teachcloud-exchange-business/.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/

+ 0 - 49
teachcloud-exchange-business/pom.xml

@@ -1,49 +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.business</groupId>
-    <artifactId>teachcloud-exchange-business</artifactId>
-    <version>1.0.0</version>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <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>org.apache.velocity</groupId>
-            <artifactId>velocity-engine-core</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.qmth.teachcloud.exchange.common</groupId>
-            <artifactId>teachcloud-exchange-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>5.2.12.RELEASE</version>
-        </dependency>
-    </dependencies>
-
-</project>

+ 0 - 13
teachcloud-exchange-business/src/test/java/com/qmth/teachcloud/exchange/business/TeachcloudExchangeBusinessApplicationTests.java

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

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

@@ -51,7 +51,7 @@ 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/admin/open/common/authentication/teachcloud";
+    public static final String JUMP_API_URL = "/api/open/common/authentication/teachcloud";
 
     /**
      * 缓存配置

+ 0 - 10
xjtu-exchange/pom.xml

@@ -14,16 +14,6 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>com.qmth.teachcloud.exchange.business</groupId>
-            <artifactId>teachcloud-exchange-business</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-beans</artifactId>
-                    <groupId>org.springframework</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.qmth.teachcloud.exchange.common.api</groupId>
             <artifactId>teachcloud-exchange-common-api</artifactId>

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

@@ -8,10 +8,7 @@ import com.qmth.teachcloud.exchange.common.contant.SystemConstant;
 import com.qmth.teachcloud.exchange.common.util.JacksonUtil;
 import com.qmth.teachcloud.exchange.common.util.Result;
 import com.qmth.teachcloud.exchange.common.util.ServletUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -41,6 +38,7 @@ import java.util.StringJoiner;
 public class OpenApiController {
     private static final Logger log = LoggerFactory.getLogger(OpenApiController.class);
 
+    @ApiOperation(value = "西安交通大学cas鉴权接口")
     @ApiResponses({@ApiResponse(code = 200, message = "返回消息", response = Result.class)})
     @RequestMapping(value = "/authentication", method = RequestMethod.GET)
     @Aac(auth = BOOL.FALSE)

+ 1 - 1
xjtu-exchange/src/main/resources/application-dev.properties

@@ -60,7 +60,7 @@ com.qmth.auth.time-max-delay=5m
 com.qmth.cache.expire-after-write=8h
 
 #api\u524D\u7F00
-prefix.url.open=admin/open
+prefix.url.open=open
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss