瀏覽代碼

更新FTP服务器

koul 5 年之前
父節點
當前提交
6ebb67f407

+ 10 - 10
.idea/artifacts/hsl_jar.xml

@@ -1,25 +1,25 @@
 <component name="ArtifactManager">
   <artifact type="jar" name="hsl:jar">
-    <output-path>$PROJECT_DIR$/bin/artifacts/hsl_jar</output-path>
+    <output-path>$PROJECT_DIR$/out/artifacts/hsl_jar</output-path>
     <root id="archive" name="hsl.jar">
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" />
       </element>
       <element id="module-output" name="hsl" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/httpcore-4.4.10.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.4.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-io-2.4.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-net-3.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/dom4j-1.6.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/flexjson-2.1.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/httpcore-4.4.10.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/javax.servlet.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/jsch-0.1.54.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/junit.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/dom4j-1.6.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/flexjson-2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-io-2.4.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/log4j-1.2.15.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/lib/javax.servlet.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar" path-in-jar="/" />
     </root>
   </artifact>
 </component>

+ 6 - 0
.idea/google-java-format.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GoogleJavaFormatSettings">
+    <option name="enabled" value="false" />
+  </component>
+</project>

+ 36 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,36 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JavaDoc" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="TOP_LEVEL_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="INNER_CLASS_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="METHOD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="@return@param@throws or @exception" />
+        </value>
+      </option>
+      <option name="FIELD_OPTIONS">
+        <value>
+          <option name="ACCESS_JAVADOC_REQUIRED_FOR" value="none" />
+          <option name="REQUIRED_TAGS" value="" />
+        </value>
+      </option>
+      <option name="IGNORE_DEPRECATED" value="false" />
+      <option name="IGNORE_JAVADOC_PERIOD" value="true" />
+      <option name="IGNORE_DUPLICATED_THROWS" value="false" />
+      <option name="IGNORE_POINT_TO_ITSELF" value="false" />
+      <option name="myAdditionalJavadocTags" value="date" />
+    </inspection_tool>
+  </profile>
+</component>

+ 13 - 0
.idea/libraries/commons_csv_1_4.xml

@@ -2,6 +2,19 @@
   <library name="commons-csv-1.4">
     <CLASSES>
       <root url="jar://$PROJECT_DIR$/lib/commons-csv-1.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/commons-net-3.6.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/flexjson-2.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.4.10.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/jsch-0.1.54.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.15.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

+ 0 - 9
.idea/libraries/commons_io_2_4.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-io-2.4">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/commons-io-2.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/commons_net_3_6.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-net-3.6">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/commons-net-3.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/dom4j_1_6_1.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="dom4j-1.6.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/dom4j-1.6.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/flexjson_2_1.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="flexjson-2.1">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/flexjson-2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/httpcore_4_4_10.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpcore-4.4.10">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/httpcore-4.4.10.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/jackson_core_asl_1_9_13.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jackson-core-asl-1.9.13">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jackson-core-asl-1.9.13.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/jackson_mapper_asl_1_9_13.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jackson-mapper-asl-1.9.13">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jackson-mapper-asl-1.9.13.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/javax_servlet.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="javax.servlet">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/javax.servlet.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/jsch_0_1_54.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jsch-0.1.54">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/jsch-0.1.54.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/junit.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="junit">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/junit.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/log4j_1_2_15.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="log4j-1.2.15">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.15.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/ojdbc6_11_2_0.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="ojdbc6-11.2.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/ojdbc6-11.2.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 0 - 9
.idea/libraries/slf4j_api_1_7_21.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="slf4j-api-1.7.21">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/slf4j-api-1.7.21.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

+ 1 - 3
.idea/misc.xml

@@ -66,7 +66,5 @@
       </profile-state>
     </entry>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/bin" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

+ 3 - 2
src/com/uas/main/Main.java

