diff --git a/src/main/java/love/sola/netsupport/Index.java b/src/main/java/love/sola/netsupport/Index.java index b6468e7..97bd548 100644 --- a/src/main/java/love/sola/netsupport/Index.java +++ b/src/main/java/love/sola/netsupport/Index.java @@ -11,7 +11,7 @@ import java.io.PrintWriter; /** * @author Sola {@literal } */ -@WebServlet(name = "Index",urlPatterns = "/index",loadOnStartup = 1) +@WebServlet(name = "Index", urlPatterns = "/index", loadOnStartup = 1) public class Index extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/src/main/java/love/sola/netsupport/auth/OAuth2.java b/src/main/java/love/sola/netsupport/auth/OAuth2.java index 355da50..e9c3d2e 100644 --- a/src/main/java/love/sola/netsupport/auth/OAuth2.java +++ b/src/main/java/love/sola/netsupport/auth/OAuth2.java @@ -27,7 +27,8 @@ public class OAuth2 extends HttpServlet { /** * for {@link love.sola.netsupport.wechat.WxMpServlet#registerCommands} - * @param state the state key from open platform callback. + * + * @param state the state key from open platform callback. * @param handler handler */ public static void registerOAuth2Handler(String state, OAuth2Handler handler) { diff --git a/src/main/java/love/sola/netsupport/config/Settings.java b/src/main/java/love/sola/netsupport/config/Settings.java index 824862d..c44243d 100644 --- a/src/main/java/love/sola/netsupport/config/Settings.java +++ b/src/main/java/love/sola/netsupport/config/Settings.java @@ -32,6 +32,8 @@ public class Settings { public int User_Wechat_Cache_Expire_Time; //No arg constructor for Yaml.loadAs - public Settings() { I = this; } + public Settings() { + I = this; + } } diff --git a/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java b/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java index 66eea2d..9218e1b 100644 --- a/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java +++ b/src/main/java/love/sola/netsupport/config/WxMpXmlInMemoryConfigStorage.java @@ -15,12 +15,12 @@ import java.io.InputStream; @ToString public class WxMpXmlInMemoryConfigStorage extends WxMpInMemoryConfigStorage { - @SuppressWarnings("unchecked") - public static T fromXml(Class clazz, InputStream is) { - XStream xstream = XStreamInitializer.getInstance(); - xstream.alias("wechat-config", clazz); - xstream.processAnnotations(clazz); - return (T) xstream.fromXML(is); - } + @SuppressWarnings("unchecked") + public static T fromXml(Class clazz, InputStream is) { + XStream xstream = XStreamInitializer.getInstance(); + xstream.alias("wechat-config", clazz); + xstream.processAnnotations(clazz); + return (T) xstream.fromXML(is); + } } diff --git a/src/main/java/love/sola/netsupport/enums/Access.java b/src/main/java/love/sola/netsupport/enums/Access.java index ff78f80..2c4b3e4 100644 --- a/src/main/java/love/sola/netsupport/enums/Access.java +++ b/src/main/java/love/sola/netsupport/enums/Access.java @@ -27,7 +27,7 @@ public class Access { public static final Map inverseMap = new HashMap<>(); - static{ + static { System.out.println("Loading Access..."); for (Field field : Access.class.getDeclaredFields()) { if (field.getType().isAssignableFrom(Integer.TYPE)) { diff --git a/src/main/java/love/sola/netsupport/enums/Block.java b/src/main/java/love/sola/netsupport/enums/Block.java index dd136ff..a0ca63c 100644 --- a/src/main/java/love/sola/netsupport/enums/Block.java +++ b/src/main/java/love/sola/netsupport/enums/Block.java @@ -37,7 +37,7 @@ public class Block { public static final Map inverseMap = new HashMap<>(); - static{ + static { System.out.println("Loading Blocks..."); for (Field field : Block.class.getDeclaredFields()) { if (field.getType().isAssignableFrom(Integer.TYPE)) { @@ -56,31 +56,31 @@ public class Block { // -------------------------------------------- // // THANKS DATA PROVIDED BY Lai Juncheng // -------------------------------------------- // - AVAILABLE[FX_1] = new int[]{108, 208, 308, 408, 508}; - AVAILABLE[FX_2] = new int[]{110, 210, 310, 410, 510, 610}; - AVAILABLE[FX_3] = new int[]{110, 210, 310, 410, 510, 610}; - AVAILABLE[FX_4] = new int[]{110, 210, 310, 410, 510, 610, 710}; - AVAILABLE[FX_5] = new int[]{108, 208, 308, 408, 508, 608, 708}; - AVAILABLE[BM_7] = new int[]{100, 216, 317, 417, 517, 617, 717}; - AVAILABLE[BM_8] = new int[]{100, 221, 321, 421, 521, 621, 721}; - AVAILABLE[BM_9] = new int[]{100, 221, 321, 421, 521, 621}; - AVAILABLE[BM_10] = new int[]{111, 239, 354, 454, 564, 664, 764, 864}; - AVAILABLE[BM_11] = new int[]{100, 213, 321, 421, 521, 621, 721, 821}; - AVAILABLE[DM_12] = new int[]{119, 221, 321, 421, 521, 621, 720}; - AVAILABLE[DM_13] = new int[]{120, 222, 322, 422, 522, 622, 722}; - AVAILABLE[DM_14] = new int[]{100, 230, 330, 430, 530, 630, 730}; - AVAILABLE[DM_15] = new int[]{119, 219, 319, 419, 519, 619}; - AVAILABLE[QT_16] = new int[]{154, 257, 357, 457, 557, 657, 757}; - AVAILABLE[QT_17] = new int[]{154, 257, 357, 457, 557, 657, 757}; - AVAILABLE[QT_18] = new int[]{139, 239, 339, 439, 539, 639, 739}; - AVAILABLE[QT_19] = new int[]{100, 200, 332, 432, 532, 632, 732}; - AVAILABLE[DM_20] = new int[]{109, 209, 309, 409, 509, 609, 709}; - AVAILABLE[DM_21] = new int[]{109, 209, 309, 409, 509, 609, 709}; - AVAILABLE[XH_A] = new int[]{129, 231, 331, 431, 531, 631, 731, 831, 931, 1031, 1131, 1231}; - AVAILABLE[XH_B] = new int[]{129, 229, 329, 429, 529, 629, 729, 829, 929, 1029, 1129, 1229}; - AVAILABLE[XH_C] = new int[]{126, 226, 326, 426, 526, 626, 726, 826, 926, 1026, 1126, 1226}; - AVAILABLE[XH_D] = new int[]{128, 228, 328, 428, 528, 628, 728, 828, 928, 1028, 1128, 1228}; - AVAILABLE[FX_6] = new int[0]; + AVAILABLE[FX_1] = new int[]{108, 208, 308, 408, 508}; + AVAILABLE[FX_2] = new int[]{110, 210, 310, 410, 510, 610}; + AVAILABLE[FX_3] = new int[]{110, 210, 310, 410, 510, 610}; + AVAILABLE[FX_4] = new int[]{110, 210, 310, 410, 510, 610, 710}; + AVAILABLE[FX_5] = new int[]{108, 208, 308, 408, 508, 608, 708}; + AVAILABLE[BM_7] = new int[]{100, 216, 317, 417, 517, 617, 717}; + AVAILABLE[BM_8] = new int[]{100, 221, 321, 421, 521, 621, 721}; + AVAILABLE[BM_9] = new int[]{100, 221, 321, 421, 521, 621}; + AVAILABLE[BM_10] = new int[]{111, 239, 354, 454, 564, 664, 764, 864}; + AVAILABLE[BM_11] = new int[]{100, 213, 321, 421, 521, 621, 721, 821}; + AVAILABLE[DM_12] = new int[]{119, 221, 321, 421, 521, 621, 720}; + AVAILABLE[DM_13] = new int[]{120, 222, 322, 422, 522, 622, 722}; + AVAILABLE[DM_14] = new int[]{100, 230, 330, 430, 530, 630, 730}; + AVAILABLE[DM_15] = new int[]{119, 219, 319, 419, 519, 619}; + AVAILABLE[QT_16] = new int[]{154, 257, 357, 457, 557, 657, 757}; + AVAILABLE[QT_17] = new int[]{154, 257, 357, 457, 557, 657, 757}; + AVAILABLE[QT_18] = new int[]{139, 239, 339, 439, 539, 639, 739}; + AVAILABLE[QT_19] = new int[]{100, 200, 332, 432, 532, 632, 732}; + AVAILABLE[DM_20] = new int[]{109, 209, 309, 409, 509, 609, 709}; + AVAILABLE[DM_21] = new int[]{109, 209, 309, 409, 509, 609, 709}; + AVAILABLE[XH_A] = new int[]{129, 231, 331, 431, 531, 631, 731, 831, 931, 1031, 1131, 1231}; + AVAILABLE[XH_B] = new int[]{129, 229, 329, 429, 529, 629, 729, 829, 929, 1029, 1129, 1229}; + AVAILABLE[XH_C] = new int[]{126, 226, 326, 426, 526, 626, 726, 826, 926, 1026, 1126, 1226}; + AVAILABLE[XH_D] = new int[]{128, 228, 328, 428, 528, 628, 728, 828, 928, 1028, 1128, 1228}; + AVAILABLE[FX_6] = new int[0]; } public static boolean checkRoom(int block, int room) { diff --git a/src/main/java/love/sola/netsupport/enums/ISP.java b/src/main/java/love/sola/netsupport/enums/ISP.java index abc47a7..61d1d80 100644 --- a/src/main/java/love/sola/netsupport/enums/ISP.java +++ b/src/main/java/love/sola/netsupport/enums/ISP.java @@ -13,8 +13,7 @@ public enum ISP { TELECOM(1, "^1[3|4|5|7|8][0-9]{9}$"), UNICOM(2, "ZSZJLAN[0-9]{10}@16900\\.gd"), CHINAMOBILE(3, "^1[3|4|5|7|8][0-9]{9}@139\\.gd$"), - OTHER(4, ".*"), - ; + OTHER(4, ".*"),; private static final Map NAME_MAP = new HashMap<>(); private static final Map ID_MAP = new HashMap<>(); @@ -52,6 +51,8 @@ public enum ISP { } @Override - public String toString() { return name; } + public String toString() { + return name; + } } diff --git a/src/main/java/love/sola/netsupport/enums/Status.java b/src/main/java/love/sola/netsupport/enums/Status.java index ae602b1..37de042 100644 --- a/src/main/java/love/sola/netsupport/enums/Status.java +++ b/src/main/java/love/sola/netsupport/enums/Status.java @@ -20,7 +20,7 @@ public class Status { public static final Map inverseMap = new HashMap<>(); - static{ + static { System.out.println("Loading Status..."); for (Field field : Status.class.getDeclaredFields()) { if (field.getType().isAssignableFrom(Integer.TYPE)) { diff --git a/src/main/java/love/sola/netsupport/sql/TableConfig.java b/src/main/java/love/sola/netsupport/sql/TableConfig.java index 713f3a1..9c752ca 100644 --- a/src/main/java/love/sola/netsupport/sql/TableConfig.java +++ b/src/main/java/love/sola/netsupport/sql/TableConfig.java @@ -7,7 +7,7 @@ import java.sql.*; /** * @author Sola {@literal } */ -public class TableConfig extends SQLCore{ +public class TableConfig extends SQLCore { public static final String KEY_SYS = "sys"; @@ -18,7 +18,8 @@ public class TableConfig extends SQLCore{ if (rs.next()) { return gson.fromJson(rs.getString("data"), Settings.class); } - } catch (SQLException e) { } + } catch (SQLException e) { + } return null; } diff --git a/src/main/java/love/sola/netsupport/util/Checker.java b/src/main/java/love/sola/netsupport/util/Checker.java index 909d386..a579082 100644 --- a/src/main/java/love/sola/netsupport/util/Checker.java +++ b/src/main/java/love/sola/netsupport/util/Checker.java @@ -32,7 +32,8 @@ public class Checker { if (!phone.matches(PHONE_NUMBER_REGEX)) return -1; try { return Long.parseLong(phone); - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } return -1; } @@ -40,7 +41,8 @@ public class Checker { if (isp == null) return null; try { return ISP.fromId(Integer.parseInt(isp)); - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } return null; } @@ -59,7 +61,8 @@ public class Checker { return b; else return -1; - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } return -1; } @@ -72,7 +75,8 @@ public class Checker { return i; else return -1; - } catch (NumberFormatException ignored) { } + } catch (NumberFormatException ignored) { + } return -1; } diff --git a/src/main/java/love/sola/netsupport/util/ParseUtil.java b/src/main/java/love/sola/netsupport/util/ParseUtil.java index 2ac3b51..ff96ab8 100644 --- a/src/main/java/love/sola/netsupport/util/ParseUtil.java +++ b/src/main/java/love/sola/netsupport/util/ParseUtil.java @@ -19,9 +19,11 @@ public class ParseUtil { .append(lang("Ticket_Info_Id")).append(t.getId()).append("\n") .append(lang("Ticket_Info_Desc")).append(t.getDescription()).append("\n") .append(lang("Ticket_Info_Submit_Time")).append(dateFormat.format(t.getSubmitTime())).append("\n"); - if (t.getOperator() != null) sb.append(lang("Ticket_Info_Operator")).append(t.getOperator().getId()).append("\n"); + if (t.getOperator() != null) + sb.append(lang("Ticket_Info_Operator")).append(t.getOperator().getId()).append("\n"); if (t.getRemark() != null) sb.append(lang("Ticket_Info_Remark")).append(t.getRemark()).append("\n"); - if (t.getUpdateTime() != null) sb.append(lang("Ticket_Info_Update_Time")).append(dateFormat.format(t.getUpdateTime())).append("\n"); + if (t.getUpdateTime() != null) + sb.append(lang("Ticket_Info_Update_Time")).append(dateFormat.format(t.getUpdateTime())).append("\n"); sb.append(lang("Ticket_Info_Status")).append(Status.getLocalized(t.getStatus())); return sb.toString(); } diff --git a/src/main/java/love/sola/netsupport/util/RSAUtil.java b/src/main/java/love/sola/netsupport/util/RSAUtil.java index 7b408d7..3ef996c 100644 --- a/src/main/java/love/sola/netsupport/util/RSAUtil.java +++ b/src/main/java/love/sola/netsupport/util/RSAUtil.java @@ -19,9 +19,9 @@ public class RSAUtil { public static String publicKey_s; public static String privateKey_s; - static { - genKeyPair(); - } + static { + genKeyPair(); + } public static void genKeyPair() { try { @@ -38,27 +38,27 @@ public class RSAUtil { } public static String encrypt(String value) { - try { - Cipher cipher = Cipher.getInstance("RSA"); - cipher.init(Cipher.ENCRYPT_MODE, publicKey); - byte[] encrypted = cipher.doFinal(value.getBytes(StandardCharsets.UTF_8)); - return Base64.encodeBase64String(encrypted); - } catch (Exception ex) { - ex.printStackTrace(); - } - return null; - } + try { + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, publicKey); + byte[] encrypted = cipher.doFinal(value.getBytes(StandardCharsets.UTF_8)); + return Base64.encodeBase64String(encrypted); + } catch (Exception ex) { + ex.printStackTrace(); + } + return null; + } - public static String decrypt(String encrypted) { - try { - Cipher cipher = Cipher.getInstance("RSA"); - cipher.init(Cipher.DECRYPT_MODE, privateKey); - byte[] original = cipher.doFinal(Base64.decodeBase64(encrypted)); - return new String(original, StandardCharsets.UTF_8); - } catch (Exception ex) { - ex.printStackTrace(); - } - return null; - } + public static String decrypt(String encrypted) { + try { + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, privateKey); + byte[] original = cipher.doFinal(Base64.decodeBase64(encrypted)); + return new String(original, StandardCharsets.UTF_8); + } catch (Exception ex) { + ex.printStackTrace(); + } + return null; + } } \ No newline at end of file diff --git a/src/main/java/love/sola/netsupport/util/Redirect.java b/src/main/java/love/sola/netsupport/util/Redirect.java index fedd908..f5c0aea 100644 --- a/src/main/java/love/sola/netsupport/util/Redirect.java +++ b/src/main/java/love/sola/netsupport/util/Redirect.java @@ -98,8 +98,7 @@ public class Redirect { WARN("weui_icon_warn"), WARN_SAFE("weui_icon_safe_warn"), DOWNLOAD("weui_icon_download"), - CANCEL("weui_icon_cancel"), - ; + CANCEL("weui_icon_cancel"),; private String value; diff --git a/src/main/java/love/sola/netsupport/wechat/Command.java b/src/main/java/love/sola/netsupport/wechat/Command.java index 92b8c86..7ca8078 100644 --- a/src/main/java/love/sola/netsupport/wechat/Command.java +++ b/src/main/java/love/sola/netsupport/wechat/Command.java @@ -21,8 +21,7 @@ public enum Command { CANCEL(3, CancelHandler.class), PROFILE(4, ProfileHandler.class), LOGIN(10, LoginHandler.class), - OPERATOR_INFO(11, OperatorInfoHandler.class), - ; + OPERATOR_INFO(11, OperatorInfoHandler.class),; private static final Map ID_MAP = new HashMap<>(); diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml index 852ffb5..de389c1 100644 --- a/src/main/resources/hibernate.cfg.xml +++ b/src/main/resources/hibernate.cfg.xml @@ -6,41 +6,41 @@ ~ See the lgpl.txt file in the root directory or . --> + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://www.hibernate.org/dtd/hibernate-configuration-3.0.dtd"> - + - - - java:comp/env/jdbc/netsupport - - - - + + + java:comp/env/jdbc/netsupport + + + + - - + + - - org.hibernate.dialect.MySQL5InnoDBDialect + + org.hibernate.dialect.MySQL5InnoDBDialect - - org.hibernate.cache.internal.NoCacheProvider + + org.hibernate.cache.internal.NoCacheProvider - - true + + true - - validate + + validate - - - - + + + + - + \ No newline at end of file diff --git a/src/main/resources/wechat-config.xml b/src/main/resources/wechat-config.xml index 78b8f7c..f0f9370 100644 --- a/src/main/resources/wechat-config.xml +++ b/src/main/resources/wechat-config.xml @@ -1,6 +1,6 @@ - **** - **** - **** - **** + **** + **** + **** + **** \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8dc1b11..aad0a03 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -5,22 +5,22 @@ http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1"> - + - Network Support Application - - If you have any problem, please contact loli@sola.love . - + Network Support Application + + If you have any problem, please contact loli@sola.love . + - - index - - - /index - + + index + + + /index + - - 10 - + + 10 + \ No newline at end of file