查询货运航线编辑

resources/mappings/modules/airline/VerifyDao.xml

@@ -141,11 +141,11 @@
         a.id as verifId,
         a.source,
         CASE WHEN a.verif_type='01' OR a.verif_type='02'
-        OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'
+        OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05' or a.verif_type='11'
         THEN b.id
         ELSE a.id END id,
         CASE WHEN a.verif_type='01' OR a.verif_type='02'
-        OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'
+        OR a.verif_type='03' OR a.verif_type='04' OR a.verif_type='05'  or a.verif_type='11'
         THEN b.flight_no
         ELSE a.flight_no
         END flightNo,
@@ -161,7 +161,7 @@
         ELSE tt.airport_name
         END depIataName,
         CASE WHEN a.verif_type='01' OR a.verif_type='02'
-        OR a.verif_type='03' OR a.verif_type='04' OR (a.verif_type='05' AND a.roundtrip_type!='01') OR a.verif_type='09'
+        OR a.verif_type='03' OR a.verif_type='04' OR (a.verif_type='05' AND a.roundtrip_type!='01') OR a.verif_type='09' OR a.verif_type='11'
         THEN CONCAT(p.city_name,b.depIata,'=',r.city_name,b.arrIata)
         WHEN a.verif_type='05' AND a.roundtrip_type='01'
         THEN CONCAT(p.city_name,b.depIata,'-',r.city_name,b.arrIata)

src/com/ejweb/modules/sys/service/SystemService.java

@@ -243,7 +243,13 @@ public class SystemService extends BaseService implements InitializingBean {
 		String plain = Encodes.unescapeHtml(plainPassword);
 		byte[] salt = Encodes.decodeHex(password.substring(0, 16));
 		byte[] hashPassword = Digests.sha1(plain.getBytes(), salt, HASH_INTERATIONS);
+		System.out.println( Encodes.encodeHex(hashPassword));
 		return password.equals(Encodes.encodeHex(salt) + Encodes.encodeHex(hashPassword));
+		
+	}
+
+	public static void main(String[] args) {
+		validatePassword("1qaz@WSX","ed65746b6102624935053347cfa888ca119f1033458daf076ac9eeeb");
 	}
 
 

web/WEB-INF/web.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"
+         version="4.0">
+</web-app>
\ No newline at end of file