fix(multi-app-manager): repeated judgment (#1522)
Reviewed-on: daoyoucloud/tachybase#1522 Co-authored-by: TomyJan <TomyJan6@gmail.com> Co-committed-by: TomyJan <TomyJan6@gmail.com>
This commit is contained in:
		
							parent
							
								
									a532db120d
								
							
						
					
					
						commit
						dd38db675d
					
				@ -27,7 +27,6 @@ DB_USER=tachybase
 | 
			
		||||
DB_PASSWORD=tachybase
 | 
			
		||||
DB_UNDERSCORED=false
 | 
			
		||||
DB_TIMEZONE=+08:00
 | 
			
		||||
DB_TABLE_PREFIX=
 | 
			
		||||
DB_SCHEMA=
 | 
			
		||||
CACHE_DEFAULT_STORE=memory
 | 
			
		||||
CACHE_MEMORY_MAX=2000
 | 
			
		||||
 | 
			
		||||
@ -27,7 +27,6 @@ DB_USER=tachybase
 | 
			
		||||
DB_PASSWORD=tachybase
 | 
			
		||||
DB_UNDERSCORED=false
 | 
			
		||||
DB_TIMEZONE=+08:00
 | 
			
		||||
DB_TABLE_PREFIX=
 | 
			
		||||
DB_SCHEMA=
 | 
			
		||||
CACHE_DEFAULT_STORE=memory
 | 
			
		||||
CACHE_MEMORY_MAX=2000
 | 
			
		||||
 | 
			
		||||
@ -66,10 +66,6 @@ export default function mergeApplicationStartEnvs(appName: String, mainApp: Appl
 | 
			
		||||
      options.database.timezone = startEnvs.DB_TIMEZONE;
 | 
			
		||||
      delete startEnvs.DB_TIMEZONE;
 | 
			
		||||
    }
 | 
			
		||||
    if (startEnvs.DB_TABLE_PREFIX) {
 | 
			
		||||
      options.database.tablePrefix = startEnvs.DB_TABLE_PREFIX;
 | 
			
		||||
      delete startEnvs.DB_TABLE_PREFIX;
 | 
			
		||||
    }
 | 
			
		||||
    if (startEnvs.DB_SCHEMA) {
 | 
			
		||||
      options.database.schema = startEnvs.DB_SCHEMA;
 | 
			
		||||
      delete startEnvs.DB_SCHEMA;
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user