novalon/novalon-manage-system
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #2

Merged
jenkins merged 49 commits from develop into main 2026-04-08 19:55:46 +08:00
Conversation 0 Commits 49 Files Changed 144
+5 -5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 92df794cc8 - Show all commits
novalon-manage-web/e2e/global-setup.ts
+5 -5
View File
@@ -101,7 +101,7 @@ async function globalSetup(config: FullConfig) {
backendArgs = [ backendArgs = [
'-jar', '-jar',
jarFile, jarFile,
'--spring.profiles.active=test', '--spring.profiles.active=dev',
'-Xms256m', '-Xms256m',
'-Xmx512m' '-Xmx512m'
]; ];
@@ -109,7 +109,7 @@ async function globalSetup(config: FullConfig) {
console.log('📦 使用Maven启动后端服务...'); console.log('📦 使用Maven启动后端服务...');
console.log(' 提示: 运行 "mvn clean package -DskipTests" 构建JAR文件以获得更快的启动速度'); console.log(' 提示: 运行 "mvn clean package -DskipTests" 构建JAR文件以获得更快的启动速度');
backendCommand = 'mvn'; backendCommand = 'mvn';
backendArgs = ['spring-boot:run', '-Dspring-boot.run.profiles=test']; backendArgs = ['spring-boot:run', '-Dspring-boot.run.profiles=dev'];
} }
console.log(` 目录: ${backendDir}`); console.log(` 目录: ${backendDir}`);
@@ -167,7 +167,7 @@ async function globalSetup(config: FullConfig) {
gatewayArgs = [ gatewayArgs = [
'-jar', '-jar',
gatewayJarFile, gatewayJarFile,
'--spring.profiles.active=test', '--spring.profiles.active=dev',
'-Xms128m', '-Xms128m',
'-Xmx256m' '-Xmx256m'
]; ];
@@ -175,7 +175,7 @@ async function globalSetup(config: FullConfig) {
console.log('🚪 使用Maven启动网关服务...'); console.log('🚪 使用Maven启动网关服务...');
console.log(' 提示: 运行 "mvn clean package -DskipTests" 构建JAR文件以获得更快的启动速度'); console.log(' 提示: 运行 "mvn clean package -DskipTests" 构建JAR文件以获得更快的启动速度');
gatewayCommand = 'mvn'; gatewayCommand = 'mvn';
gatewayArgs = ['spring-boot:run', '-Dspring-boot.run.profiles=test']; gatewayArgs = ['spring-boot:run', '-Dspring-boot.run.profiles=dev'];
} }
console.log(` 目录: ${gatewayDir}`); console.log(` 目录: ${gatewayDir}`);
@@ -186,7 +186,7 @@ async function globalSetup(config: FullConfig) {
stdio: 'pipe', stdio: 'pipe',
shell: true, shell: true,
detached: false, detached: false,
env: { ...process.env, SPRING_PROFILES_ACTIVE: 'test' } env: { ...process.env, SPRING_PROFILES_ACTIVE: 'dev' }
}); });
if (gatewayProcess.stdout) { if (gatewayProcess.stdout) {