Commit e45d09d6 authored by Medicean's avatar Medicean

Merge branch 'master' into v2.0.x

parents 8692ee55 b134d3e2
...@@ -101,7 +101,7 @@ class Encoders { ...@@ -101,7 +101,7 @@ class Encoders {
toastr.error(LANG['message']['ename_duplicate'], LANG_T['error']); toastr.error(LANG['message']['ename_duplicate'], LANG_T['error']);
return; return;
} }
fs.renameSync(oepath, path.join(process.env.AS_WORKDIR, `antData/encoders/${oetype}/encoder/${nValue}.js`)); fs.renameSync(oepath, path.join(remote.process.env.AS_WORKDIR, `antData/encoders/${oetype}/encoder/${nValue}.js`));
toastr.success(LANG['message']["rename_success"],LANG_T["success"]); toastr.success(LANG['message']["rename_success"],LANG_T["success"]);
break break
case 2: case 2:
...@@ -114,7 +114,7 @@ class Encoders { ...@@ -114,7 +114,7 @@ class Encoders {
toastr.error(LANG['message']['ename_duplicate'], LANG_T['error']); toastr.error(LANG['message']['ename_duplicate'], LANG_T['error']);
return; return;
} }
fs.renameSync(oepath, path.join(process.env.AS_WORKDIR, `antData/encoders/${nValue}/encoder/${oename}.js`)); fs.renameSync(oepath, path.join(remote.process.env.AS_WORKDIR, `antData/encoders/${nValue}/encoder/${oename}.js`));
toastr.success(LANG['message']["retype_success"],LANG_T["success"]); toastr.success(LANG['message']["retype_success"],LANG_T["success"]);
break break
} }
...@@ -145,7 +145,7 @@ class Encoders { ...@@ -145,7 +145,7 @@ class Encoders {
layer.close(i); layer.close(i);
return return
} }
let savePath= path.join(process.env.AS_WORKDIR,`antData/encoders/${t}/encoder/${value}.js`); let savePath= path.join(remote.process.env.AS_WORKDIR,`antData/encoders/${t}/encoder/${value}.js`);
fs.writeFileSync(savePath, self.default_template); fs.writeFileSync(savePath, self.default_template);
...@@ -320,7 +320,7 @@ module.exports = (pwd, data) => { ...@@ -320,7 +320,7 @@ module.exports = (pwd, data) => {
data.push({ data.push({
id: _id, id: _id,
ename: _, ename: _,
epath: path.join(process.env.AS_WORKDIR, `antData/encoders/${t}/encoder/${_}`), epath: path.join(remote.process.env.AS_WORKDIR, `antData/encoders/${t}/encoder/${_}`),
etype: t, etype: t,
data: [ data: [
`<i class="fa fa-file-code-o"></i>`, `<i class="fa fa-file-code-o"></i>`,
...@@ -343,7 +343,7 @@ module.exports = (pwd, data) => { ...@@ -343,7 +343,7 @@ module.exports = (pwd, data) => {
antSword['encoders'] = (function(){ antSword['encoders'] = (function(){
var encoders = {asp:[],aspx:[],php:[],custom:[]}; var encoders = {asp:[],aspx:[],php:[],custom:[]};
var encoders_path = {asp:[],aspx:[],php:[],custom:[]}; var encoders_path = {asp:[],aspx:[],php:[],custom:[]};
let userencoder_path = path.join(process.env.AS_WORKDIR,'antData/encoders'); let userencoder_path = path.join(remote.process.env.AS_WORKDIR,'antData/encoders');
// 初始化 // 初始化
!fs.existsSync(userencoder_path) ? fs.mkdirSync(userencoder_path) : null; !fs.existsSync(userencoder_path) ? fs.mkdirSync(userencoder_path) : null;
['asp','aspx','php','custom'].map((t)=>{ ['asp','aspx','php','custom'].map((t)=>{
...@@ -369,5 +369,4 @@ module.exports = (pwd, data) => { ...@@ -369,5 +369,4 @@ module.exports = (pwd, data) => {
this.parseData(); this.parseData();
} }
} }
module.exports = Encoders; module.exports = Encoders;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment