diff --git a/gm-server/app/controller/upload.ts b/gm-server/app/controller/upload.ts index 54521350c..e26b9422f 100644 --- a/gm-server/app/controller/upload.ts +++ b/gm-server/app/controller/upload.ts @@ -195,7 +195,7 @@ export default class UploadController extends Controller { files.push(filename); } } else if (stream.mimeType == 'application/octet-stream') { - let target1 = path.join(this.config.baseDir, this.tsFolder, filename); + let target1 = path.join(this.config.baseDir, this.tsFolder, 'dicParam.js'); let target2 = path.join(this.config.baseDir, this.distTsFolder, filename); const writeStream = fs.createWriteStream(target1); await pump(stream, writeStream); diff --git a/shared/pubUtils/data.ts b/shared/pubUtils/data.ts index d84f9bfd8..f8c8c0298 100644 --- a/shared/pubUtils/data.ts +++ b/shared/pubUtils/data.ts @@ -940,9 +940,9 @@ export function reloadDicParam() { // console.log(outer) } if(line.indexOf('export') == -1 && line.indexOf('}') == -1) { - let s = line.split(', //')[0].split(':'); - let key = s[0].replace(/ /g, ''); - let value = s[1].replace(/ /g, ''); + let s = line.split(', //')[0]; + let key = s.slice(0, s.indexOf(':')).replace(/ /g, ''); + let value = s.slice(s.indexOf(':' + 1)).replace(/ /g, ''); let isString = value.match(/(?<=')[^']*/); if(!param[outer]) { param[outer] = {} diff --git a/shared/pubUtils/util.ts b/shared/pubUtils/util.ts index 205bdb1c9..be6a523fd 100644 --- a/shared/pubUtils/util.ts +++ b/shared/pubUtils/util.ts @@ -435,7 +435,7 @@ export function readWarJsonFileList() { export function readTsFile(fileName: string) { try { - let file = fs.readFileSync(path.resolve(__dirname, `../pubUtils/${fileName}.ts`)).toString('utf8').replace(/^\uFEFF/, ''); + let file = fs.readFileSync(path.resolve(__dirname, `../pubUtils/${fileName}.js`)).toString('utf8').replace(/^\uFEFF/, ''); return file; } catch(e) { return null