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 @@
https://github.com/YunaiV/ruoyi-vue-pro
- 2.1.0-jdk8-snapshot
+ 1.0.1
1.5.0
2.7.18
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 @@
com.xingyuv
spring-boot-starter-captcha-plus
+
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 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 @@
slf4j-api
1.7.32
-
- com.lw.dillon
- dillon-module-system-biz
- ${revision}
-
+
com.belerweb
pinyin4j
@@ -95,13 +91,22 @@
Java-WebSocket
1.5.1
+
com.lw.dillon
dillon-module-infra-biz
- 2.1.0-jdk8-snapshot
- compile
+ ${revision}
+
+
+
+ com.lw.dillon
+ dillon-module-system-biz
+ ${revision}
+
+
+
\ 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 @@
dillon-ui-common
dillon-ui-swing
dillon-ui-fx
+ dillon-ui-fx-new
diff --git a/pom.xml b/pom.xml
index 843c4a8..df13773 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,13 +24,13 @@
https://gitee.com/lwdillon/dillon-admin-pro
- 2.1.0-jdk8-snapshot
+ 1.0.1
1.8
${java.version}
${java.version}
3.0.0-M5
- 3.11.0
+ 3.13.0
1.5.0
1.18.30
@@ -68,6 +68,9 @@
maven-compiler-plugin
${maven-compiler-plugin.version}
+
+ ${maven.compiler.source}
+ ${maven.compiler.target}
org.springframework.boot