diff --git a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java index 63c8705..36f13da 100644 --- a/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java +++ b/server/crm/src/main/java/com/pudonghot/ambition/crm/service/support/ExportTaskServiceSupport.java @@ -43,7 +43,7 @@ public class ExportTaskServiceSupport private TaskExecutor threadPoolTaskExecutor; @Autowired private CustomerService customerService; - @Value("${export.location:/data/export}") + @Value("${export.location:/data/program/export}") private String exportLocation; @Autowired private WebSocketService webSocketService; diff --git a/web/app/services/ajax.js b/web/app/services/ajax.js index eba25a9..80c3ab1 100644 --- a/web/app/services/ajax.js +++ b/web/app/services/ajax.js @@ -79,11 +79,11 @@ export default Ember.Service.extend({ } // ignore fail callback else if (p.fnFail !== false) { - me._isFunc(p.fnFail) ? p.fnFail(r.errmsg, r) : - me.dialog.error(r.errmsg || 'Ajax Request Error Caused'); + me._isFunc(p.fnFail) ? p.fnFail(r.message, r) : + me.dialog.error(r.message || 'Ajax Request Error Caused'); } else { - me.dialog.error(r.errmsg || 'Ajax Request Error Caused'); + me.dialog.error(r.message || 'Ajax Request Error Caused'); } p.loadmask && me.set('loading', false); },