Skip to content

Commit 89b2b77

Browse files
hhhhsc701hhhhsc701
authored
Merge pull request #2 from ModelEngine-Group/develop_hsc
Develop hsc
2 parents 102343b + 3fef1af commit 89b2b77

File tree

11 files changed

+74
-57
lines changed

11 files changed

+74
-57
lines changed

‎Makefile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ uninstall-%:
4141
esac; \
4242
$(MAKE) $*-$$INSTALLER-uninstall
4343

44+
45+
# build
4446
.PHONY: mineru-docker-build
4547
mineru-docker-build:
4648
sh scripts/image/mineru/build.sh
@@ -85,6 +87,22 @@ datax-docker-install:
8587
datax-docker-uninstall:
8688
cd deployment/docker/data-platform && docker-compose down datax
8789

90+
.PHONY: backend-docker-install
91+
backend-docker-install:
92+
cd deployment/docker/data-platform && docker-compose up -d backend
93+
94+
.PHONY: backend-docker-uninstall
95+
backend-docker-uninstall:
96+
cd deployment/docker/data-platform && docker-compose down backend
97+
98+
.PHONY: frontend-docker-install
99+
frontend-docker-install:
100+
cd deployment/docker/data-platform && docker-compose up -d frontend
101+
102+
.PHONY: frontend-docker-uninstall
103+
frontend-docker-uninstall:
104+
cd deployment/docker/data-platform && docker-compose down frontend
105+
88106
.PHONY: data-juicer-helm-install
89107
data-juicer-helm-install:
90108
sh deployment/helm/data-juicer/install.sh

‎backend/pom.xml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,22 +125,20 @@
125125
<dependencies>
126126
<dependency>
127127
<groupId>org.springframework.boot</groupId>
128-
<artifactId>spring-boot-dependencies</artifactId>
128+
<artifactId>spring-boot-starter-web</artifactId>
129129
<version>${spring-boot.version}</version>
130-
<type>pom</type>
131-
<scope>import</scope>
132130
</dependency>
131+
133132
<dependency>
134133
<groupId>org.springframework.boot</groupId>
135-
<artifactId>spring-boot-starter-web</artifactId>
134+
<artifactId>spring-boot-starter</artifactId>
136135
<version>${spring-boot.version}</version>
137136
</dependency>
137+
138138
<dependency>
139-
<groupId>org.springframework.cloud</groupId>
140-
<artifactId>spring-cloud-dependencies</artifactId>
141-
<version>${spring-cloud.version}</version>
142-
<type>pom</type>
143-
<scope>import</scope>
139+
<groupId>com.baomidou</groupId>
140+
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
141+
<version>${mybatis-plus.version}</version>
144142
</dependency>
145143

146144
<dependency>

‎backend/services/data-synthesis-service/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-web</artifactId>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-webflux</artifactId>
32-
</dependency>
3329
<dependency>
3430
<groupId>mysql</groupId>
3531
<artifactId>mysql-connector-java</artifactId>

‎backend/services/execution-engine-service/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-data-redis</artifactId>
3232
</dependency>
33-
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter-webflux</artifactId>
36-
</dependency>
3733
<dependency>
3834
<groupId>mysql</groupId>
3935
<artifactId>mysql-connector-java</artifactId>

‎backend/services/main-application/pom.xml‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -142,36 +142,18 @@
142142
<plugin>
143143
<groupId>org.springframework.boot</groupId>
144144
<artifactId>spring-boot-maven-plugin</artifactId>
145-
<version>3.2.0</version>
145+
<version>${spring-boot.version}</version>
146146
<configuration>
147+
<finalName>data-engine</finalName>
147148
<mainClass>com.dataengine.main.DataEnginePlatformApplication</mainClass>
148149
</configuration>
149-
</plugin>
150-
<plugin>
151-
<groupId>org.apache.maven.plugins</groupId>
152-
<artifactId>maven-assembly-plugin</artifactId>
153-
<version>${maven-assembly-plugin.version}</version>
154-
<executions>
155-
<execution>
156-
<id>make-assembly</id>
157-
<phase>package</phase>
158-
<goals>
159-
<goal>single</goal>
160-
</goals>
161-
</execution>
162-
</executions>
163-
<configuration>
164-
<finalName>data-engine</finalName>
165-
<appendAssemblyId>false</appendAssemblyId>
166-
<descriptorRefs>
167-
<descriptorRef>jar-with-dependencies</descriptorRef>
168-
</descriptorRefs>
169-
<archive>
170-
<manifest>
171-
<mainClass>com.dataengine.main.DataEnginePlatformApplication</mainClass>
172-
</manifest>
173-
</archive>
174-
</configuration>
150+
<executions>
151+
<execution>
152+
<goals>
153+
<goal>repackage</goal>
154+
</goals>
155+
</execution>
156+
</executions>
175157
</plugin>
176158
</plugins>
177159
</build>

