Merge branch 'master' of https://git.oschina.net/zte-its/rnt-wx.git

王富生
2 parents 16feb579 544e2bea
Showing 3 changed files with 4 additions and 5 deletions
pom.xml
src/main/java/com/rnt/AppRun.java
src/main/java/com/rnt/service/IRainQueryService.java
@@ -137,8 +137,8 @@
       <artifactId>sign</artifactId>
       <type>jar</type>
       <version>1.0</version>
-      <!--  <scope>system</scope>
-      <systemPath>${basedir}/src/main/webapp/lib/sign-1.0.jar</systemPath>-->
+      <scope>system</scope>
+      <systemPath>${basedir}/src/main/webapp/lib/sign-1.0.jar</systemPath>
     </dependency>
     <dependency>
       <groupId>com.alibaba</groupId>
@@ -61,9 +61,9 @@ public class AppRun extends JFinalConfig {
      */
     public void loadProp(String pro, String dev) {
         try {
-            PropKit.use(dev);
-        } catch (Exception e) {
             PropKit.use(pro);
+        } catch (Exception e) {
+            PropKit.use(dev);
             isLocalDev = true;
         }
     }
@@ -19,7 +19,6 @@ import com.rnt.model.zf.OrderDetailPark;
 import com.rnt.utils.HttpClientTutorial;
 import com.rnt.utils.MD5Utils;
 import com.rnt.vo.BizResult;
-import com.rnt.vo.RoadsideRequest;
  
 /**
  * 艾润费用查询service.<br/>