backendTeam/WechatTicketSystem
1
0
Fork 0
mirror of https://github.com/ZSCNetSupportDept/WechatTicketSystem.git synced 2025-10-29 08:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix ticket track order

Browse Source
This commit is contained in:
Sola
2015-12-19 15:31:35 +08:00
parent 66c04d42f1
commit c973f0c63a
4 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/love/sola/netsupport/config/Lang.java
View File

@@ -19,8 +19,8 @@ public class Lang {
public static Map<String, MessageFormat> format_cache = new HashMap<>(32); public static Map<String, MessageFormat> format_cache = new HashMap<>(32);
static { static {
//noinspection unchecked
InputStream in = Lang.class.getClassLoader().getResourceAsStream("lang.yml"); InputStream in = Lang.class.getClassLoader().getResourceAsStream("lang.yml");
//noinspection unchecked
messages = new Yaml().loadAs(in, Map.class); messages = new Yaml().loadAs(in, Map.class);
} }

7
src/main/java/love/sola/netsupport/sql/SQLCore.java
View File

@@ -7,9 +7,12 @@ import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import love.sola.netsupport.enums.ISP; import love.sola.netsupport.enums.ISP;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.Session;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.boot.MetadataSources; import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.envers.AuditReader;
import org.hibernate.envers.AuditReaderFactory;
import org.hibernate.proxy.HibernateProxy; import org.hibernate.proxy.HibernateProxy;
import org.hibernate.service.ServiceRegistry; 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 class HibernateProxyTypeAdapter extends TypeAdapter<HibernateProxy> {
public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() { public static final TypeAdapterFactory FACTORY = new TypeAdapterFactory() {

7
src/main/java/love/sola/netsupport/sql/TableTicket.java
View File

@@ -8,7 +8,6 @@ import org.hibernate.criterion.Order;
import org.hibernate.criterion.Projections; import org.hibernate.criterion.Projections;
import org.hibernate.criterion.Restrictions; import org.hibernate.criterion.Restrictions;
import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReader;
import org.hibernate.envers.AuditReaderFactory;
import org.hibernate.envers.query.AuditEntity; import org.hibernate.envers.query.AuditEntity;
import java.util.List; import java.util.List;
@@ -79,15 +78,11 @@ public class TableTicket extends SQLCore {
AuditReader reader = getAuditReader(s); AuditReader reader = getAuditReader(s);
return reader.createQuery() return reader.createQuery()
.forRevisionsOfEntity(Ticket.class, false, true) .forRevisionsOfEntity(Ticket.class, false, true)
.addOrder(AuditEntity.revisionNumber().desc()) .addOrder(AuditEntity.revisionNumber().asc())
.add(AuditEntity.id().eq(tid)) .add(AuditEntity.id().eq(tid))
.getResultList() .getResultList()
; ;
} }
} }
protected static AuditReader getAuditReader(Session session) {
return AuditReaderFactory.get(session);
}
} }

18
src/test/java/love/sola/netsupport/wechat/TestEncrypt.java
View File

@@ -1,9 +1,15 @@
package love.sola.netsupport.wechat; package love.sola.netsupport.wechat;
import love.sola.netsupport.util.RSAUtil; import love.sola.netsupport.util.RSAUtil;
import org.apache.commons.codec.binary.Base64;
import org.junit.Test; import org.junit.Test;
import org.mindrot.jbcrypt.BCrypt; 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. * Created by Sola on 2015/12/6.
@@ -24,4 +30,16 @@ public class TestEncrypt {
assert "Encrypt".equals(RSAUtil.decrypt(RSAUtil.encrypt("Encrypt"))); 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"));
}
} }