Skip to content

Commit ea793f7

Browse files
eruptserupts
authored
Merge pull request #295 from erupts/develop
1.12.19
2 parents 523ad19 + 5bf634b commit ea793f7

File tree

66 files changed

+246
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+246
-83
lines changed

‎.gitignore

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
HELP.md
2-
target/
2+
*/target/
33
!.mvn/wrapper/maven-wrapper.jar
44
!**/src/main/**
55
!**/src/test/**
@@ -28,4 +28,9 @@ target/
2828
build/
2929

3030
### VS Code ###
31-
.vscode/
31+
.vscode/
32+
33+
34+
# project
35+
.erupt
36+
*/.DS_Store

‎deploy/deploy.sh

-4
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@ set -e
55
# upload docker hub
66
source erupt-cloud-server-docker/deploy.sh
77

8-
# deploy to maven center repo
9-
cd ../
10-
mvn deploy -Dmaven.test.skip=true
11-
128
echo "deploy scripts executed successfully!"

‎deploy/erupt-cloud-server-docker/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>xyz.erupt</groupId>
88
<artifactId>erupt</artifactId>
9-
<version>1.12.18</version>
9+
<version>1.12.19</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎erupt-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-ai/RREAME.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### AI Module
2+
3+
ChatGpt/DeepSeek/Kimi/ollama

‎erupt-ai/pom.xml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<artifactId>erupt-ai</artifactId>
7+
<name>erupt-ai</name>
8+
<description>Erupt AI LLM</description>
9+
10+
<parent>
11+
<groupId>xyz.erupt</groupId>
12+
<artifactId>erupt</artifactId>
13+
<version>1.12.19</version>
14+
<relativePath>../pom.xml</relativePath>
15+
</parent>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>${erupt.groupId}</groupId>
20+
<artifactId>erupt-core</artifactId>
21+
<version>${project.parent.version}</version>
22+
</dependency>
23+
<dependency>
24+
<groupId>org.apache.velocity</groupId>
25+
<artifactId>velocity-engine-core</artifactId>
26+
<version>2.3</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>org.springframework.boot</groupId>
30+
<artifactId>spring-boot-configuration-processor</artifactId>
31+
<optional>true</optional>
32+
</dependency>
33+
</dependencies>
34+
35+
</project>

‎erupt-ai/src/main/java/xyz/erupt/ai/EruptAiAutoConfiguration.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package xyz.erupt.ai;
2+
3+
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4+
import org.springframework.context.annotation.ComponentScan;
5+
import org.springframework.context.annotation.Configuration;
6+
7+
/**
8+
* @author YuePeng
9+
* date 2025/2/22 00:20
10+
*/
11+
@Configuration
12+
@ComponentScan
13+
@EnableConfigurationProperties
14+
public class EruptAiAutoConfiguration {
15+
}

‎erupt-ai/src/main/resources/spring.factories

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.springframework.boot.autoconfigure.EnableAutoConfiguration=xyz.erupt.ai.EruptAiAutoConfiguration

‎erupt-ai/src/main/resources/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
xyz.erupt.ai.EruptAiAutoConfiguration

‎erupt-annotation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>xyz.erupt</groupId>
1313
<artifactId>erupt</artifactId>
14-
<version>1.12.18</version>
14+
<version>1.12.19</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717
</project>

‎erupt-annotation/src/main/java/xyz/erupt/annotation/sub_erupt/Drill.java

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
String title();
1717

18+
@Comment("是否折叠显示")
19+
boolean fold() default false;
20+
1821
@Comment("图标请参考Font Awesome")
1922
String icon() default "fa fa-sitemap";
2023

‎erupt-annotation/src/main/java/xyz/erupt/annotation/sub_field/Edit.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595

9696
@Match("#item.type().toString()=='REFERENCE_TREE'")
9797
ReferenceTreeType referenceTreeType() default @ReferenceTreeType;
98-
99-
@Match("#item.type().toString()=='REFERENCE_TABLE'")
98+
99+
@Match("#item.type().toString()=='REFERENCE_TABLE' || #item.type().toString()=='TAB_TABLE_REFER'")
100100
ReferenceTableType referenceTableType() default @ReferenceTableType;
101101

102102
@Transient

‎erupt-cloud/docker-compose.yml

Whitespace-only changes.

