刘韬 4 years ago
parent
commit
7eeff5234a

+ 4 - 4
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -43,7 +43,7 @@ public class ZskkConfig extends JFinalConfig {
 	public void configConstant(Constants me) {
 		loadProp("config.properties", "a_little_config.txt");
 		me.setDevMode(PropKit.getBoolean("devMode", false));
-//		me.setBaseUploadPath("/zskk_system/zskk_dicomQRScp/DICOM");
+//		me.setBaseUploadPath("/home/zskk/upload");
 	}
 
 	@Override
@@ -71,9 +71,9 @@ public class ZskkConfig extends JFinalConfig {
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new MysqlDialect());
-//		me.add(arpConnected);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new MysqlDialect());
+		me.add(arpConnected);
 
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();

+ 9 - 2
DataFusion/src/com/zskk/control/ViewController.java

@@ -110,8 +110,15 @@ public class ViewController extends Controller {
 	
 	public void upload(File ddFile) {
 //		ddFile.save();
-	getFiles();
-    renderNull();
+		try {
+			getFiles();
+		    renderNull();
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+
+		}
+
 }
 	/**
 	 * post请求

+ 2 - 1
DataFusion/src/com/zskk/service/DataService.java

@@ -106,7 +106,8 @@ public class DataService {
                 buffer = new byte[1024];
             }
         } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
+        	e.fillInStackTrace();
         } finally {
             File localFile = new File(localDir + File.separator + fileName);
             try {