‎backend/services/main-application/src/main/resources/application.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ spring:
1212
# 数据源配置
1313
datasource:
1414
driver-class-name: com.mysql.cj.jdbc.Driver
15-
url: jdbc:mysql://localhost:3306/knowledge_base?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
16-
username: ${DB_USERNAME:knowledge_user}
17-
password: ${DB_PASSWORD:knowledge_password}
15+
url: jdbc:mysql://101.201.105.190:9988/dataengine?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
16+
username: ${DB_USERNAME:root}
17+
password: ${DB_PASSWORD:Huawei@123}
1818
hikari:
1919
maximum-pool-size: 20
2020
minimum-idle: 5

‎backend/services/main-application/src/main/resources/config/application-datacollection.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
dataengine:
2+
data-collection:
3+
# DataX配置
4+
datax:
5+
home-path: ${DATAX_HOME:D:/datax}
6+
python-path: ${DATAX_PYTHON_PATH:python3}
7+
job-config-path: ${DATAX_JOB_PATH:./data/temp/datax/jobs}
8+
log-path: ${DATAX_LOG_PATH:./logs/datax}
9+
max-memory: ${DATAX_MAX_MEMORY:2048}
10+
channel-count: ${DATAX_CHANNEL_COUNT:5}
11+
12+
# 执行配置
13+
execution:
14+
max-concurrent-tasks: ${DATA_COLLECTION_MAX_CONCURRENT_TASKS:10}
15+
task-timeout-minutes: ${DATA_COLLECTION_TASK_TIMEOUT:120}
16+
retry-count: ${DATA_COLLECTION_RETRY_COUNT:3}
17+
retry-interval-seconds: ${DATA_COLLECTION_RETRY_INTERVAL:30}
18+
19+
# 监控配置
20+
monitoring:
21+
status-check-interval-seconds: ${DATA_COLLECTION_STATUS_CHECK_INTERVAL:30}
22+
log-retention-days: ${DATA_COLLECTION_LOG_RETENTION:30}
23+
enable-metrics: ${DATA_COLLECTION_ENABLE_METRICS:true}

‎backend/services/main-application/src/main/resources/config/application-datamanagement.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
dataengine:
2+
datamanagement:
3+
file-storage:
4+
upload-dir: ${FILE_UPLOAD_DIR:./uploads}
5+
max-file-size: 10485760 # 10MB
6+
max-request-size: 52428800 # 50MB
7+
cache:
8+
ttl: 3600
9+
max-size: 1000
10+
# MyBatis is configured centrally in main-application (mapper-locations & aliases)
11+
# to avoid list overriding issues when importing multiple module configs.

‎backend/services/rag-query-service/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030
<groupId>org.springframework.boot</groupId>
3131
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
3232
</dependency>
33-
<dependency>
34-
<groupId>org.springframework.boot</groupId>
35-
<artifactId>spring-boot-starter-webflux</artifactId>
36-
</dependency>
3733
<dependency>
3834
<groupId>mysql</groupId>
3935
<artifactId>mysql-connector-java</artifactId>

‎editions/community/config/application.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ spring:
1212
# 数据源配置
1313
datasource:
1414
driver-class-name: com.mysql.cj.jdbc.Driver
15-
url: jdbc:mysql://mysql:3306/dataengine?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
16-
username: ${DB_USERNAME}
17-
password: ${DB_PASSWORD}
15+
url: jdbc:mysql://101.201.105.190:9988/dataengine?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
16+
username: ${DB_USERNAME:root}
17+
password: ${DB_PASSWORD:Huawei@123}
1818
hikari:
1919
maximum-pool-size: 20
2020
minimum-idle: 5

0 commit comments

Comments
 (0)