From c973f0c63a09d9e114c059b163b7c0e27928c732 Mon Sep 17 00:00:00 2001
From: Sola <loli@sola.love>
Date: Sat, 19 Dec 2015 15:31:35 +0800
Subject: [PATCH] fix ticket track order

---
 .../java/love/sola/netsupport/config/Lang.java |  2 +-
 .../java/love/sola/netsupport/sql/SQLCore.java |  7 +++++++
 .../love/sola/netsupport/sql/TableTicket.java  |  7 +------
 .../sola/netsupport/wechat/TestEncrypt.java    | 18 ++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/main/java/love/sola/netsupport/config/Lang.java b/src/main/java/love/sola/netsupport/config/Lang.java
index f947ca0..eeb5721 100644
--- a/src/main/java/love/sola/netsupport/config/Lang.java
+++ b/src/main/java/love/sola/netsupport/config/Lang.java
@@ -19,8 +19,8 @@ public class Lang {
 	public static Map<String, MessageFormat> format_cache = new HashMap<>(32);
 
 	static {
-		//noinspection unchecked
 		InputStream in = Lang.class.getClassLoader().getResourceAsStream("lang.yml");
+		//noinspection unchecked
 		messages = new Yaml().loadAs(in, Map.class);
 	}
 
diff --git a/src/main/java/love/sola/netsupport/sql/SQLCore.java b/src/main/java/love/sola/netsupport/sql/SQLCore.java
index ca16c82..3d1b711 100644
--- a/src/main/java/love/sola/netsupport/sql/SQLCore.java
+++ b/src/main/java/love/sola/netsupport/sql/SQLCore.java
@@ -7,9 +7,12 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import love.sola.netsupport.enums.ISP;
 import org.hibernate.Hibernate;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.envers.AuditReader;
+import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.service.ServiceRegistry;
 
@@ -76,6 +79,10 @@ public class SQLCore {
 		}
 	}
 
+	public static AuditReader getAuditReader(Session session) {
+		return AuditReaderFactory.get(session);
+	}
+
 	public static class HibernateProxyTypeAdapter extends TypeAdapter<HibernateProxy> {
 
 		public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {
diff --git a/src/main/java/love/sola/netsupport/sql/TableTicket.java b/src/main/java/love/sola/netsupport/sql/TableTicket.java
index cff8b33..075f24c 100644
--- a/src/main/java/love/sola/netsupport/sql/TableTicket.java
+++ b/src/main/java/love/sola/netsupport/sql/TableTicket.java
@@ -8,7 +8,6 @@ import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.envers.AuditReader;
-import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.envers.query.AuditEntity;
 
 import java.util.List;
@@ -79,15 +78,11 @@ public class TableTicket extends SQLCore {
 			AuditReader reader = getAuditReader(s);
 			return reader.createQuery()
 					.forRevisionsOfEntity(Ticket.class, false, true)
-					.addOrder(AuditEntity.revisionNumber().desc())
+					.addOrder(AuditEntity.revisionNumber().asc())
 					.add(AuditEntity.id().eq(tid))
 					.getResultList()
 					;
 		}
 	}
 
-	protected static AuditReader getAuditReader(Session session) {
-		return AuditReaderFactory.get(session);
-	}
-
 }
diff --git a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java b/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java
index 5350044..3b7f04e 100644
--- a/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java
+++ b/src/test/java/love/sola/netsupport/wechat/TestEncrypt.java
@@ -1,9 +1,15 @@
 package love.sola.netsupport.wechat;
 
 import love.sola.netsupport.util.RSAUtil;
+import org.apache.commons.codec.binary.Base64;
 import org.junit.Test;
 import org.mindrot.jbcrypt.BCrypt;
 
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+
 /**
  * ***********************************************
  * Created by Sola on 2015/12/6.
@@ -24,4 +30,16 @@ public class TestEncrypt {
 		assert "Encrypt".equals(RSAUtil.decrypt(RSAUtil.encrypt("Encrypt")));
 	}
 
+//	@Test
+	public void testRSASpecKey() throws NoSuchAlgorithmException, InvalidKeySpecException {
+		System.out.println("RSAUtil.privateKey_s = " + RSAUtil.privateKey_s);
+		System.out.println("RSAUtil.publicKey_s = " + RSAUtil.publicKey_s);
+//		String pkey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCA0qyARvHSCIUQ6YM6K+e/QgiZ+dc/MpVz5DIFwQab5iiifruQiaoA74ilHOOiq5i0ToR1VxNhCUZcAy2saHNifoYKTauMOUSV6IoP4X5jp691PlI9yxNx328mSlPNM9+7BgOzrUP1pR71d+T4LDn0o4J6Ad82vVIe7yWszzF4qQIDAQAB";
+		String pkey = RSAUtil.publicKey_s;
+		KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+		X509EncodedKeySpec keySpec = new X509EncodedKeySpec(Base64.decodeBase64(pkey));
+		RSAUtil.publicKey = keyFactory.generatePublic(keySpec);
+		System.out.println("RSAUtil.encrypt(\"233\") = " + RSAUtil.encrypt("233"));
+	}
+
 }