fix: DATABASE_DBNAME env instead of config

server/config.js

@@ -5,4 +5,5 @@ module.exports = {
     "PARSE_APPID":"edu-textbook",
     "PARSE_MASTERKEY":"EDU2024",
     "DATABASE_LOCAL":false, // 加载本地测试数据库
+    "DATABASE_DBNAME": "postgres://postgres:Edu2024textbask@127.0.0.1:25432/postgres"
 }

server/db/pg-instance.js

@@ -3,27 +3,15 @@ const pgp = require('pg-promise')();
 // 连接到数据库
 var PgInstanse;
 export const pgClient = function(){
-    let pgconfig = {
-        user: 'postgres',
-        password: 'Edu2024textbask',
-        host: '127.0.0.1',
-        port: 25432,
-        database: 'postgres'
-    }
+    let pgConns = global.config['DATABASE_DBNAME']
     
     if(global.config['LOCAL']) {
-        pgconfig = {
-            user: 'postgres',
-            password: 'postgres',
-            host: '127.0.0.1',
-            port: 25432,
-            database: 'postgres'
-        }
+        pgConns = `postgres://postgres:postgres@127.0.0.1:25432/postgres`
     }
     
     if(!PgInstanse){
-        console.log(pgconfig)
-        PgInstanse = pgp(pgconfig);
+        // console.log(pgconfig)
+        PgInstanse = pgp(pgConns);
     }
     return PgInstanse;
 }

server/lib/pg/index.js

@@ -33,7 +33,8 @@ var DBDataDir
  * cp -rf node_modules/@embedded-postgres/windows-x64/native/* bin/pg/bin/
  */
 export async function PostgreSQLKeep(dbconfig){
-    DBDataDir = path.join(OWN_DIR,dbconfig.dbpath)
+    if(!dbconfig?.dbpath) return
+    DBDataDir = path.join(OWN_DIR,dbconfig?.dbpath)
 
     console.log("PostgreSQLKeep",dbconfig)
     // pgStop(dbconfig)

server/server.js

@@ -30,6 +30,8 @@ if (OWN_DIR) {
   }
 }
 global.config = global.config || {}
+console.log(appConfig)
+global.config['DATABASE_DBNAME'] = process.env["DATABASE_DBNAME"] || appConfig["DATABASE_DBNAME"] || false
 global.config['DATABASE_LOCAL'] = process.env["DATABASE_LOCAL"] || appConfig["DATABASE_LOCAL"] || false
 global.config['MCENTER_ENABLED'] = process.env["MCENTER_ENABLED"] || appConfig["MCENTER_ENABLED"] || false
 global.config['PARSE_SERVERURL'] = process.env["PARSE_SERVERURL"] || appConfig["PARSE_SERVERURL"] || false
@@ -82,7 +84,7 @@ global.parseConfig = {
 }
 
 global.parseConfig.serverURL = `http://localhost:${global.parseConfig?.port}/parse`
-global.parseConfig.databaseURI = "postgresql://postgres:Edu2024textbask@127.0.0.1:25432/"
+global.parseConfig.databaseURI = global.config['DATABASE_DBNAME'];
 if(global.config['LOCAL']) {
   global.parseConfig.databaseURI = "postgresql://postgres@127.0.0.1:25432/"
 }
@@ -97,9 +99,9 @@ Parse.serverURL = global.parseConfig.serverURL;
 async function startParse(){
   if(global.config['LOCAL']) {
     console.log("PostgreSQLKeep")
-    await PostgreSQLKeep({
-        username:"postgres",password:"postgres",port:"25432",dbpath:"database/edudata"
+    await PostgreSQLKeep({username:"postgres",password:"postgres",port:"25432",dbpath:"database/edudata"
     })
+    // await PostgreSQLKeep(global.config['DATABASE_DBNAME'], "database/edudata/" )
   }
   // 挂载微服务
   console.log(global.parseConfig)