‎erupt-cloud/erupt-cloud-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-node-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-node/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-cloud/erupt-cloud-node/src/main/java/xyz/erupt/cloud/node/EruptCloudNodeAutoConfiguration.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@
33
import org.springframework.boot.context.properties.EnableConfigurationProperties;
44
import org.springframework.context.annotation.ComponentScan;
55
import org.springframework.context.annotation.Configuration;
6-
import xyz.erupt.cloud.node.config.EruptNodeProp;
76

87
/**
98
* @author YuePeng
109
* date 2021/12/16 00:15
1110
*/
1211
@Configuration
1312
@ComponentScan
14-
@EnableConfigurationProperties(EruptNodeProp.class)
13+
@EnableConfigurationProperties
1514
public class EruptCloudNodeAutoConfiguration {
1615
}

‎erupt-cloud/erupt-cloud-server/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.18</version>
13+
<version>1.12.19</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-core/src/main/java/xyz/erupt/core/manager/EruptUiAnnotationManager.java

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package xyz.erupt.core.manager;
2+
3+
import lombok.Getter;
4+
5+
import java.lang.annotation.Annotation;
6+
import java.util.HashSet;
7+
import java.util.Set;
8+
9+
/**
10+
* @author YuePeng
11+
* date 2025/2/22 00:52
12+
*/
13+
public class EruptUiAnnotationManager {
14+
15+
@Getter
16+
private static Set<Class<? extends Annotation>> annotations = new HashSet<>();
17+
18+
public static void register(Class<? extends Annotation> annotation) {
19+
annotations.add(annotation);
20+
}
21+
22+
}

‎erupt-core/src/main/java/xyz/erupt/core/view/EruptModel.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import xyz.erupt.annotation.Erupt;
77
import xyz.erupt.annotation.EruptI18n;
88
import xyz.erupt.core.invoke.DataProxyInvoke;
9+
import xyz.erupt.core.manager.EruptUiAnnotationManager;
910
import xyz.erupt.core.proxy.AnnotationProcess;
1011
import xyz.erupt.core.proxy.AnnotationProxy;
1112
import xyz.erupt.core.proxy.EruptProxy;
@@ -72,12 +73,12 @@ public Erupt getErupt() {
7273
public EruptModel clone() throws CloneNotSupportedException {
7374
EruptModel eruptModel = (EruptModel) super.clone();
7475
eruptModel.eruptJson = AnnotationProcess.annotationToJsonByReflect(this.getErupt());
75-
if (this.getErupt().extra().length > 0) {
76-
JsonObject extra = new JsonObject();
77-
eruptModel.eruptJson.add(LambdaSee.method(Erupt::extra), extra);
78-
for (Class<? extends Annotation> ex : this.getErupt().extra()) {
79-
Optional.ofNullable(this.getClazz().getAnnotation(ex)).ifPresent(it -> extra.add(ex.getSimpleName(), AnnotationProcess.annotationToJsonByReflect(it)));
80-
}
76+
JsonObject extra = new JsonObject();
77+
eruptModel.eruptJson.add(LambdaSee.method(Erupt::extra), extra);
78+
EruptUiAnnotationManager.getAnnotations().forEach(annotation -> Optional.ofNullable(this.getClazz().getAnnotation(annotation))
79+
.ifPresent(it -> extra.add(annotation.getSimpleName(), AnnotationProcess.annotationToJsonByReflect(it))));
80+
for (Class<? extends Annotation> ex : this.getErupt().extra()) {
81+
Optional.ofNullable(this.getClazz().getAnnotation(ex)).ifPresent(it -> extra.add(ex.getSimpleName(), AnnotationProcess.annotationToJsonByReflect(it)));
8182
}
8283
eruptModel.eruptFieldModels = eruptFieldModels.stream().map(CloneSupport::clone).peek(EruptFieldModel::serializable).collect(Collectors.toList());
8384
return eruptModel;

‎erupt-core/src/main/resources/ueditor.json

+10-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
".jpg",
88
".jpeg",
99
".gif",
10-
".bmp"
10+
".bmp",
11+
".webp"
1112
],
1213
"imageCompressEnable": true,
1314
"imageCompressBorder": 1600,
@@ -39,7 +40,8 @@
3940
".jpg",
4041
".jpeg",
4142
".gif",
42-
".bmp"
43+
".bmp",
44+
".webp"
4345
],
4446
"videoActionName": "uploadvideo",
4547
"videoFieldName": "file",
@@ -110,7 +112,8 @@
110112
".pdf",
111113
".txt",
112114
".md",
113-
".xml"
115+
".xml",
116+
".webp"
114117
],
115118
"imageManagerActionName": "listimage",
116119
"imageManagerListPath": "\/{yyyy}{mm}\/",
@@ -122,7 +125,8 @@
122125
".jpg",
123126
".jpeg",
124127
".gif",
125-
".bmp"
128+
".bmp",
129+
".webp"
126130
],
127131
"fileManagerActionName": "listfile",
128132
"fileManagerListPath": "\/Uploads\/File\/",
@@ -168,6 +172,7 @@
168172
".pdf",
169173
".txt",
170174
".md",
171-
".xml"
175+
".xml",
176+
".webp"
172177
]
173178
}

