From 91943d91e441a6e20f657e0f5394236776a77187 Mon Sep 17 00:00:00 2001
From: wenli <lwdillon@163.com>
Date: Fri, 10 Jan 2025 09:52:22 +0800
Subject: [PATCH] test

---
 .../fastRequestCurrentProjectConfig.json      | 20 ++++++++++++++++---
 dillon-dependencies/pom.xml                   |  2 +-
 .../dillon-module-system-biz/pom.xml          |  1 +
 .../auth/vo/AuthPermissionInfoRespVO.java     |  3 +++
 dillon-ui/dillon-ui-common/pom.xml            | 19 +++++++++++-------
 .../api/system/NotifyTemplateFeign.java       |  2 --
 dillon-ui/pom.xml                             |  1 +
 pom.xml                                       |  7 +++++--
 8 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/.fastRequest/config/fastRequestCurrentProjectConfig.json b/.fastRequest/config/fastRequestCurrentProjectConfig.json
index a1ecd01..bddcec6 100644
--- a/.fastRequest/config/fastRequestCurrentProjectConfig.json
+++ b/.fastRequest/config/fastRequestCurrentProjectConfig.json
@@ -4,15 +4,29 @@
 		"domain":"https://api.apifox.com",
 		"syncAfterSave":false
 	},
-	"dataList":[],
-	"envList":[],
+	"dataList":[
+		{
+			"hostGroup":[
+				{
+					"env":"dev",
+					"url":"127.0.0.1:48080"
+				}
+			],
+			"name":"dillon-admin-pro"
+		}
+	],
+	"envList":[
+		"dev"
+	],
 	"headerList":[],
 	"ignoreParseFieldList":[],
 	"maxDescriptionLength":-1,
 	"pmCollectionId":"",
 	"postScript":"",
 	"preScript":"",
-	"projectList":[],
+	"projectList":[
+		"dillon-admin-pro"
+	],
 	"syncModel":{
 		"branch":"master",
 		"domain":"https://github.com",
diff --git a/dillon-dependencies/pom.xml b/dillon-dependencies/pom.xml
index 4959ea9..3cab696 100644
--- a/dillon-dependencies/pom.xml
+++ b/dillon-dependencies/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>2.1.0-jdk8-snapshot</revision>
+        <revision>1.0.1</revision>
         <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
         <!-- 统一依赖管理 -->
         <spring.boot.version>2.7.18</spring.boot.version>
diff --git a/dillon-module-system/dillon-module-system-biz/pom.xml b/dillon-module-system/dillon-module-system-biz/pom.xml
index ff1bd94..557a0fc 100644
--- a/dillon-module-system/dillon-module-system-biz/pom.xml
+++ b/dillon-module-system/dillon-module-system-biz/pom.xml
@@ -126,6 +126,7 @@
         <dependency>
             <groupId>com.xingyuv</groupId>
             <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
+
         </dependency>
 
 
diff --git a/dillon-module-system/dillon-module-system-biz/src/main/java/com/lw/dillon/admin/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java b/dillon-module-system/dillon-module-system-biz/src/main/java/com/lw/dillon/admin/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
index 5530d5c..69459ed 100644
--- a/dillon-module-system/dillon-module-system-biz/src/main/java/com/lw/dillon/admin/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
+++ b/dillon-module-system/dillon-module-system-biz/src/main/java/com/lw/dillon/admin/module/system/controller/admin/auth/vo/AuthPermissionInfoRespVO.java
@@ -99,6 +99,9 @@ public class AuthPermissionInfoRespVO {
          */
         private List<MenuVO> children;
 
+        public boolean hasChildren() {
+            return children != null && !children.isEmpty();
+        }
     }
 
 }
diff --git a/dillon-ui/dillon-ui-common/pom.xml b/dillon-ui/dillon-ui-common/pom.xml
index c3c8a8e..0432eb2 100644
--- a/dillon-ui/dillon-ui-common/pom.xml
+++ b/dillon-ui/dillon-ui-common/pom.xml
@@ -81,11 +81,7 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.32</version> <!-- 适当的版本号 -->
         </dependency>
-        <dependency>
-            <groupId>com.lw.dillon</groupId>
-            <artifactId>dillon-module-system-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+
         <dependency>
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
@@ -95,13 +91,22 @@
             <artifactId>Java-WebSocket</artifactId>
             <version>1.5.1</version>
         </dependency>
+
         <dependency>
             <groupId>com.lw.dillon</groupId>
             <artifactId>dillon-module-infra-biz</artifactId>
-            <version>2.1.0-jdk8-snapshot</version>
-            <scope>compile</scope>
+            <version>${revision}</version>
+
+        </dependency>
+        <dependency>
+            <groupId>com.lw.dillon</groupId>
+            <artifactId>dillon-module-system-biz</artifactId>
+            <version>${revision}</version>
+
         </dependency>
 
     </dependencies>
 
+
+
 </project>
\ No newline at end of file
diff --git a/dillon-ui/dillon-ui-common/src/main/java/com/lw/ui/request/api/system/NotifyTemplateFeign.java b/dillon-ui/dillon-ui-common/src/main/java/com/lw/ui/request/api/system/NotifyTemplateFeign.java
index a9dc942..828526a 100644
--- a/dillon-ui/dillon-ui-common/src/main/java/com/lw/ui/request/api/system/NotifyTemplateFeign.java
+++ b/dillon-ui/dillon-ui-common/src/main/java/com/lw/ui/request/api/system/NotifyTemplateFeign.java
@@ -9,11 +9,9 @@ import com.lw.ui.request.api.BaseFeignApi;
 import feign.Param;
 import feign.QueryMap;
 import feign.RequestLine;
-import io.swagger.v3.oas.annotations.tags.Tag;
 
 import java.util.Map;
 
-@Tag(name = "管理后台 - 站内信模版")
 public interface NotifyTemplateFeign extends BaseFeignApi {
     //"创建站内信模版")
     @RequestLine("POST /system/notify-template/create")
diff --git a/dillon-ui/pom.xml b/dillon-ui/pom.xml
index f438500..ee81664 100644
--- a/dillon-ui/pom.xml
+++ b/dillon-ui/pom.xml
@@ -22,6 +22,7 @@
         <module>dillon-ui-common</module>
         <module>dillon-ui-swing</module>
         <module>dillon-ui-fx</module>
+        <module>dillon-ui-fx-new</module>
     </modules>
 
 
diff --git a/pom.xml b/pom.xml
index 843c4a8..df13773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,13 @@
     <url>https://gitee.com/lwdillon/dillon-admin-pro</url>
 
     <properties>
-        <revision>2.1.0-jdk8-snapshot</revision>
+        <revision>1.0.1</revision>
         <!-- Maven 相关 -->
         <java.version>1.8</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
         <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.30</lombok.version>
@@ -68,6 +68,9 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${maven-compiler-plugin.version}</version>
                     <configuration>
+                        <!-- 使用 properties 中指定的版本 -->
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
                         <annotationProcessorPaths>
                             <path>
                                 <groupId>org.springframework.boot</groupId>