From f76a7cf4a3a9387059569204bc1b81bd2912a77c Mon Sep 17 00:00:00 2001
From: liuz <liuz@DESKTOP-BF9USEF>
Date: Tue, 24 Jul 2018 20:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=9B=B4=E6=96=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/applicationContext.xml                            | 4 +++-
 config/license.properties                                | 2 +-
 config/second_handCar.properties                         | 5 ++++-
 .../amarsoft/app/awe/config/InitSecondHandCarConfig.java | 3 +++
 .../amarsoft/app/awe/config/SecondHandCarProperties.java | 9 +++++++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/config/applicationContext.xml b/config/applicationContext.xml
index 4ba1f992f..bb6df22ce 100644
--- a/config/applicationContext.xml
+++ b/config/applicationContext.xml
@@ -73,8 +73,10 @@ xmlns:p="http://www.springframework.org/schema/p"
 			<property name="token" value="#{secondHandCarProperties['com.tenwa.zhanglei.token']}"></property>
 			<!-- 操作类型 -->
 			<property name="oper" value="#{secondHandCarProperties['com.tenwa.zhanglei.oper']}"></property>
-			<!-- 车型库版本信息 -->
+			<!-- 乘用车型库版本信息 -->
 			<property name="version" value="#{secondHandCarProperties['com.tenwa.zhanglei.version']}"></property>
+			<!-- 商用车车型库版本信息 -->
+			<property name="comversion" value="#{secondHandCarProperties['com.tenwa.zhanglei.commercial.version']}"></property>
 	
 	</bean>
     
diff --git a/config/license.properties b/config/license.properties
index 8a4e832ba..eb732d29b 100644
--- a/config/license.properties
+++ b/config/license.properties
@@ -1 +1 @@
-key =P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
\ No newline at end of file
+key =1P3Y/elU9XFhcWj9bXDlkeCskXCAzI0I9SzQ/Yz9vP2c/az9oP29iUzdfUktIMGNkNykxJUQ5R10/Yz9vYjRLL1J0ZEU/ej94Ji0/dlxqQC9Sa2EzSmJgVkR4P3g/dk1yXGhbcEdxVWlbcUV2QGg/eD92XXdObU9tTS8vaz9nKnk/ZDpzP3M2Zz92Ji9bals7R2dCbT94P3ZPd05tSXpKZz94NWIqeT9kP2Y/ZDJhP3Yyb1h4RWZPbU9zP3g/dkpqX2VNYmM2P3hVQjpVQTVbWEYtXSBUYC9BL3I/ZD0uP2c9ZjluMm9VaFRpYjBacCZyP3ZOcGBcWWFdZ1R2TWNPb0R6P3hNdj9nP2c/Zz9nP2c/di54TnBPZ11nXmZWeFBbTmlgMz94P3ZJelkvNnQ/eD92P2pOdWNaW3BbL1xxTnpJaF5rP3g/dmNaYDRcZ1Z6XHFBY0tnVWlZZVNxYCAxaD92RnpIW0EuR3Y/eDd2PW4/Lz9zP3Y/altvTXlWW2I1P3g/dj9qQDtiNlF2R2tGaEB2X3laO1R5QmJQWz94ZCU/amAtXmVMaFY7Q2ZhQ2I2P3g=
\ No newline at end of file
diff --git a/config/second_handCar.properties b/config/second_handCar.properties
index cdd337910..72c48568d 100644
--- a/config/second_handCar.properties
+++ b/config/second_handCar.properties
@@ -11,4 +11,7 @@ com.tenwa.zhanglei.token=a6b83424b55410c36415178002f8415e
 com.tenwa.zhanglei.oper=exportModel
 
 #che300 initiallversion
-com.tenwa.zhanglei.version=3.4.548
\ No newline at end of file
+com.tenwa.zhanglei.version=3.4.548
+
+#che300 initiallversion(shangyongche)
+com.tenwa.zhanglei.commercial.version=1.0.0
\ No newline at end of file
diff --git a/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
index 6950e4d3d..63f3baea9 100644
--- a/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
+++ b/src/com/amarsoft/app/awe/config/InitSecondHandCarConfig.java
@@ -20,6 +20,8 @@ public class InitSecondHandCarConfig extends HttpServlet {
 			
 			public static final String VERSION;
 			
+			public static final String COMVERSION;
+			
 			static {
 					 WebApplicationContext wac = ContextLoader.getCurrentWebApplicationContext();
 					 SecondHandCarProperties secondHandCarProperties = wac.getBean("secondHandCarConfig",SecondHandCarProperties.class);
@@ -27,5 +29,6 @@ public class InitSecondHandCarConfig extends HttpServlet {
 					 OPER = secondHandCarProperties.getOper();
 					 PREFIX = secondHandCarProperties.getPrefix();
 					 VERSION = secondHandCarProperties.getVersion();
+					 COMVERSION=secondHandCarProperties.getComversion();
 			}
 }
diff --git a/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java
index 3b42300a6..d8ffa92b0 100644
--- a/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java
+++ b/src/com/amarsoft/app/awe/config/SecondHandCarProperties.java
@@ -14,6 +14,15 @@ public class SecondHandCarProperties {
 				
 				private String version;
 				
+				private String comversion;
+				
+				
+				public String getComversion() {
+					return comversion;
+				}
+				public void setComversion(String comversion) {
+					this.comversion = comversion;
+				}
 				public String getPrefix() {
 					return prefix;
 				}