24282 1 year ago
parent
commit
c80b3f60a5

+ 0 - 6
base-starter/pom.xml

@@ -25,12 +25,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>me.zhyd.oauth</groupId>
             <artifactId>JustAuth</artifactId>
         </dependency>

+ 3 - 1
base-starter/src/main/java/org/dromara/web/StarterScan.java

@@ -1,7 +1,9 @@
 package org.dromara.web;
 
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Component;
 
-@ComponentScan({"org.dromara.system.**", "com.dromara.common.**"})
+@Component
+@ComponentScan({"org.dromara.system.**", "com.dromara.**"})
 public class StarterScan {
 }

+ 5 - 10
test/pom.xml → my-test/pom.xml

@@ -2,27 +2,22 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>ruoyi-vue-plus</artifactId>
         <groupId>org.dromara</groupId>
         <version>${revision}</version>
     </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.example</groupId>
-    <artifactId>test</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+    <artifactId>my-test</artifactId>
 
     <dependencies>
-        <dependency>
+
+    <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>base-starter</artifactId>
         </dependency>
+
     </dependencies>
 
     <build>

+ 0 - 0
test/src/main/java/org/example/DromaraApplication.java → my-test/src/main/java/org/example/DromaraApplication.java


+ 8 - 0
test/src/main/resources/application-dev.yml → my-test/src/main/resources/application-dev.yml

@@ -1,3 +1,11 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口,默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
+
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关

+ 8 - 0
test/src/main/resources/application-prod.yml → my-test/src/main/resources/application-prod.yml

@@ -1,3 +1,11 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口,默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /api
+
 --- # 临时文件存储位置 避免临时文件被系统清理报错
 spring.servlet.multipart.location: /ruoyi/server/temp
 

+ 0 - 5
test/src/main/resources/application.yml → my-test/src/main/resources/application.yml

@@ -21,11 +21,6 @@ captcha:
 
 # 开发环境配置
 server:
-  # 服务器的HTTP端口,默认为8080
-  port: 8080
-  servlet:
-    # 应用的访问路径
-    context-path: /
   # undertow 配置
   undertow:
     # HTTP post内容的最大大小。当值为-1时,默认值为大小是无限的

+ 1 - 13
pom.xml

@@ -333,7 +333,7 @@
         <module>base-starter</module>
         <module>ruoyi-common</module>
         <module>ruoyi-system</module>
-        <module>test</module>
+        <module>my-test</module>
 
     </modules>
     <packaging>pom</packaging>
@@ -380,18 +380,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <!-- 单元测试使用 -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven-surefire-plugin.version}</version>
-                <configuration>
-                    <!-- 根据打包环境执行对应的@Tag测试方法 -->
-                    <groups>${profiles.active}</groups>
-                    <!-- 排除标签 -->
-                    <excludedGroups>exclude</excludedGroups>
-                </configuration>
-            </plugin>
             <!-- 统一版本号管理 -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

+ 0 - 3
ruoyi-system/src/main/resources/mapper/package-info.md

@@ -1,3 +0,0 @@
-java包使用 `.` 分割 resource 目录使用 `/` 分割
-<br>
-此文件目的 防止文件夹粘连找不到 `xml` 文件