@@ -10,7 +10,8 @@ public class Main {
 		 
 	  final long timeInterval =5*60*1000;
 	        Runnable runnable = new Runnable() {  
-	            public void run() {  
+	            @Override
+				public void run() {
 	                while (true) {
 	                    // ------- code for task to run  
 	                    a();
@@ -32,7 +33,7 @@ public class Main {
 	public static  void a() {
 		run();
 		System.out.println("begin");
-		Download.run();
+		com.uas.main.Download.run();
 		
 		try{ //关闭数据库连接
 			if(JdbcUtil.connection!=null){

+ 13 - 13
src/com/uas/util/JdbcUtil.java

@@ -30,7 +30,7 @@ public class JdbcUtil {
 			try {
 				ftpConfigs = new ObjectMapper().readValue(JdbcUtil.class.getResourceAsStream("/properties/ftpconfig.properties"), HashMap.class);
 			}catch (Exception e) {
-				BaseUtil.getLogger().error(e.toString());
+				com.uas.util.BaseUtil.getLogger().error(e.toString());
 				e.printStackTrace();
 			}			
 		}
@@ -47,7 +47,7 @@ public class JdbcUtil {
 			try {
 				dbConfigs = new ObjectMapper().readValue(JdbcUtil.class.getResourceAsStream("/properties/dbconfig.properties"), HashMap.class);
 			}catch (Exception e) {
-				BaseUtil.getLogger().error(e.toString());
+				com.uas.util.BaseUtil.getLogger().error(e.toString());
 				e.printStackTrace();
 			}			
 		}
@@ -86,13 +86,13 @@ public class JdbcUtil {
 					// TODO Auto-generated catch block
 					e2.printStackTrace();
 				}
-		    	BaseUtil.getLogger().error(e.toString());
+		    	com.uas.util.BaseUtil.getLogger().error(e.toString());
 		    	try {
 		    		if(connection!=null){
 		    			connection.close();
 		    		}				
 				} catch (SQLException e1) {
-					BaseUtil.getLogger().error(e1.toString());
+					com.uas.util.BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}finally{
 					connection = null;
@@ -132,13 +132,13 @@ public class JdbcUtil {
 				// TODO Auto-generated catch block
 				e2.printStackTrace();
 			}
-	    	BaseUtil.getLogger().error(e.toString());
+	    	com.uas.util.BaseUtil.getLogger().error(e.toString());
 	    	try {
 	    		if(connection!=null){
 	    			connection.close();
 	    		}				
 			} catch (SQLException e1) {
-				BaseUtil.getLogger().error(e1.toString());
+				com.uas.util.BaseUtil.getLogger().error(e1.toString());
 				e1.printStackTrace();
 			}finally{
 				connection = null;
@@ -168,7 +168,7 @@ public class JdbcUtil {
                 con.close();
         }
         catch (Exception e){
-        	BaseUtil.getLogger().error(e.toString());
+        	com.uas.util.BaseUtil.getLogger().error(e.toString());
             e.printStackTrace();
         }
 		return true;
@@ -194,11 +194,11 @@ public class JdbcUtil {
 				statement.executeBatch();
 			} catch (SQLException e) {
 				bol = false;
-				BaseUtil.getLogger().error(e.toString());
+				com.uas.util.BaseUtil.getLogger().error(e.toString());
 				try {
 					statement.close();
 				} catch (SQLException e1) {
-					BaseUtil.getLogger().error(e1.toString());
+					com.uas.util.BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}
 				e.printStackTrace();
@@ -206,13 +206,13 @@ public class JdbcUtil {
 			statement.close();
 		}catch(Exception e){
 			bol = false;
-			BaseUtil.getLogger().error(e.toString());
+			com.uas.util.BaseUtil.getLogger().error(e.toString());
 			try {
 				if(connection!=null){
 					connection.rollback();
 				}				
 			} catch (SQLException e1) {
-				BaseUtil.getLogger().error(e1.toString());
+				com.uas.util.BaseUtil.getLogger().error(e1.toString());
 				e1.printStackTrace();
 			}
 			e.printStackTrace();
@@ -237,13 +237,13 @@ public class JdbcUtil {
 				rs.close();
 				statement.close();
 			}catch(Exception e){
-				BaseUtil.getLogger().error(e.toString());
+				com.uas.util.BaseUtil.getLogger().error(e.toString());
 				try {
 					if(connection!=null){
 						connection.rollback();
 					}				
 				} catch (SQLException e1) {
-					BaseUtil.getLogger().error(e1.toString());
+					com.uas.util.BaseUtil.getLogger().error(e1.toString());
 					e1.printStackTrace();
 				}
 				e.printStackTrace();