BJ_ZTEITS-Developers / zteits-rnt-wx

Commit 3d9e80db297c5e24705849019fb056ffdd22ffa7

Authored by 王富生
2 parents 16feb579 544e2bea

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

Inline Side-by-side
Showing 3 changed files with 4 additions and 5 deletions
@@ -137,8 +137,8 @@ @@ -137,8 +137,8 @@
137 <artifactId>sign</artifactId> 137 <artifactId>sign</artifactId>
138 <type>jar</type> 138 <type>jar</type>
139 <version>1.0</version> 139 <version>1.0</version>
140 - <!-- <scope>system</scope>  
141 - <systemPath>${basedir}/src/main/webapp/lib/sign-1.0.jar</systemPath>--> 140 + <scope>system</scope>
  141 + <systemPath>${basedir}/src/main/webapp/lib/sign-1.0.jar</systemPath>
142 </dependency> 142 </dependency>
143 <dependency> 143 <dependency>
144 <groupId>com.alibaba</groupId> 144 <groupId>com.alibaba</groupId>
src/main/java/com/rnt/AppRun.java
  View file @3d9e80d
@@ -61,9 +61,9 @@ public class AppRun extends JFinalConfig { @@ -61,9 +61,9 @@ public class AppRun extends JFinalConfig {
61 */ 61 */
62 public void loadProp(String pro, String dev) { 62 public void loadProp(String pro, String dev) {
63 try { 63 try {
64 - PropKit.use(dev);  
65 - } catch (Exception e) {  
66 PropKit.use(pro); 64 PropKit.use(pro);
  65 + } catch (Exception e) {
  66 + PropKit.use(dev);
67 isLocalDev = true; 67 isLocalDev = true;
68 } 68 }
69 } 69 }
src/main/java/com/rnt/service/IRainQueryService.java
  View file @3d9e80d
@@ -19,7 +19,6 @@ import com.rnt.model.zf.OrderDetailPark; @@ -19,7 +19,6 @@ import com.rnt.model.zf.OrderDetailPark;
19 import com.rnt.utils.HttpClientTutorial; 19 import com.rnt.utils.HttpClientTutorial;
20 import com.rnt.utils.MD5Utils; 20 import com.rnt.utils.MD5Utils;
21 import com.rnt.vo.BizResult; 21 import com.rnt.vo.BizResult;
22 -import com.rnt.vo.RoadsideRequest;  
23 22
24 /** 23 /**
25 * 艾润费用查询service.<br/> 24 * 艾润费用查询service.<br/>