From f341a7cd90e31fd7d4ef3363c3cd48e327743e99 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期三, 19 十一月 2025 14:54:17 +0800
Subject: [PATCH] 调整代码，正常启动
---
fzzy-igdss-core/pom.xml | 24 ++++++++++-
fzzy-igdss-parent/pom.xml | 6 +-
fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java | 4 +-
fzzy-igdss-doc/pom.xml | 2
fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java | 6 +-
fzzy-igdss-web/pom.xml | 4 +-
fzzy-igdss-view/pom.xml | 20 ++++++++--
7 files changed, 48 insertions(+), 18 deletions(-)
diff --git a/fzzy-igdss-core/pom.xml b/fzzy-igdss-core/pom.xml
index 5705f86..133f218 100644
--- a/fzzy-igdss-core/pom.xml
+++ b/fzzy-igdss-core/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.fzzy</groupId>
<artifactId>fzzy-igdss-core</artifactId>
- <version>${fzzy-igdss.version}</version>
+ <version>${fzzy.igdss.version}</version>
<parent>
<artifactId>fzzy-igdss-parent</artifactId>
@@ -26,14 +26,32 @@
<dependency>
<groupId>com.fzzy</groupId>
<artifactId>fzzy-framework</artifactId>
- <version>4.7.8</version>
+ <version>${fzzy.frame.version}</version>
</dependency>
<!--瀹氭椂浠诲姟-->
<dependency>
<groupId>com.fzzy</groupId>
<artifactId>fzzy-quartz</artifactId>
- <version>4.7.8</version>
+ <version>${fzzy.frame.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.6.3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.9.11</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
</dependency>
</dependencies>
diff --git a/fzzy-igdss-doc/pom.xml b/fzzy-igdss-doc/pom.xml
index 8d77fbb..e5188aa 100644
--- a/fzzy-igdss-doc/pom.xml
+++ b/fzzy-igdss-doc/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.fzzy</groupId>
<artifactId>fzzy-igdss-doc</artifactId>
- <version>${fzzy-igdss.version}</version>
+ <version>${fzzy.igdss.version}</version>
<packaging>pom</packaging>
<!-- 鐢ㄤ簬瀛樻斁椤圭洰鍚勭妗ｆ搴撴ā鏉挎枃浠� -->
diff --git a/fzzy-igdss-parent/pom.xml b/fzzy-igdss-parent/pom.xml
index 4927f8d..edcc9ee 100644
--- a/fzzy-igdss-parent/pom.xml
+++ b/fzzy-igdss-parent/pom.xml
@@ -9,7 +9,7 @@
<packaging>pom</packaging>
<properties>
- <fzzy-igdss.version>2.0.0</fzzy-igdss.version>
+ <fzzy.igdss.version>2.0.0</fzzy.igdss.version>
<fzzy.frame.version>4.7.8</fzzy.frame.version>
<spring.boot.version>2.5.15</spring.boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -62,10 +62,10 @@
<!-- </releases>-->
</repository>
- <repository>
+<!-- <repository>
<id>bsdn-maven-repository</id>
<url>http://nexus.bsdn.org/content/groups/public/</url>
- </repository>
+ </repository>-->
</repositories>
diff --git a/fzzy-igdss-view/pom.xml b/fzzy-igdss-view/pom.xml
index 4626602..c5e7d64 100644
--- a/fzzy-igdss-view/pom.xml
+++ b/fzzy-igdss-view/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.fzzy</groupId>
<artifactId>fzzy-igdss-view</artifactId>
- <version>${fzzy-igdss.version}</version>
+ <version>${fzzy.igdss.version}</version>
<parent>
<artifactId>fzzy-igdss-parent</artifactId>
@@ -21,6 +21,12 @@
</description>
<dependencies>
+
+ <dependency>
+ <groupId>com.fzzy</groupId>
+ <artifactId>fzzy-igdss-core</artifactId>
+ <version>${fzzy.igdss.version}</version>
+ </dependency>
<!--寮曞叆cglib閬垮厤涓巗hiro-redis鍐茬獊 -->
<dependency>
@@ -89,11 +95,17 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+
+<!-- <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
+ <version>2.6</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>2.1.1</version>
</dependency>
</dependencies>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java b/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
index 70b6e56..e4168ca 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/d7/DoradoConfigure.java
@@ -1,7 +1,7 @@
package com.fzzy.d7;
import com.bstek.dorado.web.servlet.DoradoServlet;
-
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
/**
@@ -11,7 +11,7 @@
//@Configuration
public class DoradoConfigure {
-/* @SuppressWarnings({ "rawtypes", "unchecked" })
+ @SuppressWarnings({ "rawtypes", "unchecked" })
@Bean
public ServletRegistrationBean doradoServlet() {
ServletRegistrationBean servlet = new ServletRegistrationBean(new DoradoServlet());
@@ -22,6 +22,6 @@
servlet.addUrlMappings("*.dpkg");
servlet.addUrlMappings("/dorado/*");
return servlet;
- }*/
+ }
}
diff --git a/fzzy-igdss-web/pom.xml b/fzzy-igdss-web/pom.xml
index 6f45d7d..2bb05e1 100644
--- a/fzzy-igdss-web/pom.xml
+++ b/fzzy-igdss-web/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>com.fzzy</groupId>
<artifactId>fzzy-igdss-core</artifactId>
- <version>${fzzy-igdss.version}</version>
+ <version>${fzzy.igdss.version}</version>
</dependency>
<!-- -->
@@ -47,7 +47,7 @@
<dependency>
<groupId>com.fzzy</groupId>
<artifactId>fzzy-igdss-view</artifactId>
- <version>${fzzy-igdss.version}</version>
+ <version>${fzzy.igdss.version}</version>
</dependency>
<!-- d7鐨偆鍖� -->
diff --git a/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java b/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
index e3f1bc3..48d09ad 100644
--- a/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
+++ b/fzzy-igdss-web/src/main/java/com/bstek/dorado/web/loader/DoradoLoader.java
@@ -28,8 +28,8 @@
import org.apache.commons.jexl2.JexlContext;
import org.apache.commons.jexl2.MapContext;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ConfigurableApplicationContext;
--
Gitblit v1.9.3