From 72917faca5d79c91ea90ddecf8f467b3853192db Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期五, 01 三月 2024 14:39:05 +0800
Subject: [PATCH] 修复mj安装报错

---
 /dev/null                              |   54 ---------------------------
 ruoyi-modules/ruoyi-midjourney/pom.xml |   13 ++++--
 2 files changed, 8 insertions(+), 59 deletions(-)

diff --git a/ruoyi-admin/src/test/java/com/xmzs/test/AssertUnitTest.java b/ruoyi-admin/src/test/java/com/xmzs/test/AssertUnitTest.java
deleted file mode 100644
index 6d1f14a..0000000
--- a/ruoyi-admin/src/test/java/com/xmzs/test/AssertUnitTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.xmzs.test;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-/**
- * 鏂█鍗曞厓娴嬭瘯妗堜緥
- *
- * @author Lion Li
- */
-@DisplayName("鏂█鍗曞厓娴嬭瘯妗堜緥")
-public class AssertUnitTest {
-
-    @DisplayName("娴嬭瘯 assertEquals 鏂规硶")
-    @Test
-    public void testAssertEquals() {
-        Assertions.assertEquals("666", new String("666"));
-        Assertions.assertNotEquals("666", new String("666"));
-    }
-
-    @DisplayName("娴嬭瘯 assertSame 鏂规硶")
-    @Test
-    public void testAssertSame() {
-        Object obj = new Object();
-        Object obj1 = obj;
-        Assertions.assertSame(obj, obj1);
-        Assertions.assertNotSame(obj, obj1);
-    }
-
-    @DisplayName("娴嬭瘯 assertTrue 鏂规硶")
-    @Test
-    public void testAssertTrue() {
-        Assertions.assertTrue(true);
-        Assertions.assertFalse(true);
-    }
-
-    @DisplayName("娴嬭瘯 assertNull 鏂规硶")
-    @Test
-    public void testAssertNull() {
-        Assertions.assertNull(null);
-        Assertions.assertNotNull(null);
-    }
-
-}
diff --git a/ruoyi-admin/src/test/java/com/xmzs/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/xmzs/test/DemoUnitTest.java
deleted file mode 100644
index 6981eb8..0000000
--- a/ruoyi-admin/src/test/java/com/xmzs/test/DemoUnitTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.xmzs.test;
-
-import com.xmzs.common.core.config.RuoYiConfig;
-import org.junit.jupiter.api.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 鍗曞厓娴嬭瘯妗堜緥
- *
- * @author Lion Li
- */
-@SpringBootTest // 姝ゆ敞瑙e彧鑳藉湪 springboot 涓诲寘涓嬩娇鐢� 闇�鍖呭惈 main 鏂规硶涓� yml 閰嶇疆鏂囦欢
-@DisplayName("鍗曞厓娴嬭瘯妗堜緥")
-public class DemoUnitTest {
-
-    @Autowired
-    private RuoYiConfig ruoYiConfig;
-
-    @DisplayName("娴嬭瘯 @SpringBootTest @Test @DisplayName 娉ㄨВ")
-    @Test
-    public void testTest() {
-        System.out.println(ruoYiConfig);
-    }
-
-    @Disabled
-    @DisplayName("娴嬭瘯 @Disabled 娉ㄨВ")
-    @Test
-    public void testDisabled() {
-        System.out.println(ruoYiConfig);
-    }
-
-    @Timeout(value = 2L, unit = TimeUnit.SECONDS)
-    @DisplayName("娴嬭瘯 @Timeout 娉ㄨВ")
-    @Test
-    public void testTimeout() throws InterruptedException {
-        Thread.sleep(3000);
-        System.out.println(ruoYiConfig);
-    }
-
-
-    @DisplayName("娴嬭瘯 @RepeatedTest 娉ㄨВ")
-    @RepeatedTest(3)
-    public void testRepeatedTest() {
-        System.out.println(666);
-    }
-
-    @BeforeAll
-    public static void testBeforeAll() {
-        System.out.println("@BeforeAll ==================");
-    }
-
-    @BeforeEach
-    public void testBeforeEach() {
-        System.out.println("@BeforeEach ==================");
-    }
-
-    @AfterEach
-    public void testAfterEach() {
-        System.out.println("@AfterEach ==================");
-    }
-
-    @AfterAll
-    public static void testAfterAll() {
-        System.out.println("@AfterAll ==================");
-    }
-
-}
diff --git a/ruoyi-admin/src/test/java/com/xmzs/test/ParamUnitTest.java b/ruoyi-admin/src/test/java/com/xmzs/test/ParamUnitTest.java
deleted file mode 100644
index 82b9f55..0000000
--- a/ruoyi-admin/src/test/java/com/xmzs/test/ParamUnitTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.xmzs.test;
-
-import com.xmzs.common.core.enums.UserType;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.NullSource;
-import org.junit.jupiter.params.provider.ValueSource;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- * 甯﹀弬鏁板崟鍏冩祴璇曟渚�
- *
- * @author Lion Li
- */
-@DisplayName("甯﹀弬鏁板崟鍏冩祴璇曟渚�")
-public class ParamUnitTest {
-
-    @DisplayName("娴嬭瘯 @ValueSource 娉ㄨВ")
-    @ParameterizedTest
-    @ValueSource(strings = {"t1", "t2", "t3"})
-    public void testValueSource(String str) {
-        System.out.println(str);
-    }
-
-    @DisplayName("娴嬭瘯 @NullSource 娉ㄨВ")
-    @ParameterizedTest
-    @NullSource
-    public void testNullSource(String str) {
-        System.out.println(str);
-    }
-
-    @DisplayName("娴嬭瘯 @EnumSource 娉ㄨВ")
-    @ParameterizedTest
-    @EnumSource(UserType.class)
-    public void testEnumSource(UserType type) {
-        System.out.println(type.getUserType());
-    }
-
-    @DisplayName("娴嬭瘯 @MethodSource 娉ㄨВ")
-    @ParameterizedTest
-    @MethodSource("getParam")
-    public void testMethodSource(String str) {
-        System.out.println(str);
-    }
-
-    public static Stream<String> getParam() {
-        List<String> list = new ArrayList<>();
-        list.add("t1");
-        list.add("t2");
-        list.add("t3");
-        return list.stream();
-    }
-
-    @BeforeEach
-    public void testBeforeEach() {
-        System.out.println("@BeforeEach ==================");
-    }
-
-    @AfterEach
-    public void testAfterEach() {
-        System.out.println("@AfterEach ==================");
-    }
-
-
-}
diff --git a/ruoyi-admin/src/test/java/com/xmzs/test/TagUnitTest.java b/ruoyi-admin/src/test/java/com/xmzs/test/TagUnitTest.java
deleted file mode 100644
index e451387..0000000
--- a/ruoyi-admin/src/test/java/com/xmzs/test/TagUnitTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.xmzs.test;
-
-import org.junit.jupiter.api.*;
-import org.springframework.boot.test.context.SpringBootTest;
-
-/**
- * 鏍囩鍗曞厓娴嬭瘯妗堜緥
- *
- * @author Lion Li
- */
-@SpringBootTest
-@DisplayName("鏍囩鍗曞厓娴嬭瘯妗堜緥")
-public class TagUnitTest {
-
-    @Tag("dev")
-    @DisplayName("娴嬭瘯 @Tag dev")
-    @Test
-    public void testTagDev() {
-        System.out.println("dev");
-    }
-
-    @Tag("prod")
-    @DisplayName("娴嬭瘯 @Tag prod")
-    @Test
-    public void testTagProd() {
-        System.out.println("prod");
-    }
-
-    @Tag("local")
-    @DisplayName("娴嬭瘯 @Tag local")
-    @Test
-    public void testTagLocal() {
-        System.out.println("local");
-    }
-
-    @Tag("exclude")
-    @DisplayName("娴嬭瘯 @Tag exclude")
-    @Test
-    public void testTagExclude() {
-        System.out.println("exclude");
-    }
-
-    @BeforeEach
-    public void testBeforeEach() {
-        System.out.println("@BeforeEach ==================");
-    }
-
-    @AfterEach
-    public void testAfterEach() {
-        System.out.println("@AfterEach ==================");
-    }
-
-
-}
diff --git a/ruoyi-modules/ruoyi-midjourney/pom.xml b/ruoyi-modules/ruoyi-midjourney/pom.xml
index 213ef88..21c44b8 100644
--- a/ruoyi-modules/ruoyi-midjourney/pom.xml
+++ b/ruoyi-modules/ruoyi-midjourney/pom.xml
@@ -1,15 +1,18 @@
 <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 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.xmzs</groupId>
-        <artifactId>ruoyi-ai</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../../pom.xml</relativePath>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>ruoyi-midjourney</artifactId>
-    <name>ruoyi-midjourney</name>
+
+    <description>
+       AI缁樼敾
+    </description>
 
     <properties>
         <hutool.version>5.8.18</hutool.version>

--
Gitblit v1.9.3