‎erupt-data/erupt-jpa/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.18</version>
8+
<version>1.12.19</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

‎erupt-data/erupt-jpa/src/main/java/xyz/erupt/jpa/service/EruptDataServiceDbImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ private void handlerException(Exception e, EruptModel eruptModel) {
117117
while (null != throwable) {
118118
throwable = throwable.getCause();
119119
if (throwable instanceof SQLException) {
120-
if (throwable.getMessage().contains("Data too long")) {
120+
if (throwable.getMessage().toLowerCase().contains("data too long")) {
121121
throw new EruptWebApiRuntimeException(I18nTranslate.$translate("erupt.data.limit_length"));
122-
} else if (throwable.getMessage().contains("Duplicate entry")) {
122+
} else if (throwable.getMessage().toLowerCase().contains("duplicate")) {
123123
throw new EruptWebApiRuntimeException(gcRepeatHint(eruptModel));
124124
}
125125
throw new EruptWebApiRuntimeException(throwable.getMessage());

‎erupt-data/erupt-mongodb/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>xyz.erupt</groupId>
1111
<artifactId>erupt</artifactId>
12-
<version>1.12.18</version>
12+
<version>1.12.19</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515

‎erupt-excel/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.18</version>
13+
<version>1.12.19</version>
1414
<relativePath>../pom.xml</relativePath>
1515
</parent>
1616

‎erupt-extra/erupt-generator/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>xyz.erupt</groupId>
77
<artifactId>erupt</artifactId>
8-
<version>1.12.18</version>
8+
<version>1.12.19</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

‎erupt-extra/erupt-job/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.18</version>
13+
<version>1.12.19</version>
1414
<relativePath>../../pom.xml</relativePath>
1515
</parent>
1616

@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>xyz.erupt</groupId>
3030
<artifactId>erupt-toolkit</artifactId>
31-
<version>1.12.18</version>
31+
<version>1.12.19</version>
3232
<scope>provided</scope>
3333
</dependency>
3434
<dependency>

‎erupt-extra/erupt-job/src/main/java/xyz/erupt/job/EruptJobAutoConfiguration.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ public class EruptJobAutoConfiguration implements EruptModule {
5454
public void run() {
5555
if (eruptJobProp.isEnable()) {
5656
for (EruptJob job : eruptDao.lambdaQuery(EruptJob.class).eq(EruptJob::getStatus, true).list()) {
57-
eruptJobService.modifyJob(job);
57+
try {
58+
eruptJobService.addJob(job);
59+
} catch (Exception e) {
60+
log.warn("The Erupt job named '{}' failed to be added: {}", job.getName(), e.getMessage());
61+
}
5862
}
5963
} else {
6064
log.info("Erupt job disable");

‎erupt-extra/erupt-magic-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>xyz.erupt</groupId>
1515
<artifactId>erupt</artifactId>
16-
<version>1.12.18</version>
16+
<version>1.12.19</version>
1717
<relativePath>../../pom.xml</relativePath>
1818
</parent>
1919

‎erupt-extra/erupt-monitor/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>xyz.erupt</groupId>
1212
<artifactId>erupt</artifactId>
13-
<version>1.12.18</version>
13+
<version>1.12.19</version>
1414
<relativePath>../../pom.xml</relativePath>
1515
</parent>
1616

0 commit comments

Comments
 (0)